Merge branch 'feature_20260402_指标修改'

# Conflicts:
#	src/components/componentsTarget/createStoreBJ.vue
#	src/components/componentsTarget/placeOrder.vue
#	src/components/componentsTarget/visitedRealTime.vue
#	src/components/shareCommonTarget.vue
#	src/views/componentsTarget/createStoreBJ.vue
#	src/views/componentsTarget/placeOrder.vue
#	src/views/componentsTarget/visitedRealTime.vue
#	src/views/home/HomeTarget.vue
#	src/views/home/hintTabPage/index.vue
#	src/views/home/index.vue
#	src/views/week/daily.vue
#	src/views/week/dailyApproval.vue
#	src/views/week/dailyDetails.vue
#	src/views/week/dailyHistoricalDetails.vue
#	src/views/week/doubleWeekly.vue
#	src/views/week/doubleWeeklyApproval.vue
#	src/views/week/doubleWeeklyDetils.vue
#	src/views/week/target.vue
#	src/views/week/weekly.vue
#	src/views/week/weeklyApproval.vue
#	src/views/week/weeklyApprovalDetils.vue
#	src/views/week/weeklyHistoricalDetils.vue

src/components/componentsTarget/createStoreBJ.vue

@@ -29,13 +29,13 @@
     </van-col>
     <van-col span="12">
       <p>
-        <span class="colLabel colLabel_FX">分销店:</span>
+        <span class="colLabel colLabel_FX">分销店</span>
         <span class="colorbalck">{{ Micrometer(reportTargetAll.allShopMonthAct) }}</span>
       </p>
     </van-col>
     <van-col span="12">
       <p>
-        <span class="colLabel colLabel_FX">分销店:</span>
+        <span class="colLabel colLabel_FX">分销店</span>
         <span class="colorbalck">{{ Micrometer(reportTargetAll.allShopYearAct) }}</span>
         <span class="colorbalck" v-if="reportTargetAll.allShopYearRate"
           >({{ reportTargetAll.allShopYearRate }}%)</span
@@ -64,10 +64,71 @@
       </van-col>
       <van-col span="12">
         <p>
-          <span class="colLabel colLabel_JPBJ">金牌店布机:</span>
+          <span class="colLabel colLabel_JPBJ">金牌店布机</span>
           <span class="colorbalck">{{ Micrometer(reportTargetAll.goldShopBjMonthAct) }}</span>
         </p>
       </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_JPBJ">金牌店布机</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.goldShopBjYearAct) }}</span>
+          <span class="colorbalck" v-if="reportTargetAll.goldShopBjYearRate">
+            ({{ reportTargetAll.goldShopBjYearRate }}%)
+          </span>
+          <span class="colorbalck" v-else>({{ '-' }})</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxTlShopMonthAct)
+          }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxTlShopYearAct)
+          }}</span>
+          <span class="colorbalck" v-if="reportTargetAll.tcfxTlShopYearRate">
+            ({{ reportTargetAll.tcfxTlShopYearRate }}%)
+          </span>
+          <span class="colorbalck" v-else>({{ '-' }})</span>
+        </p>
+      </van-col>
+
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOtherShopMonthAct) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOtherShopYearAct) }}</span>
+          <span class="colorbalck" v-if="reportTargetAll.tcfxOtherShopYearRate">
+            ({{ reportTargetAll.tcfxOtherShopYearRate }}%)
+          </span>
+          <span class="colorbalck" v-else>({{ '-' }})</span>
+        </p>
+      </van-col>
+      <!-- <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">仿石漆店:</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.fsqShopMonthAct) }}</span>
+        </p>
+      </van-col>
       <van-col span="12">
         <p>
           <span class="colLabel colLabel_JPBJ">金牌店布机:</span>
@@ -122,7 +183,7 @@
           </span>
           <span class="colorbalck" v-else>({{ '-' }})</span>
         </p>
-      </van-col>
+      </van-col> -->
     </div>
   </van-row>
 </template>

src/components/componentsTarget/placeOrder.vue

@@ -18,13 +18,13 @@
     </van-col>
     <van-col span="12">
       <p>
-        <span class="colLabel colLabel_FX">分销店:</span>
+        <span class="colLabel colLabel_FX">分销店</span>
         <span class="colorbalck">{{ Micrometer(reportTargetAll.fxOrderShopMonthAct) }}</span>
       </p>
     </van-col>
     <van-col span="12">
       <p>
-        <span class="colLabel colLabel_FX">分销店:</span
+        <span class="colLabel colLabel_FX">分销店</span
         ><span class="colorbalck">{{ reportTargetAll.fxShopMonthOrderRate }}%</span>
       </p>
     </van-col>
@@ -45,7 +45,44 @@
       </van-col>
       <van-col span="12">
         <p>
-          <span class="colLabel colLabel_TCFX">同城分销:</span>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxTlOrderShopMonthAct) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：
+          <span class="colorbalck">{{ reportTargetAll.tcfxTlShopMonthOrderRate }}%</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxOtherOrderShopMonthAct)
+          }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{ reportTargetAll.tcfxOtherShopMonthOrderRate }}%</span>
+        </p>
+      </van-col>
+      <!-- <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销近3月:</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOrderShopMonthAct) }}</span>
         </p>
       </van-col>
       <van-col span="12">
@@ -76,7 +113,7 @@
         <p style="margin-top: 0">
           厨卫店:<span class="colorbalck">{{ reportTargetAll.tcfxOtherShopMonthOrderRate }}%</span>
         </p>
-      </van-col>
+      </van-col> -->
     </div>
   </van-row>
 </template>

src/components/componentsTarget/visitedRealTime.vue

@@ -70,13 +70,13 @@
     </van-col>
     <van-col span="12">
       <p>
-        <span class="colLabel colLabel_FX">分销店:</span>
+        <span class="colLabel colLabel_FX">分销店</span>
         <span class="colorbalck">{{ Micrometer(reportTargetAll.fxShopVisitDayNum) }}</span>
       </p>
     </van-col>
     <van-col span="12">
       <p>
-        <span class="colLabel colLabel_FX">分销店:</span>
+        <span class="colLabel colLabel_FX">分销店</span>
         <span class="colorbalck">{{ Micrometer(reportTargetAll.fxShopVisitMonthNum) }}</span>
         <span class="colorbalck"> ({{ reportTargetAll.fxShopVisitMonthRate }}%) </span>
       </p>
@@ -98,6 +98,44 @@
         </p>
       </van-col>
       <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxTlShopVisitDayNum) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span style="font-weight: 600">近2月</span>涂料店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxTlShopVisitMonthNum) }}</span>
+          <span class="colorbalck"> ({{ reportTargetAll.tcfxTlShopVisitMonthRate }}%) </span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxOtherShopVisitDayNum)
+          }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          <span style="font-weight: 600">近3月</span>厨卫店：<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxOtherShopVisitMonthNum)
+          }}</span>
+          <span class="colorbalck"> ({{ reportTargetAll.tcfxOtherShopVisitMonthRate }}%) </span>
+        </p>
+      </van-col>
+      <!-- <van-col span="12">
         <p>
           <span class="colLabel colLabel_TCFX">同城分销:</span>
         </p>
@@ -136,7 +174,7 @@
           }}</span>
           <span class="colorbalck"> ({{ reportTargetAll.tcfxOtherShopVisitMonthRate }}%) </span>
         </p>
-      </van-col>
+      </van-col> -->
     </div>
   </van-row>
 </template>

src/components/shareCommonTarget.vue

