Просмотр исходного кода

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

# Conflicts:
#	src/views/week/weekly.vue
#	src/views/week/weeklyApproval.vue
#	src/views/week/weeklyApprovalDetils.vue
#	src/views/week/weeklyHistoricalDetils.vue
zhujindu 1 день назад
Родитель
Сommit
8f3c02eaf0

+ 382 - 0
src/views/home/Atarget.vue

@@ -0,0 +1,382 @@
+<template>
+  <div class="Atarget">
+    <div v-if="type != 4" class="container linep">
+      <van-collapse v-model="activeNames">
+        <!-- performanceSAP 业绩目标SAP(千元)/公裝业绩SAP(千元) -->
+        <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="powerGrade != 1 && !JZQuota && !GZdata"
+          name="2"
+          title="质感外墙SAP(千元)">
+          <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
+        </van-collapse-item>
+        <van-collapse-item
+          v-if="powerGrade != 1 && !JZQuota && !GZdata"
+          name="3"
+          title="魔术漆SAP(千元)">
+          <moshouqiSAP :reportTargetAll="reportTargetAll"></moshouqiSAP>
+        </van-collapse-item>
+        <van-collapse-item
+          v-if="powerGrade != 1 && !JZQuota && !GZdata"
+          name="4"
+          title="防水+背胶SAP(千元)">
+          <fangshuiSAP :reportTargetAll="reportTargetAll"></fangshuiSAP>
+        </van-collapse-item>
+        <van-collapse-item
+          v-if="powerGrade != 1 && !JZQuota && !GZdata"
+          name="5"
+          title="内墙中高端SAP(千元)">
+          <neiqiangzhonggaoduanSAP :reportTargetAll="reportTargetAll"></neiqiangzhonggaoduanSAP>
+        </van-collapse-item>
+        <!-- 内外墙平涂SAP -->
+        <van-collapse-item
+          name="6"
+          v-if="powerGrade != 1 && !JZQuota && !GZdata"
+          title="内外墙平涂SAP(千元)">
+          <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
+        </van-collapse-item>
+        <van-collapse-item
+          v-if="!JZQuota && !GZdata && [1, 4, 5].indexOf(powerGrade) !== -1"
+          name="7"
+          title="专业时时丽SAP(千元)">
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
+        </van-collapse-item>
+        <van-collapse-item
+          v-if="!JZQuota && !GZdata && [1, 4, 5].indexOf(powerGrade) !== -1"
+          name="8"
+          :title="'瓷砖胶SAP(千元)'">
+          <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
+        </van-collapse-item>
+        <van-collapse-item v-if="GZdata" name="9" title="纯态之家SAP(千元)">
+          <chunTaiSAP :reportTargetAll="reportTargetAll"></chunTaiSAP>
+        </van-collapse-item>
+        <van-collapse-item v-if="GZdata" name="10" 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="GZdata" name="11" 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="GZdata" name="12" title="今日拜访">
+          <van-row style="margin-top: -10px">
+            <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" name="13" title="展厅上样">
+          <van-row>
+            <van-col span="24"
+              ><p>
+                当月新增店数:<span class="colorbalck">{{
+                  Micrometer(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="14" 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="15" 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>
+    </div>
+  </div>
+</template>
+<script>
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
+import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
+import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
+export default {
+  components: {
+    performanceSAP,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
+    moshouqiSAP,
+    fangshuiSAP,
+    neiqiangzhonggaoduanSAP,
+  },
+  props: {
+    reportInfo: {
+      type: Object,
+    },
+  },
+  watch: {
+    reportInfo: {
+      handler(val) {
+        if (val.postType == 'GZ') {
+          this.GZdata = true;
+          this.saptitle = '公裝业绩SAP(千元)';
+        } else {
+          this.saptitle = '业绩目标SAP(千元)';
+          this.GZdata = false;
+        }
+        if (val.postType == 'JZ') {
+          this.JZQuota = true;
+        } else {
+          this.JZQuota = false;
+        }
+        this.reportInfoData = val;
+        this.powerGrade = val.positionId;
+        if (val.reportTargetAll != null) {
+          this.reportTargetAll = val.reportTargetAll;
+        }
+        this.type = val.userType;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  data() {
+    return {
+      type: '-1',
+      JZQuota: false,
+      GZdata: false,
+      saptitle: '业绩目标SAP(千元)',
+      powerGrade: '2',
+      reportTargetAll: {},
+      activeNames: [
+        '1',
+        '2',
+        '3',
+        '4',
+        '5',
+        '6',
+        '7',
+        '8',
+        '10',
+        '11',
+        '12',
+        '9',
+        '14',
+        '15',
+        '13',
+      ],
+    };
+  },
+};
+</script>

+ 258 - 0
src/views/home/Btarget.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="Btarget">
+    <div v-if="type != 4" class="container linep">
+      <van-collapse v-model="activeNames">
+        <!-- 拜访数据(实时) -->
+        <van-collapse-item name="7" v-if="powerGrade == 1 && !GZdata">
+          <template #title>
+            <div>拜访数据(实时)</div>
+            <!-- 工装不显示 -->
+          </template>
+          <visitedRealTime
+            :reportTargetAll="reportTargetAll"
+            :powerGrade="powerGrade"
+            :JZQuota="JZQuota"></visitedRealTime>
+        </van-collapse-item>
+        <!-- 建店布机 -->
+        <van-collapse-item name="2" v-if="!JZQuota && !GZdata" title="建店布机">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <!-- 下单点数 -->
+        <van-collapse-item v-if="powerGrade == 1 && !JZQuota && !GZdata" name="33" title="下单点数">
+          <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
+        </van-collapse-item>
+        <!-- 专业时时丽分销店下单 -->
+        <van-collapse-item name="16" v-if="!JZQuota && !GZdata" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
+        <!-- 超好贴分销店下单 -->
+        <van-collapse-item name="17" v-if="!JZQuota && !GZdata" title="超好贴分销店下单">
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
+        </van-collapse-item>
+        <van-collapse-item v-if="powerGrade != 1 && !JZQuota && !GZdata" name="32" title="客户开拓">
+          <van-row>
+            <van-col span="24"><span class="leftTitle">非片客户开发</span></van-col>
+            <van-col span="24">
+              <p>
+                全年开发数:<span class="colorbalck">{{
+                  Micrometer(reportTargetAll.customerAct)
+                }}</span>
+              </p>
+            </van-col>
+            <van-col span="24">
+              <p>
+                全年进度率:
+                <span class="colorbalck"> {{ reportTargetAll.customerYearRate }}% </span>
+              </p>
+            </van-col>
+          </van-row>
+        </van-collapse-item>
+        <van-collapse-item v-if="powerGrade == 2" name="8" title="当日门店拜访情况(实时)">
+          <div v-if="reportTargetAll.realTimeVisits == null" style="margin-top: -10px">
+            <p style="text-align: center; color: #666">暂无数据</p>
+          </div>
+          <div v-if="reportTargetAll.realTimeVisits != null" style="margin-top: -10px">
+            <div class="container" style="width: 100%; margin: 0 auto; padding: 10px 0">
+              <el-table
+                :data="reportTargetAll.realTimeVisits"
+                border
+                class="table-headermd table-headermdhome"
+                style="width: 100%">
+                <el-table-column label="业务员" prop="userName">
+                  <template slot-scope="scope">
+                    <span class="tipTitle">{{ scope.row.userName }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="拜访次数" prop="visitAct" />
+                <el-table-column :label="'金牌店\n拜访率'" prop="jpVisitRate">
+                  <template slot-scope="scope">
+                    <span class="tipTitle">{{ scope.row.jpVisitRate }}%</span>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="'同城店\n拜访率'" prop="tcVisitRate">
+                  <template slot-scope="scope">
+                    <span class="tipTitle">{{ scope.row.tcVisitRate }}%</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </van-collapse-item>
+      </van-collapse>
+    </div>
+    <div v-if="type == 4" class="container linep">
+      <van-collapse v-model="activeNames" v-if="reportInfo.customerUserTargets">
+        <van-collapse-item
+          :name="index + ''"
+          :title="item.nickName"
+          v-for="(item, index) in reportInfo.customerUserTargets"
+          :key="index">
+          <van-row>
+            <van-col span="24"
+              ><p class="indexTile" style="margin-top: -2px">
+                <van-icon :name="bfindex" class="indexicon"></van-icon>拜访
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="leftTitle">本日实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="rightTitle">本月实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                拜访点数:<span class="colorbalck">{{ Micrometer(item.dayVisitCount) }}</span>
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                拜访点数:<span class="colorbalck">{{ Micrometer(item.monthVisitCount) }}</span>
+              </p></van-col
+            >
+            <van-col span="24"
+              ><p class="indexTile">
+                <van-icon :name="storeindex" class="indexicon"></van-icon>建店
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="leftTitle">本日新增</span></p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="rightTitle">本月实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                分销店点数:<span class="colorbalck">{{ Micrometer(item.dayFxdAct) }}</span>
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                分销店点数:<span class="colorbalck">{{ Micrometer(item.monthFxdAct) }}</span>
+              </p></van-col
+            >
+            <van-col span="24"
+              ><p class="indexTile">
+                <van-icon :name="oderindex" class="indexicon"></van-icon>下单
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="leftTitle">昨日新增</span></p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="rightTitle">本月实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                下单点数:<span class="colorbalck">{{ Micrometer(item.yesOrderAct) }}</span>
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                下单点数:<span class="colorbalck">{{ Micrometer(item.monthOrderAct) }}</span>
+              </p></van-col
+            >
+          </van-row>
+        </van-collapse-item>
+      </van-collapse>
+    </div>
+  </div>
+</template>
+<script>
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import visitedRealTime from '@/views/componentsTarget/visitedRealTime';
+import placeOrder from '@/views/componentsTarget/placeOrder';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+
+import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
+export default {
+  components: {
+    createStoreBJ,
+    visitedRealTime,
+    placeOrder,
+    ZYPlaceOrder,
+    veryGoodPlaceOrder,
+    neiqiangzhonggaoduanSAP,
+  },
+  props: {
+    reportInfo: {
+      type: Object,
+    },
+  },
+  watch: {
+    reportInfo: {
+      handler(val) {
+        if (val.postType == 'GZ') {
+          this.GZdata = true;
+          this.saptitle = '公裝业绩SAP(千元)';
+        } else {
+          this.saptitle = '业绩目标SAP(千元)';
+          this.GZdata = false;
+        }
+        if (val.postType == 'JZ') {
+          this.JZQuota = true;
+        } else {
+          this.JZQuota = false;
+        }
+        this.reportInfoData = val;
+        this.powerGrade = val.positionId;
+        if (val.reportTargetAll != null) {
+          this.reportTargetAll = val.reportTargetAll;
+        }
+        this.type = val.userType;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  data() {
+    return {
+      type: '-1',
+      JZQuota: false,
+      GZdata: false,
+      saptitle: '业绩目标SAP(千元)',
+      powerGrade: '2',
+      reportTargetAll: {},
+      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',
+      ],
+    };
+  },
+};
+</script>

+ 6 - 217
src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -13,209 +13,8 @@
     <div class="container linep">
       <p style="font-size: 16px; margin: 10px 0">{{ title }}</p>
       <van-collapse v-model="activeNames">
-        <van-collapse-item title="建店布机" name="2">
-          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-        </van-collapse-item>
-        <van-collapse-item name="16" title="专业时时丽分销店下单">
-          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-        </van-collapse-item>
-        <van-collapse-item name="27" 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.rjqSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <!-- 内外墙平涂SAP -->
-        <van-collapse-item name="2" title="内外墙平涂SAP(千元)">
-          <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-        </van-collapse-item>
-        <van-collapse-item name="11" title="专业时时丽SAP(千元)">
-          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-        </van-collapse-item>
-        <van-collapse-item name="28" 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.fsbjSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fsbjSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item 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 title="魔术漆SAP(千元)" name="3">
-          <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.ysqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.ysqQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item title="质感外墙SAP(千元)" name="4">
-          <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-        </van-collapse-item>
-        <van-collapse-item name="17" title="超好贴分销店下单">
-          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="客户开拓" name="6">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">非片客户开发</span></van-col>
-            <van-col span="24"
-              ><p>
-                全年开发数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24"
-              ><p>
-                全年进度率:<span class="colorbalck">{{ reportTargetAll.customerYearRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
+        <Atarget :reportInfo="reportTarget"></Atarget>
+        <Btarget :reportInfo="reportTarget"></Btarget>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
           <reportCustom
@@ -341,24 +140,14 @@ import {
 } from '@/api/index';
 import envelopes from '@/assets/envelopes.png';
 import axios from 'axios';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
 export default {
   name: 'home',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
+    Atarget,
+    Btarget,
     reportCustom,
   },
   data() {

+ 6 - 217
src/views/week/doubleWeekly.vue

@@ -27,209 +27,8 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <van-collapse v-model="activeNames">
-        <van-collapse-item title="建店布机" name="2">
-          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-        </van-collapse-item>
-        <van-collapse-item name="16" title="专业时时丽分销店下单">
-          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-        </van-collapse-item>
-        <van-collapse-item name="27" 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.rjqSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <!-- 内外墙平涂SAP -->
-        <van-collapse-item name="2" title="内外墙平涂SAP(千元)">
-          <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-        </van-collapse-item>
-        <van-collapse-item name="11" title="专业时时丽SAP(千元)">
-          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-        </van-collapse-item>
-        <van-collapse-item name="28" 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.fsbjSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fsbjSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item 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 title="魔术漆SAP(千元)" name="3">
-          <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.ysqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.ysqQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item title="质感外墙SAP(千元)" name="4">
-          <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-        </van-collapse-item>
-        <van-collapse-item name="17" title="超好贴分销店下单">
-          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="客户开拓" name="6">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">非片客户开发</span></van-col>
-            <van-col span="24"
-              ><p>
-                全年开发数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24"
-              ><p>
-                全年进度率:<span class="colorbalck">{{ reportTargetAll.customerYearRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
+        <Atarget :reportInfo="reportTarget"></Atarget>
+        <Btarget :reportInfo="reportTarget"></Btarget>
         <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <reportCustom
@@ -307,25 +106,15 @@ import {
   getReportInfo,
   tsContents,
 } from '@/api/index';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
 
 export default {
   name: 'home',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
+    Atarget,
+    Btarget,
     reportCustom,
   },
   data() {

+ 6 - 217
src/views/week/doubleWeeklyApproval.vue

@@ -13,209 +13,8 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <van-collapse v-model="activeNames">
-        <van-collapse-item title="建店布机" name="2">
-          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-        </van-collapse-item>
-        <van-collapse-item name="16" title="专业时时丽分销店下单">
-          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-        </van-collapse-item>
-        <van-collapse-item name="27" 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.rjqSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <!-- 内外墙平涂SAP -->
-        <van-collapse-item name="2" title="内外墙平涂SAP(千元)">
-          <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-        </van-collapse-item>
-        <van-collapse-item name="11" title="专业时时丽SAP(千元)">
-          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-        </van-collapse-item>
-        <van-collapse-item name="28" 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.fsbjSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fsbjSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item 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 title="魔术漆SAP(千元)" name="3">
-          <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.ysqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.ysqQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item title="质感外墙SAP(千元)" name="4">
-          <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-        </van-collapse-item>
-        <van-collapse-item name="17" title="超好贴分销店下单">
-          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="客户开拓" name="6">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">非片客户开发</span></van-col>
-            <van-col span="24"
-              ><p>
-                全年开发数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24"
-              ><p>
-                全年进度率:<span class="colorbalck">{{ reportTargetAll.customerYearRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
+        <Atarget :reportInfo="reportTarget"></Atarget>
+        <Btarget :reportInfo="reportTarget"></Btarget>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
           <reportCustom
@@ -313,25 +112,15 @@
 
 <script>
 import { double_week_type, updateReport, getDetailById, getReportInfo } from '@/api/index';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
 
 export default {
   name: 'home',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
+    Atarget,
+    Btarget,
     reportCustom,
   },
   data() {

+ 6 - 217
src/views/week/doubleWeeklyDetils.vue

@@ -12,209 +12,8 @@
     <!--        主体内容-->
     <div class="container linep">
       <van-collapse v-model="activeNames">
-        <van-collapse-item title="建店布机" name="2">
-          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-        </van-collapse-item>
-        <van-collapse-item name="16" title="专业时时丽分销店下单">
-          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-        </van-collapse-item>
-        <van-collapse-item name="27" 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.rjqSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <!-- 内外墙平涂SAP -->
-        <van-collapse-item name="2" title="内外墙平涂SAP(千元)">
-          <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-        </van-collapse-item>
-        <van-collapse-item name="11" title="专业时时丽SAP(千元)">
-          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-        </van-collapse-item>
-        <van-collapse-item name="28" 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.fsbjSapMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fsbjSapQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.fsbjSapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.fsbjSapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item 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 title="魔术漆SAP(千元)" name="3">
-          <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.ysqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.ysqQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.ysqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item title="质感外墙SAP(千元)" name="4">
-          <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-        </van-collapse-item>
-        <van-collapse-item name="17" title="超好贴分销店下单">
-          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-        </van-collapse-item>
-        <van-collapse-item title="客户开拓" name="6">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">非片客户开发</span></van-col>
-            <van-col span="24"
-              ><p>
-                全年开发数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24"
-              ><p>
-                全年进度率:<span class="colorbalck">{{ reportTargetAll.customerYearRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
+        <Atarget :reportInfo="reportTarget"></Atarget>
+        <Btarget :reportInfo="reportTarget"></Btarget>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
           <reportCustom
@@ -321,25 +120,15 @@
 <script>
 import history from '@/assets/Icon/history.png';
 import { userTodayPlanNum, loginLog, homeImge, getDetailById, double_week_type } from '@/api/index';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
 
 export default {
   name: 'home',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
+    Atarget,
+    Btarget,
     reportCustom,
   },
   data() {

+ 6 - 80
src/views/week/weekly.vue

@@ -29,49 +29,8 @@
       <van-collapse v-model="activeNames" style="margin-top: -3px">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-            <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-          </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="3" title="魔术漆SAP(千元)">
-            <moshouqiSAP :reportTargetAll="reportTargetAll"></moshouqiSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="28" title="防水+背胶SAP(千元)">
-            <fangshuiSAP :reportTargetAll="reportTargetAll"></fangshuiSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="powerGrade != 1 && !JZQuota && !GZdata"
-            name="27"
-            title="内墙中高端SAP(千元)">
-            <neiqiangzhonggaoduanSAP :reportTargetAll="reportTargetAll"></neiqiangzhonggaoduanSAP>
-          </van-collapse-item>
-          <!-- 内外墙平涂SAP -->
-          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
-            <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="11"
-            title="专业时时丽SAP(千元)">
-            <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="29"
-            :title="'瓷砖胶SAP(千元)'">
-            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
-          </van-collapse-item>
-          <van-collapse-item title="建店布机" name="2">
-            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-          </van-collapse-item>
-          <van-collapse-item name="16" title="专业时时丽分销店下单">
-            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item name="17" title="超好贴分销店下单">
-            <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-          </van-collapse-item>
+          <Atarget :reportInfo="reportTarget"></Atarget>
+          <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
         <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
@@ -189,33 +148,15 @@
 </template>
 <script>
 import { updateReport, getReportInfo, getDetailById, tsContents } from '@/api/index';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
-import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
-import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
-import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
-import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
 import reportCustom from './reportCustom';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 export default {
   name: 'home',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
-    cizhuanjiaoSAP,
-    neiqiangzhonggaoduanSAP,
-    moshouqiSAP,
-    fangshuiSAP,
     reportCustom,
+    Atarget,
+    Btarget,
   },
   data() {
     return {
@@ -241,16 +182,12 @@ export default {
       value: '2',
       timeList: [],
       isclick: true,
-      reportTargetAll: {},
       reportTarget: {},
       reportContentsList1: [],
       reportContentsList2: [],
       reportContentsList3: [],
       temporaryShow: '',
-      type: '-1',
-      JZQuota: false,
       YFQuota: false, //应用服务
-      GZdata: false,
     };
   },
   created() {
@@ -286,17 +223,7 @@ export default {
         loading1.clear();
         if (res.code == 200) {
           this.YFQuota = res.data.postType == 'YF' ? true : false;
-          this.JZQuota = false;
-          if (res.data.postType == 'JZ') {
-            this.JZQuota = true;
-          }
-          if (res.data.postType == 'GZ') {
-            this.GZdata = true;
-          } else {
-            this.GZdata = false;
-          }
           var dayTime = res.data.date;
-          this.type = res.data.userType;
           this.timeList = this.parseTimeParagraph(
             dayTime.slice(0, 4) + '-' + dayTime.slice(4, 6) + '-' + dayTime.slice(6, 8),
           );
@@ -310,7 +237,6 @@ export default {
                 window.location.replace(window.location.origin + '/mobile/home');
               });
           } else {
-            this.reportTargetAll = res.data.reportTargetAll;
             this.reportTarget = res.data;
             this.reportContents = res.data.reportContents;
             var reportContentsList1 = [];

+ 6 - 65
src/views/week/weeklyApproval.vue

@@ -14,49 +14,8 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-            <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-          </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="3" title="魔术漆SAP(千元)">
-            <moshouqiSAP :reportTargetAll="reportTargetAll"></moshouqiSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="28" title="防水+背胶SAP(千元)">
-            <fangshuiSAP :reportTargetAll="reportTargetAll"></fangshuiSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="powerGrade != 1 && !JZQuota && !GZdata"
-            name="27"
-            title="内墙中高端SAP(千元)">
-            <neiqiangzhonggaoduanSAP :reportTargetAll="reportTargetAll"></neiqiangzhonggaoduanSAP>
-          </van-collapse-item>
-          <!-- 内外墙平涂SAP -->
-          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
-            <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="11"
-            title="专业时时丽SAP(千元)">
-            <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="29"
-            :title="'瓷砖胶SAP(千元)'">
-            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
-          </van-collapse-item>
-          <van-collapse-item title="建店布机" name="2">
-            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-          </van-collapse-item>
-          <van-collapse-item name="16" title="专业时时丽分销店下单">
-            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item name="17" title="超好贴分销店下单">
-            <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-          </van-collapse-item>
+          <Atarget :reportInfo="reportTarget"></Atarget>
+          <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
@@ -187,32 +146,14 @@
 
 <script>
 import { updateReport, getDetailById } from '@/api/index';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
-import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
-import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
-import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
-import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
 export default {
   name: 'weeklyApproval',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
-    cizhuanjiaoSAP,
-    neiqiangzhonggaoduanSAP,
-    moshouqiSAP,
-    fangshuiSAP,
+    Atarget,
+    Btarget,
     reportCustom,
   },
   data() {

+ 6 - 65
src/views/week/weeklyApprovalDetils.vue

@@ -14,49 +14,8 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-            <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-          </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="3" title="魔术漆SAP(千元)">
-            <moshouqiSAP :reportTargetAll="reportTargetAll"></moshouqiSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="28" title="防水+背胶SAP(千元)">
-            <fangshuiSAP :reportTargetAll="reportTargetAll"></fangshuiSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="powerGrade != 1 && !JZQuota && !GZdata"
-            name="27"
-            title="内墙中高端SAP(千元)">
-            <neiqiangzhonggaoduanSAP :reportTargetAll="reportTargetAll"></neiqiangzhonggaoduanSAP>
-          </van-collapse-item>
-          <!-- 内外墙平涂SAP -->
-          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
-            <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="11"
-            title="专业时时丽SAP(千元)">
-            <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="29"
-            :title="'瓷砖胶SAP(千元)'">
-            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
-          </van-collapse-item>
-          <van-collapse-item title="建店布机" name="2">
-            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-          </van-collapse-item>
-          <van-collapse-item name="16" title="专业时时丽分销店下单">
-            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item name="17" title="超好贴分销店下单">
-            <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-          </van-collapse-item>
+          <Atarget :reportInfo="reportTarget"></Atarget>
+          <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
@@ -201,33 +160,15 @@
 <script>
 import history from '@/assets/Icon/history.png';
 import { userTodayPlanNum, loginLog, homeImge, getDetailById } from '@/api/index';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
-import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
-import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
-import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
-import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
 
 export default {
   name: 'home',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
-    cizhuanjiaoSAP,
-    neiqiangzhonggaoduanSAP,
-    moshouqiSAP,
-    fangshuiSAP,
+    Atarget,
+    Btarget,
     reportCustom,
   },
   data() {

+ 6 - 65
src/views/week/weeklyHistoricalDetils.vue

@@ -15,49 +15,8 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-            <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
-          </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="3" title="魔术漆SAP(千元)">
-            <moshouqiSAP :reportTargetAll="reportTargetAll"></moshouqiSAP>
-          </van-collapse-item>
-          <van-collapse-item v-if="powerGrade != 1" name="28" title="防水+背胶SAP(千元)">
-            <fangshuiSAP :reportTargetAll="reportTargetAll"></fangshuiSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="powerGrade != 1 && !JZQuota && !GZdata"
-            name="27"
-            title="内墙中高端SAP(千元)">
-            <neiqiangzhonggaoduanSAP :reportTargetAll="reportTargetAll"></neiqiangzhonggaoduanSAP>
-          </van-collapse-item>
-          <!-- 内外墙平涂SAP -->
-          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
-            <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="11"
-            title="专业时时丽SAP(千元)">
-            <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
-          </van-collapse-item>
-          <van-collapse-item
-            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
-            name="29"
-            :title="'瓷砖胶SAP(千元)'">
-            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
-          </van-collapse-item>
-          <van-collapse-item title="建店布机" name="2">
-            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
-          </van-collapse-item>
-          <van-collapse-item name="16" title="专业时时丽分销店下单">
-            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
-          </van-collapse-item>
-          <van-collapse-item name="17" title="超好贴分销店下单">
-            <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
-          </van-collapse-item>
+          <Atarget :reportInfo="reportTarget"></Atarget>
+          <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报:0-新汇报 1-历史汇报 -->
@@ -213,32 +172,14 @@ import history from '@/assets/Icon/history.png';
 import { loginLog, insertRemark, getDetailById, updateReport } from '@/api/index';
 import envelopes from '@/assets/envelopes.png';
 import axios from 'axios';
-import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
-import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
-import performanceSAP from '@/views/componentsTarget/performanceSAP';
-import ZYSAP from '@/views/componentsTarget/ZYSAP';
-import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
-import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
-import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
-import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
-import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
-import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
-import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
+import Atarget from '@/views/home/Atarget.vue';
+import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
 export default {
   name: 'home',
   components: {
-    createStoreBJ,
-    ZYPlaceOrder,
-    performanceSAP,
-    ZYSAP,
-    veryGoodPlaceOrder,
-    neiwaiqiangpingtu,
-    zhiganwaiqiangSAP,
-    cizhuanjiaoSAP,
-    neiqiangzhonggaoduanSAP,
-    moshouqiSAP,
-    fangshuiSAP,
+    Atarget,
+    Btarget,
     reportCustom,
   },
   data() {