@@ -0,0 +1,536 @@
+<template>
+  <div class="shareCommonTarget">
+    <!-- labelStyle 垃圾，不能全匹配，需要特殊处理 -->
+    <template>
+      <div class="container linep" v-if="homePageIndicatorDate">
+        <van-collapse v-model="activeNames">
+          <div v-for="(homePageItem, index) in homePageIndicatorDate" :key="index">
+            <van-collapse-item v-if="homePageItem.labelStyle == 1" :name="(index + 1).toString()">
+              <template #title>
+                <div class="text">{{ homePageItem.name }}</div>
+              </template>
+              <van-row>
+                <!-- 动态渲染标题栏 -->
+                <div
+                  v-for="(periodItem, periodIndex) in homePageItem.children"
+                  :key="'title-' + periodIndex">
+                  <van-col span="12" v-if="periodItem.name">
+                    <span :class="periodIndex % 2 === 0 ? 'leftTitle' : 'rightTitle'">{{
+                      periodItem.name
+                    }}</span>
+                  </van-col>
+                </div>
+                <!-- 动态渲染指标项 -->
+                <div v-if="homePageItem.children.length >= 2">
+                  <!-- 遍历第一个周期的所有指标 -->
+                  <div
+                    v-for="(metric, metricIndex) in homePageItem.children[0].children"
+                    :key="'metric-' + metricIndex">
+                    <!-- 左侧指标 -->
+                    <van-col span="12">
+                      <p>
+                        {{ metric.name }}:
+                        <span class="colorblack">
+                          {{ metric.indicatorDisplayValue }}
+                        </span>
+                      </p>
+                    </van-col>
+                    <!-- 对应右侧指标 -->
+                    <van-col span="12">
+                      <p>
+                        {{ homePageItem.children[1]?.children[metricIndex]?.name || '-' }}:
+                        <span class="colorblack">
+                          {{
+                            homePageItem.children[1]?.children[metricIndex]?.indicatorDisplayValue
+                          }}
+                        </span>
+                      </p>
+                    </van-col>
+                  </div>
+                </div>
+              </van-row>
+            </van-collapse-item>
+            <van-collapse-item v-if="homePageItem.labelStyle == 2" :name="(index + 1).toString()">
+              <template #title>
+                <div class="text">{{ homePageItem.name }}</div>
+              </template>
+              <!-- 外层循环：遍历主要类别 -->
+              <van-row
+                v-for="(category, index) in homePageItem.children"
+                :key="index"
+                :style="{ marginTop: index > 0 ? '10px' : '0' }">
+                <van-col span="24" v-if="category.name">
+                  <span :class="index % 2 === 0 ? 'leftTitle' : 'rightTitle'">{{
+                    category.name
+                  }}</span>
+                </van-col>
+
+                <!-- 内层循环：遍历各个统计项 -->
+                <div v-for="(item, idx) in category.children" :key="idx">
+                  <van-col :span="idx == 0 ? 24 : 12">
+                    <p>
+                      {{ item.name }}：<span
+                        :style="labelStyle(item.clickable)"
+                        class="colorbalck"
+                        >{{ item.indicatorDisplayValue }}</span
+                      >
+                    </p>
+                  </van-col>
+                </div>
+              </van-row>
+            </van-collapse-item>
+            <van-collapse-item v-if="homePageItem.labelStyle == 3" :name="(index + 1).toString()">
+              <template #title>
+                <div class="text">{{ homePageItem.name }}</div>
+              </template>
+              <!-- 外层循环：遍历主要类别 -->
+              <van-row
+                v-for="(category, index) in homePageItem.children"
+                :key="index"
+                :style="{ marginTop: index == 0 ? '-10px' : '0' }">
+                <!-- 内层循环：遍历各个统计项 -->
+                <div v-for="(item, idx) in category.children" :key="idx">
+                  <van-col :span="idx == 0 ? 24 : 12">
+                    <p>
+                      {{ item.name }}：<span
+                        :style="labelStyle(item.clickable)"
+                        class="colorbalck"
+                        >{{ item.indicatorDisplayValue }}</span
+                      >
+                    </p>
+                  </van-col>
+                </div>
+              </van-row>
+            </van-collapse-item>
+            <van-collapse-item v-if="homePageItem.labelStyle == 4" :name="(index + 1).toString()">
+              <template #title>
+                <div class="text">{{ homePageItem.name }}</div>
+              </template>
+              <!-- 外层循环：遍历主要类别 -->
+              <template v-for="(category, index) in homePageItem.children">
+                <van-row
+                  :style="{
+                    width: category.name ? '49%' : '100%',
+                    float: category.name ? 'left' : 'none',
+                  }">
+                  <van-col
+                    span="20"
+                    :class="index % 2 === 0 ? 'leftTitle' : 'rightTitle'"
+                    v-if="category.name">
+                    <span>{{ category.name }}</span>
+                  </van-col>
+
+                  <!-- 内层循环：遍历各个统计项 -->
+                  <div v-for="(item, idx) in category.children" :key="idx">
+                    <van-col :span="24">
+                      <p>
+                        {{ item.name }}：<span
+                          :style="labelStyle(item.clickable)"
+                          class="colorbalck"
+                          >{{ item.indicatorDisplayValue }}</span
+                        >
+                      </p>
+                    </van-col>
+                  </div>
+                </van-row>
+              </template>
+            </van-collapse-item>
+            <van-collapse-item v-if="homePageItem.labelStyle == 5" :name="(index + 1).toString()">
+              <template #title>
+                <div class="text">{{ homePageItem.name }}</div>
+              </template>
+              <!-- 外层循环：遍历主要类别 -->
+              <van-row
+                v-for="(category, index) in homePageItem.children"
+                :key="index"
+                :style="{ marginTop: index == 0 ? '-10px' : '0' }">
+                <!-- 内层循环：遍历各个统计项 -->
+                <div v-for="(item, idx) in category.children" :key="idx">
+                  <van-col :span="24">
+                    <p>
+                      {{ item.name }}：<span
+                        :style="labelStyle(item.clickable)"
+                        class="colorbalck"
+                        >{{ item.indicatorDisplayValue }}</span
+                      >
+                    </p>
+                  </van-col>
+                </div>
+              </van-row>
+            </van-collapse-item>
+          </div>
+        </van-collapse>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'shareCommonTarget',
+  props: {
+    homePageIndicatorDate: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      shows: true,
+      show: true,
+      num: 0,
+      todayGoal: {},
+      progressWidth: 0,
+      updataTime: '',
+      activeNames: [
+        '1',
+        '2',
+        '3',
+        '4',
+        '5',
+        '6',
+        '7',
+        '8',
+        '10',
+        '11',
+        '12',
+        '16',
+        '17',
+        '20',
+        '21',
+        '22',
+        '23',
+        '24',
+        '25',
+        '26',
+        '27',
+        '28',
+        '29',
+        '30',
+        '31',
+        '32',
+        '33',
+        '34',
+        '35',
+        '36',
+        '37',
+        '38',
+        '39',
+        '40',
+        '41',
+        '42',
+        '43',
+      ],
+      activeNameType: [],
+      powerGradeShow: false,
+      showButton: false,
+      isCommit: null,
+      powerGrade: '2',
+      deptLevel: '',
+      // positionId：等级（1-销售员 2-销售部主管 3-大区主管 4-区域公司总经理 5-DIY公司）
+      reportTargetAll: {},
+      approvalPendingNum: 0,
+      isDiy: false,
+      approvalButton: false,
+      times: 5,
+      timer: null,
+      type: '-1',
+      monthNoVisit: {},
+      flag: true,
+      reportInfoData: {},
+      applyNumber: '',
+      proccessPendingNum: 0,
+      JZQuota: false,
+      GZdata: false,
+    };
+  },
+  methods: {
+    labelStyle(val) {
+      return {
+        'text-decoration': 'none',
+        color: '#fff',
+      };
+    },
+  },
+};
+</script>
+<style scoped>
+.shareCommonTarget {
+  .homeTitle {
+    padding: 6px 16px;
+  }
+
+  .homeTitle .van-icon__image {
+    width: 1.4em;
+    height: auto;
+  }
+
+  .container {
+    margin: 10px 0;
+  }
+
+  .container .van-collapse-item {
+    margin-bottom: 10px;
+    overflow: hidden;
+  }
+
+  .progressContentlist {
+    font-size: 14px;
+    padding: 10px 0;
+  }
+
+  .linep p {
+    margin: 10px 0 0 0;
+    font-size: 14px;
+    color: #fff;
+  }
+
+  .leftTitle {
+    color: #fff;
+    display: inline-block;
+    margin-top: 10px;
+  }
+
+  .rightTitle {
+    color: #fff;
+    display: inline-block;
+    white-space: nowrap;
+    margin-top: 10px;
+  }
+  .colorblack {
+    color: #fff;
+  }
+  .colorbalck {
+    color: #fff;
+  }
+}
+</style>
+<style lang="scss">
+.shareCommonTarget {
+  .myTab .van-tabs__nav--card {
+    margin: 0 !important;
+  }
+
+  .myTab .van-tabs__wrap,
+  .van-tabs__nav--card {
+    height: 39px;
+  }
+
+  .myTab .van-tab {
+    line-height: 40px;
+  }
+
+  .linep .van-collapse-item__content {
+    color: #fff;
+  }
+
+  .linep .van-collapse-item__content {
+    color: #fff;
+  }
+
+  .linep .van-cell__title {
+    color: #fff;
+    font-weight: 500;
+    font-size: 16px;
+  }
+
+  .homeCellIcon {
+    line-height: 34px;
+  }
+
+  .homeTitle .van-cell__title {
+    color: #fff;
+    font-size: 16px;
+    font-weight: bold;
+    padding-left: 4px;
+    line-height: 36px;
+    height: 36px;
+  }
+
+  .updataTime {
+    color: #fff;
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .homeTitle .van-tag--danger {
+    /* border-radius: 20px; */
+  }
+
+  .van-dialog__confirm,
+  .van-dialog__confirm:active {
+    color: #fff;
+  }
+
+  .van-collapse-item__content {
+    padding: 0px !important;
+    overflow: hidden;
+    background-color: unset !important;
+  }
+
+  .storeTypeHome .storeTypeHomeList .van-cell__title {
+    color: #fff;
+    font-size: 14px;
+  }
+
+  .storeTypeHome .monthNoVisit {
+    padding: 10px;
+    margin: 10px;
+    border-radius: 5px;
+    background-color: #ebf4ff;
+  }
+
+  .storeTypeHome .leftContent {
+    padding-right: 68px;
+    position: relative;
+  }
+
+  .storeTypeHome .monthNoVisitStatstext {
+    font-size: 12px;
+    background-color: #0057ba;
+    position: absolute;
+    right: 0;
+    top: 6px;
+    padding: 2px 6px 2px 12px;
+    color: #fff;
+  }
+
+  .colBack {
+    width: 100%;
+    height: 100%;
+    display: block;
+    /* overflow: unset; */
+    position: relative;
+    z-index: 2;
+    float: left;
+    z-index: 2;
+
+    .back {
+      position: absolute;
+      background: rgb(226, 240, 217);
+      height: 100%;
+      display: block;
+      overflow: hidden;
+      /* z-index: 1; */
+      border-radius: 12px;
+      bottom: -4px;
+    }
+
+    .backLeft {
+      width: 45%;
+      left: -12px;
+    }
+
+    .backRight {
+      width: 50%;
+      left: calc(50% - 12px);
+    }
+
+    .van-col {
+      position: relative;
+      z-index: 3;
+    }
+  }
+}
+.shareCommonTarget {
+  color: #fff;
+  .van-cell {
+    background-color: unset !important;
+    padding: 0 !important;
+  }
+  :deep(*) {
+    border: none !important;
+  }
+
+  .table-headermdhome {
+    font-size: 14px;
+  }
+
+  .table-headermdhome th.el-table__cell > .cell {
+    white-space: pre;
+  }
+
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
+
+  .table-headermdhome.van-cell {
+    padding: 0 6px;
+    height: 100%;
+  }
+
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
+
+  .table-headermdhometh.el-table__cell:first-child > .cell {
+    text-align: left;
+  }
+
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
+
+  .table-headermdhome th.el-table__cell {
+    // background-color: #fff;
+    color: #fff;
+  }
+
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
+
+  .table-headermdhome.el-table .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
+
+  .table-headermdhome .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    text-align: center;
+  }
+
+  .table-headermd::before {
+    height: 0;
+  }
+
+  .table-headermd .cell,
+  .el-table--border .el-table__cell:first-child .cell {
+    padding: 0 4px;
+  }
+  .van-hairline--top-bottom::after,
+  .van-hairline-unset--top-bottom::after {
+    border-width: 0;
+  }
+  .van-cell::after {
+    border-width: 0;
+  }
+  .van-collapse-item--border::after {
+    border-width: 0;
+  }
+  .van-cell__right-icon {
+    display: none;
+  }
+  .text {
+    background: url('../assets/textBack.png') no-repeat;
+    width: 100%;
+    height: vw(94);
+    background-size: cover;
+    color: #7d0207;
+    font-size: vw(36);
+    text-align: center;
+    line-height: vw(94);
+    // margin-top: vw(152);
+    // margin-bottom: vw(45);
+    margin: vw(35) 0 vw(15) 0;
+    font-weight: bold;
+  }
+}
+</style>

src/components/shareReportCustom.vue

@@ -86,8 +86,8 @@ export default {
   }
 
   .content {
-    font-size: vw(28);
-    font-weight: bold;
+    font-size: 14px;
+    // font-weight: bold;
     color: #ffff;
     line-height: vw(63);
     white-space: pre-wrap;

src/views/componentsTarget/createStoreBJ.vue

@@ -123,6 +123,67 @@
           <span class="colorbalck" v-else>({{ '-' }})</span>
         </p>
       </van-col>
+      <!-- <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">仿石漆店</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.fsqShopMonthAct) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_JPBJ">金牌店布机</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.goldShopBjYearAct) }}</span>
+          <span class="colorbalck" v-if="reportTargetAll.goldShopBjYearRate">
+            ({{ reportTargetAll.goldShopBjYearRate }}%)
+          </span>
+          <span class="colorbalck" v-else>({{ '-' }})</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxTlShopMonthAct)
+          }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxTlShopYearAct)
+          }}</span>
+          <span class="colorbalck" v-if="reportTargetAll.tcfxTlShopYearRate">
+            ({{ reportTargetAll.tcfxTlShopYearRate }}%)
+          </span>
+          <span class="colorbalck" v-else>({{ '-' }})</span>
+        </p>
+      </van-col>
+
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOtherShopMonthAct) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOtherShopYearAct) }}</span>
+          <span class="colorbalck" v-if="reportTargetAll.tcfxOtherShopYearRate">
+            ({{ reportTargetAll.tcfxOtherShopYearRate }}%)
+          </span>
+          <span class="colorbalck" v-else>({{ '-' }})</span>
+        </p>
+      </van-col> -->
     </div>
   </van-row>
 </template>

src/views/componentsTarget/placeOrder.vue

@@ -79,6 +79,43 @@
           <span class="colorbalck">{{ reportTargetAll.tcfxOtherShopMonthOrderRate }}%</span>
         </p>
       </van-col>
+      <!-- <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销近3月</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxOrderShopMonthAct) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxTlOrderShopMonthAct) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          涂料店：
+          <span class="colorbalck">{{ reportTargetAll.tcfxTlShopMonthOrderRate }}%</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcfxOtherOrderShopMonthAct)
+          }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p style="margin-top: 0">
+          厨卫店：
+          <span class="colorbalck">{{ reportTargetAll.tcfxOtherShopMonthOrderRate }}%</span>
+        </p>
+      </van-col> -->
     </div>
   </van-row>
 </template>

src/views/componentsTarget/visitedRealTime.vue

@@ -135,6 +135,19 @@
           <span class="colorbalck"> ({{ reportTargetAll.tcfxOtherShopVisitMonthRate }}%) </span>
         </p>
       </van-col>
+      <!-- <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxShopVisitDayNum) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span class="colLabel colLabel_TCFX">同城分销近3月</span>
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcfxShopVisitMonthNum) }}</span>
+          <span class="colorbalck"> ({{ reportTargetAll.tcfxShopVisitMonthRate }}%) </span>
+        </p>
+      </van-col> -->
     </div>
   </van-row>
 </template>

src/views/home/HomeTarget.vue

@@ -115,7 +115,71 @@
                         :style="labelStyle(item.clickable)"
                         @click="onClick(item.clickable)"
                         class="colorbalck"
-                        >{{ Micrometer(item.indicatorValue) }}{{ item.indicatorUnit }}</span
+                        >{{ item.indicatorDisplayValue }}</span
+                      >
+                    </p>
+                  </van-col>
+                </div>
+              </van-row>
+            </van-collapse-item>
+            <van-collapse-item
+              v-if="homePageItem.labelStyle == 4"
+              :name="(index + 1).toString()"
+              :title="homePageItem.name">
+              <!-- 外层循环：遍历主要类别 -->
+              <template v-for="(category, index) in homePageItem.children">
+                <van-row
+                  :style="{
+                    width: category.name ? '49%' : '100%',
+                    float: category.name ? 'left' : 'none',
+                  }">
+                  <van-col span="20" v-if="category.name">
+                    <span :class="index % 2 === 0 ? 'leftTitle' : 'rightTitle'">{{
+                      category.name
+                    }}</span>
+                  </van-col>
+
+                  <!-- 内层循环：遍历各个统计项 -->
+                  <div v-for="(item, idx) in category.children" :key="idx">
+                    <van-col :span="24">
+                      <p>
+                        {{ item.name }}：<span
+                          :style="labelStyle(item.clickable)"
+                          @click="onClick(item.clickable)"
+                          class="colorbalck"
+                          >{{ item.indicatorDisplayValue }}</span
+                        >
+                      </p>
+                    </van-col>
+                  </div>
+                </van-row>
+              </template>
+            </van-collapse-item>
+            <van-collapse-item v-if="homePageItem.labelStyle == 5" :name="(index + 1).toString()">
+              <template #title>
+                <div style="display: flex; justify-content: space-between">
+                  <span>{{ homePageItem.name }}</span>
+                  <p
+                    v-if="homePageItem.indicatorDate"
+                    style="color: #999; margin-top: 0; margin-right: 20px">
+                    {{ homePageItem.indicatorDate }}
+                  </p>
+                </div>
+              </template>
+              <!-- 外层循环：遍历主要类别 -->
+              <van-row
+                v-for="(category, index) in homePageItem.children"
+                :key="index"
+                :style="{ marginTop: index == 0 ? '-10px' : '0' }">
+                <!-- 内层循环：遍历各个统计项 -->
+                <div v-for="(item, idx) in category.children" :key="idx">
+                  <van-col :span="24">
+                    <p>
+                      {{ item.name }}：<span
+                        :style="labelStyle(item.clickable)"
+                        @click="onClick(item.clickable)"
+                        class="colorbalck"
+                        >{{ item.indicatorDisplayValue }}</span
                       >
                     </p>
                   </van-col>

src/views/home/hintTabPage/index.vue

@@ -378,6 +378,23 @@ export default {
               },
             ],
           },
+          // {
+          //   title: '同城分销',
+          //   titleProp: 'Tcfx',
+          //   bagColor: '#8f82bc',
+          //   visitDetail: [
+          //     {
+          //       leftTable: '近3个月拜访率：',
+          //       leftProp: 'visitRateInThePastThreeMonths',
+          //       leftUnit: '%',
+          //       leftIsClick: false,
+          //       rightTable: '未拜访：',
+          //       rightProp: 'notVisited',
+          //       rightUnit: '家',
+          //       rightIsClick: true,
+          //     },
+          //   ],
+          // },
         ],
         resData: null,
       },
@@ -447,6 +464,29 @@ export default {
               },
             ],
           },
+          // {
+          //   title: '仿石漆店',
+          //   titleProp: 'Fsq',
+          //   bagColor: '#8f82bc',
+          //   visitDetail: [
+          //     {
+          //       leftTable: '本月累计：',
+          //       leftProp: 'month',
+          //       leftUnit: '家',
+          //       leftIsClick: false,
+          //     },
+          //     {
+          //       leftTable: '今年累计：',
+          //       leftProp: 'year',
+          //       leftUnit: '家',
+          //       leftIsClick: false,
+          //       // rightTable: '7天未结案：',
+          //       // rightProp: 'QiTaAbnormalNum',
+          //       // rightUnit: '家',
+          //       // rightIsClick: true,
+          //     },
+          //   ],
+          // },
           {
             title: '同城分销-涂料店',
             titleProp: 'TuLiao',

src/views/home/index.vue

@@ -13,7 +13,7 @@
           <ABtarget :tabVal="tabVal" ref="Atarget"></ABtarget>
         </van-tab>
         <van-tab title="B类指标" name="1" v-if="onlyShowHomeTarget == false">
-          <ABtarget :tabVal="tabVal" ref="Btarget"></ABtarget>
+          <ABtarget :tabVal="tabVal" ref="Btarget" :BMDType="userInfo.BMDType"></ABtarget>
         </van-tab>
         <van-tab title="首页指标" name="2" v-if="onlyShowHomeTarget == true">
           <HomeTarget :tabVal="tabVal" ref="HomeTarget"></HomeTarget>
@@ -109,15 +109,22 @@ export default {
     },
     async getDict(isRefresh) {
       let postName = this.userInfo.postName;
+      let postType = this.userInfo.postType;
       if (postName == '质感销售负责人' || postName == '质感销售专员') {
         this.onlyShowHomeTarget = true;
       } else {
-        this.onlyShowHomeTarget = false;
-        let postType = this.userInfo.postType;
-        // postType：人员类型，JZ（家装）、GZ（公装）、YF（应服）、DIY（DIY）
-        if (postType == 'JZ' || postType == 'GZ') {
-          localStorage.setItem('isGZorJZ', 'true');
-          this.isGZorJZ = 'true';
+        // <!-- 0-历史指标  1-动态指标，String类型 -->
+        //  || this.userInfo.BMDType == 'BMD'
+        if (postType == 'GZ') {
+          if (this.reportInfo.targetType == '0') {
+            this.onlyShowHomeTarget = false;
+          } else if (this.reportInfo.targetType == '1') {
+            this.onlyShowHomeTarget = true;
+          }
+          if (postType == 'GZ') {
+            localStorage.setItem('isGZorJZ', 'true');
+            this.isGZorJZ = 'true';
+          }
         } else {
           localStorage.setItem('isGZorJZ', 'false');
           this.isGZorJZ = 'false';

src/views/week/daily.vue

@@ -30,396 +30,25 @@
         <target :homePageIndicatorDate="homePageIndicatorList"></target>
       </template>
       <template v-else>
-        <van-collapse v-model="activeNames" v-if="!YFQuota">
-          <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-            <visitedRealTime
-              :reportTargetAll="reportTargetAll"
-              :powerGrade="powerGrade"
-              :JZQuota="JZQuota"></visitedRealTime>
-          </van-collapse-item>
-          <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-          </van-collapse-item>
-          <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
-            <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
-          </van-collapse-item>
-          <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
-            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-            <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
-            <van-row style="margin-top: -10px">
-              <van-col span="12"><span class="leftTitle">本月</span></van-col
-              ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzCtzjMonthAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzCtzjQuarterAct)
-                  }}</span>
-                </p></van-col
-              >
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjMonthSuccessRate) }}%</span></p></van-col>-->
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjQuarterSuccessRate) }}%</span></p></van-col>-->
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzCtzjMonthGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzCtzjQuarterGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="42" title="商机关联的质感外墙业绩SAP(千元)">
-            <van-row style="margin-top: -10px">
-              <van-col span="12"><span class="leftTitle">本月</span></van-col
-              ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzZgwqMonthAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzZgwqQuarterAct)
-                  }}</span>
-                </p></van-col
-              >
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzZgwqMonthSuccessRate) }}%</span></p></van-col>-->
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzZgwqQuarterSuccessRate) }}%</span></p></van-col>-->
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzZgwqMonthGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzZgwqQuarterGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
-            <van-row>
-              <!--            <van-col span="12"><span class="leftTitle">全年开户</span></van-col><van-col span="12"><span class="rightTitle">本月报备</span></van-col>-->
-              <van-col span="12"
-                ><p>
-                  全年实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzKhljYearAct)
-                  }}</span>
-                </p></van-col
-              >
-              <!--            <van-col span="12" ><p>报备成功数:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzBbMonthSuccessNum) }}</span></p></van-col>-->
-              <!--            <van-col span="12"><p>&nbsp;</p></van-col>-->
-              <van-col span="12"
-                ><p>
-                  全年目标:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzKhljYearTarget)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"><p>&nbsp;</p></van-col>
-              <van-col span="12"
-                ><p>
-                  目标达成率:<span class="colorbalck"
-                    >{{ Micrometer(reportTargetAll.gzKhljSuccessRate) }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="40" title="今日拜访">
-            <van-row>
-              <van-col span="12"
-                ><p>
-                  公装客户数:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzVisitCustomerNum)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  工地数:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzVisitGdNum)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  潜在客户数:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzVisitQzCustomerNum)
-                  }}</span>
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" title="专业时时丽SAP(千元)">
-            <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
-            <van-row>
-              <van-col span="12"><span class="leftTitle">本月业绩</span></van-col
-              ><van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
-              <van-col span="12"
-                ><p>
-                  实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.czjSapMonthAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.czjSapQuarterAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.czjSapMonthSuccessRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.czjSapQuarterSuccessRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  成长率:<span class="colorbalck">{{ reportTargetAll.czjSapMonthGrowRate }}%</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.czjSapQuarterGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" title="超好贴分销店下单">
-            <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
-            <van-row>
-              <van-col span="24"
-                ><p>
-                  当月新增店数:<span class="colorbalck">{{
-                    reportTargetAll.exhibitionHallMonthAct
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  全年实际店数:<span class="colorbalck"
-                    >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  全年达成进度率:<span class="colorbalck"
-                    >{{ reportTargetAll.exhibitionHallYearRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="JZQuota" name="22" title="基材粉料过账(千元)">
-            <van-row>
-              <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-              <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerMonth }}</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerQuarter }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单数(包):<span class="colorbalck">{{
-                    reportTargetAll.jcPostOrderNumMonth
-                  }}</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  下单数(包):<span class="colorbalck">{{
-                    reportTargetAll.jcPostOrderNumQuarter
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.jcPostOrderPriceMonth)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.jcPostOrderPriceQuarter)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck">{{ reportTargetAll.jcPostOrderRateMonth }}%</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck"
-                    >{{ reportTargetAll.jcPostOrderRateQuarter }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-              <van-col span="24"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerYear }}</span>
-                </p>
-              </van-col>
-              <van-col span="24"
-                ><p>
-                  下单数(包):<span class="colorbalck">{{
-                    reportTargetAll.jcPostOrderNumYear
-                  }}</span>
-                </p>
-              </van-col>
-              <van-col span="24"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.jcPostOrderPriceYear)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="24"
-                ><p>
-                  下单率:<span class="colorbalck">{{ reportTargetAll.jcPostOrderRateYear }}%</span>
-                </p>
-              </van-col>
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="JZQuota" name="21" title="魔术漆过账(千元)">
-            <van-row>
-              <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-              <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.msqPostCustomerMonth }}</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{
-                    reportTargetAll.msqPostCustomerQuarter
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.msqPostOrderPriceMonth)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.msqPostOrderPriceQuarter)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck"
-                    >{{ reportTargetAll.msqPostOrderRateMonth }}%</span
-                  >
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck"
-                    >{{ reportTargetAll.msqPostOrderRateQuarter }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-              <van-col span="24"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.msqPostCustomerYear }}</span>
-                </p>
-              </van-col>
-              <van-col span="24"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.msqPostOrderPriceYear)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="24"
-                ><p>
-                  下单率:<span class="colorbalck">{{ reportTargetAll.msqPostOrderRateYear }}%</span>
-                </p>
-              </van-col>
-            </van-row>
-          </van-collapse-item>
-          <!-- 生动化陈列 sku -->
-          <div v-if="photoSkuImgSummaryeList && photoSkuImgSummaryeList.length" class="SKUTable">
-            <p style="padding-bottom: 10px; font-size: 14px; color: #1e5398; font-weight: 500">
-              SKU陈列照识别结果
-            </p>
-            <p style="padding-bottom: 10px; font-size: 14px; font-weight: 500">
-              目前识别桶装和战略产品合计106个，后续会增加被识别产品数
-            </p>
-            <el-table
-              :data="photoSkuImgSummaryeList"
-              border
-              class="table-headermd1"
-              style="width: 100%">
-              <el-table-column label="序号" type="index" width="50px" align="center" />
-              <el-table-column label="门店名称（编号）" prop="name" align="center">
-                <template slot-scope="scope">
-                  {{ scope.row.storeName }}({{ scope.row.storeCode }})
-                </template>
-              </el-table-column>
-              <el-table-column label="SKU数量" prop="count" width="80px" align="center" />
-            </el-table>
-          </div>
+        <van-collapse v-model="activeNames" style="margin-top: -3px">
+          <template v-if="!YFQuota">
+            <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+              <!-- 0-历史指标  1-动态指标，String类型 -->
+              <target
+                v-if="reportTarget.targetType == '1'"
+                :homePageIndicatorDate="homePageIndicatorList"></target>
+              <template v-else>
+                <!-- 历史指标 -->
+                <Atarget :reportInfo="reportTarget"></Atarget>
+                <Btarget :reportInfo="reportTarget"></Btarget>
+              </template>
+            </template>
+            <template v-else>
+              <!-- YFQuota:应用服务平台 不显示各项指标 -->
+              <Atarget :reportInfo="reportTarget"></Atarget>
+              <Btarget :reportInfo="reportTarget"></Btarget>
+            </template>
+          </template>
         </van-collapse>
       </template>
       <div class="contentContainer">

src/views/week/dailyApproval.vue

@@ -15,434 +15,18 @@
         <target :homePageIndicatorDate="homePageIndicatorList"></target>
       </template>
       <template v-else>
-        <van-collapse v-model="activeNames" v-if="!YFQuota">
-          <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-            <visitedRealTime
-              :reportTargetAll="reportTargetAll"
-              :powerGrade="powerGrade"
-              :JZQuota="JZQuota"></visitedRealTime>
-          </van-collapse-item>
-          <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-          </van-collapse-item>
-          <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
-            <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
-          </van-collapse-item>
-          <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
-            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-            <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-          </van-collapse-item>
-          <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" title="超好贴分销店下单">
-            <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
-            <van-row style="margin-top: -10px">
-              <van-col span="12"><span class="leftTitle">本月</span></van-col
-              ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzCtzjMonthAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzCtzjQuarterAct)
-                  }}</span>
-                </p></van-col
-              >
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjMonthSuccessRate) }}%</span></p></van-col>-->
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjQuarterSuccessRate) }}%</span></p></van-col>-->
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzCtzjMonthGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzCtzjQuarterGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="42" title="商机关联的质感外墙业绩SAP(千元)">
-            <van-row style="margin-top: -10px">
-              <van-col span="12"><span class="leftTitle">本月</span></van-col
-              ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzZgwqMonthAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzZgwqQuarterAct)
-                  }}</span>
-                </p></van-col
-              >
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzZgwqMonthSuccessRate) }}%</span></p></van-col>-->
-              <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzZgwqQuarterSuccessRate) }}%</span></p></van-col>-->
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzZgwqMonthGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  业绩成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.gzZgwqQuarterGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
-            <van-row>
-              <!--            <van-col span="12"><span class="leftTitle">全年开户</span></van-col><van-col span="12"><span class="rightTitle">本月报备</span></van-col>-->
-              <van-col span="12"
-                ><p>
-                  全年实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzKhljYearAct)
-                  }}</span>
-                </p></van-col
-              >
-              <!--            <van-col span="12" ><p>报备成功数:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzBbMonthSuccessNum) }}</span></p></van-col>-->
-              <!--            <van-col span="12"><p>&nbsp;</p></van-col>-->
-              <van-col span="12"
-                ><p>
-                  全年目标:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzKhljYearTarget)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"><p>&nbsp;</p></van-col>
-              <van-col span="12"
-                ><p>
-                  目标达成率:<span class="colorbalck"
-                    >{{ Micrometer(reportTargetAll.gzKhljSuccessRate) }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="GZQuota" name="40" title="今日拜访">
-            <van-row>
-              <van-col span="12"
-                ><p>
-                  公装客户数:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzVisitCustomerNum)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  工地数:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzVisitGdNum)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  潜在客户数:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.gzVisitQzCustomerNum)
-                  }}</span>
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" title="专业时时丽SAP(千元)">
-            <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
-            <van-row>
-              <van-col span="12"><span class="leftTitle">本月业绩</span></van-col
-              ><van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
-              <van-col span="12"
-                ><p>
-                  实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.czjSapMonthAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.czjSapQuarterAct)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.czjSapMonthSuccessRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.czjSapQuarterSuccessRate }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  成长率:<span class="colorbalck">{{ reportTargetAll.czjSapMonthGrowRate }}%</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.czjSapQuarterGrowRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
-            <van-row>
-              <van-col span="24"
-                ><p>
-                  当月新增店数:<span class="colorbalck">{{
-                    reportTargetAll.exhibitionHallMonthAct
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  全年实际店数:<span class="colorbalck"
-                    >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  全年达成进度率:<span class="colorbalck"
-                    >{{ reportTargetAll.exhibitionHallYearRate }}%</span
-                  >
-                </p></van-col
-              >
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="JZQuota" name="22" title="基材粉料过账(千元)">
-            <van-row>
-              <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-              <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerMonth }}</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerQuarter }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单数(包):<span class="colorbalck">{{
-                    reportTargetAll.jcPostOrderNumMonth
-                  }}</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  下单数(包):<span class="colorbalck">{{
-                    reportTargetAll.jcPostOrderNumQuarter
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.jcPostOrderPriceMonth)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.jcPostOrderPriceQuarter)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck">{{ reportTargetAll.jcPostOrderRateMonth }}%</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck"
-                    >{{ reportTargetAll.jcPostOrderRateQuarter }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-              <van-col span="24"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerYear }}</span>
-                </p>
-              </van-col>
-              <van-col span="24"
-                ><p>
-                  下单数(包):<span class="colorbalck">{{
-                    reportTargetAll.jcPostOrderNumYear
-                  }}</span>
-                </p>
-              </van-col>
-              <van-col span="24"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.jcPostOrderPriceYear)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="24"
-                ><p>
-                  下单率:<span class="colorbalck">{{ reportTargetAll.jcPostOrderRateYear }}%</span>
-                </p>
-              </van-col>
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item v-if="JZQuota" name="21" title="魔术漆过账(千元)">
-            <van-row>
-              <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-              <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.msqPostCustomerMonth }}</span>
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  客户数:<span class="colorbalck">{{
-                    reportTargetAll.msqPostCustomerQuarter
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.msqPostOrderPriceMonth)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.msqPostOrderPriceQuarter)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck"
-                    >{{ reportTargetAll.msqPostOrderRateMonth }}%</span
-                  >
-                </p>
-              </van-col>
-              <van-col span="12"
-                ><p>
-                  下单率:<span class="colorbalck"
-                    >{{ reportTargetAll.msqPostOrderRateQuarter }}%</span
-                  >
-                </p></van-col
-              >
-              <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-              <van-col span="24"
-                ><p>
-                  客户数:<span class="colorbalck">{{ reportTargetAll.msqPostCustomerYear }}</span>
-                </p>
-              </van-col>
-              <van-col span="24"
-                ><p>
-                  下单销售额:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.msqPostOrderPriceYear)
-                  }}</span>
-                </p></van-col
-              >
-              <van-col span="24"
-                ><p>
-                  下单率:<span class="colorbalck">{{ reportTargetAll.msqPostOrderRateYear }}%</span>
-                </p>
-              </van-col>
-            </van-row>
-          </van-collapse-item>
-          <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photoSummary">
-            <div
-              class="visitIMG1"
-              :style="{
-                overflow: 'hidden',
-                height: visitIMG1Flag ? 'auto' : '170px',
-              }">
-              <template v-for="(item, index) in reportTarget.photoSummary">
-                <van-col span="6" style="padding: 5px" @click="pviewFn(index)" :key="index">
-                  <img :src="item.fileUrl" alt="" />
-                </van-col>
-              </template>
-            </div>
-            <div
-              v-if="reportTarget.photoSummary.length > 8"
-              class="arrowIcon"
-              style="
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                padding: 5px 0;
-                font-size: 14px;
-                color: #969799;
-              "
-              @click="visitIMG1Flag = !visitIMG1Flag">
-              <template v-if="visitIMG1Flag">
-                <span style="margin-right: 5px">折叠</span>
-                <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
-              </template>
-              <template v-else>
-                <span style="margin-right: 5px">展开</span>
-                <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
-              </template>
-            </div>
-            <!-- 生动化陈列 sku -->
-            <template
-              v-if="
-                reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
-              ">
-              <p style="padding-bottom: 10px; font-size: 14px; color: #1e5398; font-weight: 500">
-                SKU陈列照识别结果
-              </p>
-              <p style="padding-bottom: 10px; font-size: 14px; font-weight: 500">
-                目前识别桶装和战略产品合计106个，后续会增加被识别产品数
-              </p>
-              <el-table
-                :data="reportTarget.photoSkuImgSummaryeList"
-                border
-                class="table-headermd table-headermdhome"
-                style="width: 100%">
-                <el-table-column label="序号" type="index" width="50px" align="center" />
-                <el-table-column label="门店名称（编号）" prop="name" align="center">
-                  <template slot-scope="scope">
-                    {{ scope.row.name }}({{ scope.row.code }})
-                  </template>
-                </el-table-column>
-                <el-table-column label="SKU数量" prop="count" width="80px" align="center" />
-              </el-table>
+        <van-collapse v-model="activeNames" style="margin-top: -3px">
+          <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+            <!-- 0-历史指标  1-动态指标，String类型 -->
+            <target
+              v-if="reportTarget.targetType == '1'"
+              :homePageIndicatorDate="homePageIndicatorList"></target>
+            <template v-else>
+              <!-- 历史指标 -->
+              <Atarget :reportInfo="reportTarget"></Atarget>
+              <Btarget :reportInfo="reportTarget"></Btarget>
             </template>
-          </van-collapse-item>
+          </template>
         </van-collapse>
       </template>
       <div class="contentContainer">

src/views/week/dailyDetails.vue

@@ -33,394 +33,19 @@
           <target :homePageIndicatorDate="homePageIndicatorList"></target>
         </template>
         <template v-else>
-          <van-collapse v-model="activeNames" v-if="!YFQuota">
-            <!-- YFQuota:应用服务平台 不显示各项指标 -->
-            <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-              <visitedRealTime
-                :reportTargetAll="reportTargetAll"
-                :powerGrade="powerGrade"
-                :JZQuota="JZQuota"></visitedRealTime>
-            </van-collapse-item>
-            <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-              <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-            </van-collapse-item>
-            <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
-              <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
-            </van-collapse-item>
-            <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
-              <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-            </van-collapse-item>
-            <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-              <performanceSAP
-                :reportTargetAll="reportTargetAll"
-                :JZQuota="JZQuota"></performanceSAP>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
-              <van-row style="margin-top: -10px">
-                <van-col span="12"><span class="leftTitle">本月</span></van-col
-                ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzCtzjMonthAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzCtzjQuarterAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzCtzjMonthGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzCtzjQuarterGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="42" title="商机关联的质感外墙业绩SAP(千元)">
-              <van-row style="margin-top: -10px">
-                <van-col span="12"><span class="leftTitle">本月</span></van-col
-                ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzZgwqMonthAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzZgwqQuarterAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzZgwqMonthGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzZgwqQuarterGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
-              <van-row>
-                <van-col span="12"
-                  ><p>
-                    全年实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzKhljYearAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    全年目标:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzKhljYearTarget)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"><p>&nbsp;</p></van-col>
-                <van-col span="12"
-                  ><p>
-                    目标达成率:<span class="colorbalck"
-                      >{{ Micrometer(reportTargetAll.gzKhljSuccessRate) }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="40" title="今日拜访">
-              <van-row>
-                <van-col span="12"
-                  ><p>
-                    公装客户数:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzVisitCustomerNum)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    工地数:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzVisitGdNum)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    潜在客户数:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzVisitQzCustomerNum)
-                    }}</span>
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" title="专业时时丽SAP(千元)">
-              <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-            </van-collapse-item>
-            <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
-              <van-row>
-                <van-col span="12"><span class="leftTitle">本月业绩</span></van-col
-                ><van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.czjSapMonthAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.czjSapQuarterAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    达成率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapMonthSuccessRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    达成率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapQuarterSuccessRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapMonthGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapQuarterGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" title="超好贴分销店下单">
-              <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-            </van-collapse-item>
-            <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
-              <van-row>
-                <van-col span="24"
-                  ><p>
-                    当月新增店数:<span class="colorbalck">{{
-                      reportTargetAll.exhibitionHallMonthAct
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    全年实际店数:<span class="colorbalck"
-                      >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    全年达成进度率:<span class="colorbalck"
-                      >{{ reportTargetAll.exhibitionHallYearRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="JZQuota" name="22" title="基材粉料过账(千元)">
-              <van-row>
-                <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-                <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerMonth }}</span>
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{
-                      reportTargetAll.jcPostCustomerQuarter
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单数(包):<span class="colorbalck">{{
-                      reportTargetAll.jcPostOrderNumMonth
-                    }}</span>
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    下单数(包):<span class="colorbalck">{{
-                      reportTargetAll.jcPostOrderNumQuarter
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.jcPostOrderPriceMonth)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.jcPostOrderPriceQuarter)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.jcPostOrderRateMonth }}%</span
-                    >
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.jcPostOrderRateQuarter }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-                <van-col span="24"
-                  ><p>
-                    客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerYear }}</span>
-                  </p>
-                </van-col>
-                <van-col span="24"
-                  ><p>
-                    下单数(包):<span class="colorbalck">{{
-                      reportTargetAll.jcPostOrderNumYear
-                    }}</span>
-                  </p>
-                </van-col>
-                <van-col span="24"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.jcPostOrderPriceYear)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="24"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.jcPostOrderRateYear }}%</span
-                    >
-                  </p>
-                </van-col>
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="JZQuota" name="21" title="魔术漆过账(千元)">
-              <van-row>
-                <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-                <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{
-                      reportTargetAll.msqPostCustomerMonth
-                    }}</span>
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{
-                      reportTargetAll.msqPostCustomerQuarter
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.msqPostOrderPriceMonth)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.msqPostOrderPriceQuarter)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.msqPostOrderRateMonth }}%</span
-                    >
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.msqPostOrderRateQuarter }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-                <van-col span="24"
-                  ><p>
-                    客户数:<span class="colorbalck">{{ reportTargetAll.msqPostCustomerYear }}</span>
-                  </p>
-                </van-col>
-                <van-col span="24"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.msqPostOrderPriceYear)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="24"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.msqPostOrderRateYear }}%</span
-                    >
-                  </p>
-                </van-col>
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photoSummary">
-              <div
-                class="visitIMG1"
-                :style="{
-                  overflow: 'hidden',
-                  height: visitIMG1Flag ? 'auto' : '170px',
-                }">
-                <template v-for="(item, index) in reportTarget.photoSummary">
-                  <van-col span="6" style="padding: 5px" @click="pviewFn(index)" :key="index">
-                    <img :src="item.fileUrl" alt="" />
-                  </van-col>
+          <van-collapse v-model="activeNames" style="margin-top: -3px">
+            <template v-if="!YFQuota">
+              <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+                <!-- 0-历史指标  1-动态指标，String类型 -->
+                <target
+                  v-if="reportTarget.targetType == '1'"
+                  :homePageIndicatorDate="homePageIndicatorList"></target>
+                <template v-else>
+                  <!-- 历史指标 -->
+                  <Atarget :reportInfo="reportTarget"></Atarget>
+                  <Btarget :reportInfo="reportTarget"></Btarget>
                 </template>
-              </div>
+              </template>
               <div
                 v-if="reportTarget.photoSummary.length > 8"
                 class="arrowIcon"
@@ -468,7 +93,7 @@
                   <el-table-column label="SKU数量" prop="count" width="80px" align="center" />
                 </el-table>
               </template>
-            </van-collapse-item>
+            </template>
           </van-collapse>
         </template>
         <div class="contentContainer">

src/views/week/dailyHistoricalDetails.vue

@@ -46,394 +46,19 @@
           <target :homePageIndicatorDate="homePageIndicatorList"></target>
         </template>
         <template v-else>
-          <van-collapse v-model="activeNames" v-if="!YFQuota">
-            <!-- YFQuota:应用服务平台 不显示各项指标 -->
-            <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-              <visitedRealTime
-                :reportTargetAll="reportTargetAll"
-                :powerGrade="powerGrade"
-                :JZQuota="JZQuota"></visitedRealTime>
-            </van-collapse-item>
-            <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-              <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-            </van-collapse-item>
-            <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
-              <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
-            </van-collapse-item>
-            <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
-              <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-            </van-collapse-item>
-            <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-              <performanceSAP
-                :reportTargetAll="reportTargetAll"
-                :JZQuota="JZQuota"></performanceSAP>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
-              <van-row style="margin-top: -10px">
-                <van-col span="12"><span class="leftTitle">本月</span></van-col
-                ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzCtzjMonthAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzCtzjQuarterAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzCtzjMonthGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzCtzjQuarterGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="42" title="商机关联的质感外墙业绩SAP(千元)">
-              <van-row style="margin-top: -10px">
-                <van-col span="12"><span class="leftTitle">本月</span></van-col
-                ><van-col span="12"><span class="rightTitle">本季</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzZgwqMonthAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzZgwqQuarterAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzZgwqMonthGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    业绩成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.gzZgwqQuarterGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
-              <van-row>
-                <van-col span="12"
-                  ><p>
-                    全年实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzKhljYearAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    全年目标:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzKhljYearTarget)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"><p>&nbsp;</p></van-col>
-                <van-col span="12"
-                  ><p>
-                    目标达成率:<span class="colorbalck"
-                      >{{ Micrometer(reportTargetAll.gzKhljSuccessRate) }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="GZQuota" name="40" title="今日拜访">
-              <van-row>
-                <van-col span="12"
-                  ><p>
-                    公装客户数:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzVisitCustomerNum)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    工地数:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzVisitGdNum)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    潜在客户数:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.gzVisitQzCustomerNum)
-                    }}</span>
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" title="专业时时丽SAP(千元)">
-              <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-            </van-collapse-item>
-            <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
-              <van-row>
-                <van-col span="12"><span class="leftTitle">本月业绩</span></van-col
-                ><van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.czjSapMonthAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    实际:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.czjSapQuarterAct)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    达成率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapMonthSuccessRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    达成率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapQuarterSuccessRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapMonthGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    成长率:<span class="colorbalck"
-                      >{{ reportTargetAll.czjSapQuarterGrowRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" title="超好贴分销店下单">
-              <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-            </van-collapse-item>
-            <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
-              <van-row>
-                <van-col span="24"
-                  ><p>
-                    当月新增店数:<span class="colorbalck">{{
-                      reportTargetAll.exhibitionHallMonthAct
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    全年实际店数:<span class="colorbalck"
-                      >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    全年达成进度率:<span class="colorbalck"
-                      >{{ reportTargetAll.exhibitionHallYearRate }}%</span
-                    >
-                  </p></van-col
-                >
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="JZQuota" name="22" title="基材粉料过账(千元)">
-              <van-row>
-                <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-                <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerMonth }}</span>
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{
-                      reportTargetAll.jcPostCustomerQuarter
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单数(包):<span class="colorbalck">{{
-                      reportTargetAll.jcPostOrderNumMonth
-                    }}</span>
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    下单数(包):<span class="colorbalck">{{
-                      reportTargetAll.jcPostOrderNumQuarter
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.jcPostOrderPriceMonth)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.jcPostOrderPriceQuarter)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.jcPostOrderRateMonth }}%</span
-                    >
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.jcPostOrderRateQuarter }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-                <van-col span="24"
-                  ><p>
-                    客户数:<span class="colorbalck">{{ reportTargetAll.jcPostCustomerYear }}</span>
-                  </p>
-                </van-col>
-                <van-col span="24"
-                  ><p>
-                    下单数(包):<span class="colorbalck">{{
-                      reportTargetAll.jcPostOrderNumYear
-                    }}</span>
-                  </p>
-                </van-col>
-                <van-col span="24"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.jcPostOrderPriceYear)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="24"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.jcPostOrderRateYear }}%</span
-                    >
-                  </p>
-                </van-col>
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item v-if="JZQuota" name="21" title="魔术漆过账(千元)">
-              <van-row>
-                <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
-                <van-col span="12"><span class="rightTitle">本季实际</span></van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{
-                      reportTargetAll.msqPostCustomerMonth
-                    }}</span>
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    客户数:<span class="colorbalck">{{
-                      reportTargetAll.msqPostCustomerQuarter
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.msqPostOrderPriceMonth)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.msqPostOrderPriceQuarter)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.msqPostOrderRateMonth }}%</span
-                    >
-                  </p>
-                </van-col>
-                <van-col span="12"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.msqPostOrderRateQuarter }}%</span
-                    >
-                  </p></van-col
-                >
-                <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-                <van-col span="24"
-                  ><p>
-                    客户数:<span class="colorbalck">{{ reportTargetAll.msqPostCustomerYear }}</span>
-                  </p>
-                </van-col>
-                <van-col span="24"
-                  ><p>
-                    下单销售额:<span class="colorbalck">{{
-                      Micrometer(reportTargetAll.msqPostOrderPriceYear)
-                    }}</span>
-                  </p></van-col
-                >
-                <van-col span="24"
-                  ><p>
-                    下单率:<span class="colorbalck"
-                      >{{ reportTargetAll.msqPostOrderRateYear }}%</span
-                    >
-                  </p>
-                </van-col>
-              </van-row>
-            </van-collapse-item>
-            <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photoSummary">
-              <div
-                class="visitIMG1"
-                :style="{
-                  overflow: 'hidden',
-                  height: visitIMG1Flag ? 'auto' : '170px',
-                }">
-                <template v-for="(item, index) in reportTarget.photoSummary">
-                  <van-col span="6" style="padding: 5px" @click="pviewFn(index)" :key="index">
-                    <img :src="item.fileUrl" alt="" />
-                  </van-col>
+          <van-collapse v-model="activeNames" style="margin-top: -3px">
+            <template v-if="!YFQuota">
+              <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+                <!-- 0-历史指标  1-动态指标，String类型 -->
+                <target
+                  v-if="reportTarget.targetType == '1'"
+                  :homePageIndicatorDate="homePageIndicatorList"></target>
+                <template v-else>
+                  <!-- 历史指标 -->
+                  <Atarget :reportInfo="reportTarget"></Atarget>
+                  <Btarget :reportInfo="reportTarget"></Btarget>
                 </template>
-              </div>
+              </template>
               <div
                 v-if="reportTarget.photoSummary.length > 8"
                 class="arrowIcon"
@@ -481,7 +106,7 @@
                   <el-table-column label="SKU数量" prop="count" width="80px" align="center" />
                 </el-table>
               </template>
-            </van-collapse-item>
+            </template>
           </van-collapse>
         </template>
         <div class="contentContainer">

src/views/week/doubleWeekly.vue

@@ -27,8 +27,20 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <van-collapse v-model="activeNames">
-        <Atarget :reportInfo="reportTarget"></Atarget>
-        <Btarget :reportInfo="reportTarget"></Btarget>
+        <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+          <!-- 0-历史指标  1-动态指标，String类型 -->
+          <template v-if="reportTarget.targetType == '1'">
+            <target :homePageIndicatorDate="homePageIndicatorList"></target>
+          </template>
+          <template v-if="reportTarget.targetType == '0'">
+            <Atarget :reportInfo="reportTarget"></Atarget>
+            <Btarget :reportInfo="reportTarget"></Btarget>
+          </template>
+        </template>
+        <template v-else>
+          <Atarget :reportInfo="reportTarget"></Atarget>
+          <Btarget :reportInfo="reportTarget"></Btarget>
+        </template>
         <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <reportCustom

src/views/week/doubleWeeklyApproval.vue

@@ -13,8 +13,20 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <van-collapse v-model="activeNames">
-        <Atarget :reportInfo="reportTarget"></Atarget>
-        <Btarget :reportInfo="reportTarget"></Btarget>
+        <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+          <!-- 0-历史指标  1-动态指标，String类型 -->
+          <template v-if="reportTarget.targetType == '1'">
+            <target :homePageIndicatorDate="homePageIndicatorList"></target>
+          </template>
+          <template v-if="reportTarget.targetType == '0'">
+            <Atarget :reportInfo="reportTarget"></Atarget>
+            <Btarget :reportInfo="reportTarget"></Btarget>
+          </template>
+        </template>
+        <template v-else>
+          <Atarget :reportInfo="reportTarget"></Atarget>
+          <Btarget :reportInfo="reportTarget"></Btarget>
+        </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
 

src/views/week/doubleWeeklyDetils.vue

@@ -12,8 +12,20 @@
     <!--        主体内容-->
     <div class="container linep">
       <van-collapse v-model="activeNames">
-        <Atarget :reportInfo="reportTarget"></Atarget>
-        <Btarget :reportInfo="reportTarget"></Btarget>
+        <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+          <!-- 0-历史指标  1-动态指标，String类型 -->
+          <template v-if="reportTarget.targetType == '1'">
+            <target :homePageIndicatorDate="homePageIndicatorList"></target>
+          </template>
+          <template v-if="reportTarget.targetType == '0'">
+            <Atarget :reportInfo="reportTarget"></Atarget>
+            <Btarget :reportInfo="reportTarget"></Btarget>
+          </template>
+        </template>
+        <template v-else>
+          <Atarget :reportInfo="reportTarget"></Atarget>
+          <Btarget :reportInfo="reportTarget"></Btarget>
+        </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
           <reportCustom

src/views/week/target.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ABtarage">
     <template>
-      <div class="container linep" style="margin: 0">
+      <div class="container linep" v-if="homePageIndicatorDate">
         <van-collapse v-model="activeNames">
           <div v-for="(homePageItem, index) in homePageIndicatorDate" :key="index">
             <van-collapse-item

src/views/week/weekly.vue

@@ -29,8 +29,20 @@
       <van-collapse v-model="activeNames" style="margin-top: -3px">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <Atarget :reportInfo="reportTarget"></Atarget>
-          <Btarget :reportInfo="reportTarget"></Btarget>
+          <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+            <!-- 0-历史指标  1-动态指标，String类型 -->
+            <template v-if="reportTarget.targetType == '1'">
+              <target :homePageIndicatorDate="homePageIndicatorList"></target>
+            </template>
+            <template v-if="reportTarget.targetType == '0'">
+              <Atarget :reportInfo="reportTarget"></Atarget>
+              <Btarget :reportInfo="reportTarget"></Btarget>
+            </template>
+          </template>
+          <template v-else>
+            <Atarget :reportInfo="reportTarget"></Atarget>
+            <Btarget :reportInfo="reportTarget"></Btarget>
+          </template>
         </template>
         <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">

src/views/week/weeklyApproval.vue

@@ -14,8 +14,20 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <Atarget :reportInfo="reportTarget"></Atarget>
-          <Btarget :reportInfo="reportTarget"></Btarget>
+          <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+            <!-- 0-历史指标  1-动态指标，String类型 -->
+            <template v-if="reportTarget.targetType == '1'">
+              <target :homePageIndicatorDate="homePageIndicatorList"></target>
+            </template>
+            <template v-if="reportTarget.targetType == '0'">
+              <Atarget :reportInfo="reportTarget"></Atarget>
+              <Btarget :reportInfo="reportTarget"></Btarget>
+            </template>
+          </template>
+          <template v-else>
+            <Atarget :reportInfo="reportTarget"></Atarget>
+            <Btarget :reportInfo="reportTarget"></Btarget>
+          </template>
         </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->

src/views/week/weeklyApprovalDetils.vue

@@ -14,8 +14,20 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <Atarget :reportInfo="reportTarget"></Atarget>
-          <Btarget :reportInfo="reportTarget"></Btarget>
+          <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+            <!-- 0-历史指标  1-动态指标，String类型 -->
+            <template v-if="reportTarget.targetType == '1'">
+              <target :homePageIndicatorDate="homePageIndicatorList"></target>
+            </template>
+            <template v-if="reportTarget.targetType == '0'">
+              <Atarget :reportInfo="reportTarget"></Atarget>
+              <Btarget :reportInfo="reportTarget"></Btarget>
+            </template>
+          </template>
+          <template v-else>
+            <Atarget :reportInfo="reportTarget"></Atarget>
+            <Btarget :reportInfo="reportTarget"></Btarget>
+          </template>
         </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->

src/views/week/weeklyHistoricalDetils.vue

@@ -15,8 +15,20 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <Atarget :reportInfo="reportTarget"></Atarget>
-          <Btarget :reportInfo="reportTarget"></Btarget>
+          <template v-if="reportTarget.postType == 'GZ' || reportTarget.BMDType == 'BMD'">
+            <!-- 0-历史指标  1-动态指标，String类型 -->
+            <template v-if="reportTarget.targetType == '1'">
+              <target :homePageIndicatorDate="homePageIndicatorList"></target>
+            </template>
+            <template v-if="reportTarget.targetType == '0'">
+              <Atarget :reportInfo="reportTarget"></Atarget>
+              <Btarget :reportInfo="reportTarget"></Btarget>
+            </template>
+          </template>
+          <template v-else>
+            <Atarget :reportInfo="reportTarget"></Atarget>
+            <Btarget :reportInfo="reportTarget"></Btarget>
+          </template>
         </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->