Kaynağa Gözat

Merge branch 'feature_20250219_首页指标修改' into release

zhujindu 9 ay önce
ebeveyn
işleme
c550139f92

+ 37 - 186
src/views/week/weekly.vue

@@ -29,202 +29,45 @@
       <van-collapse v-model="activeNames" style="margin-top: -3px">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <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 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 name="2" title="内外墙平涂SAP(千元)">
+          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
             <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
           </van-collapse-item>
-          <van-collapse-item name="11" title="专业时时丽SAP(千元)">
+          <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 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
+            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
+            name="29"
+            :title="'瓷砖胶SAP(千元)'">
+            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
           </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 title="建店布机" name="2">
+            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
           </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
+          <van-collapse-item name="16" title="专业时时丽分销店下单">
+            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
           </van-collapse-item>
           <van-collapse-item name="17" title="超好贴分销店下单">
             <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
@@ -362,6 +205,10 @@ 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';
 export default {
   name: 'home',
   components: {
@@ -371,7 +218,11 @@ export default {
     ZYSAP,
     veryGoodPlaceOrder,
     neiwaiqiangpingtu,
-    zhiganwaiqiangSAP
+    zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
   },
   data() {
     return {

+ 36 - 192
src/views/week/weeklyApproval.vue

@@ -14,212 +14,52 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <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 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 name="2" title="内外墙平涂SAP(千元)">
+          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
             <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
           </van-collapse-item>
-          <van-collapse-item name="11" title="专业时时丽SAP(千元)">
+          <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 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
+            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
+            name="29"
+            :title="'瓷砖胶SAP(千元)'">
+            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
           </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 title="建店布机" name="2">
+            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
           </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
+          <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>
           <van-collapse-item title="客户开拓" name="6">
             <van-row>
-              <!--            <van-col span="12" v-if="powerGrade>=3"><span class="leftTitle">非片区经销商</span></van-col>-->
-              <!--            v-if="powerGrade==2"-->
               <van-col span="24"><span class="leftTitle">非片客户开发</span></van-col>
-              <!--            <van-col span="12" v-if="powerGrade>=3"><span class="rightTitle" >TOP70直营家装</span></van-col>-->
               <van-col span="24"
                 ><p>
                   全年开发数:<span class="colorbalck">{{
@@ -227,15 +67,11 @@
                   }}</span>
                 </p></van-col
               >
-              <!--            <van-col span="12" v-if="powerGrade>=3"><p>全年目标:<span class="colorbalck">{{reportTargetAll.directCustomerYearTarget}}</span></p></van-col>-->
-              <!--            <van-col span="24"><p>实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.customerAct) }}</span></p></van-col>-->
-              <!--            <van-col span="12" v-if="powerGrade>=3"><p>实际:<span class="colorbalck">{{reportTargetAll.directCustomerAct}}</span></p></van-col>-->
               <van-col span="24"
                 ><p>
                   全年进度率:<span class="colorbalck">{{ reportTargetAll.customerYearRate }}%</span>
                 </p></van-col
               >
-              <!--            <van-col span="12" v-if="powerGrade>=3"><p>全年进度率:<span class="colorbalck">{{reportTargetAll.directCustomerYearRate}}%</span></p></van-col>-->
             </van-row>
           </van-collapse-item>
         </template>
@@ -362,6 +198,10 @@ 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';
 export default {
   name: 'weeklyApproval',
   components: {
@@ -372,6 +212,10 @@ export default {
     veryGoodPlaceOrder,
     neiwaiqiangpingtu,
     zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
   },
   data() {
     return {

+ 37 - 186
src/views/week/weeklyApprovalDetils.vue

@@ -14,202 +14,45 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <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 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 name="2" title="内外墙平涂SAP(千元)">
+          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
             <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
           </van-collapse-item>
-          <van-collapse-item name="11" title="专业时时丽SAP(千元)">
+          <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 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
+            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
+            name="29"
+            :title="'瓷砖胶SAP(千元)'">
+            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
           </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 title="建店布机" name="2">
+            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
           </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
+          <van-collapse-item name="16" title="专业时时丽分销店下单">
+            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
           </van-collapse-item>
           <van-collapse-item name="17" title="超好贴分销店下单">
             <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
@@ -369,6 +212,10 @@ 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';
 
 export default {
   name: 'home',
@@ -379,7 +226,11 @@ export default {
     ZYSAP,
     veryGoodPlaceOrder,
     neiwaiqiangpingtu,
-    zhiganwaiqiangSAP
+    zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
   },
   data() {
     return {

+ 36 - 185
src/views/week/weeklyHistoricalDetils.vue

@@ -15,202 +15,45 @@
       <van-collapse v-model="activeNames">
         <template v-if="!YFQuota">
           <!-- YFQuota:应用服务平台 不显示各项指标 -->
-          <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 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 name="2" title="内外墙平涂SAP(千元)">
+          <van-collapse-item v-if="powerGrade != 1" name="2" title="内外墙平涂SAP(千元)">
             <neiwaiqiangpingtu :reportTargetAll="reportTargetAll"></neiwaiqiangpingtu>
           </van-collapse-item>
-          <van-collapse-item name="11" title="专业时时丽SAP(千元)">
+          <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 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
+            v-if="[1, 4, 5].indexOf(powerGrade) !== -1"
+            name="29"
+            :title="'瓷砖胶SAP(千元)'">
+            <cizhuanjiaoSAP :reportTargetAll="reportTargetAll"></cizhuanjiaoSAP>
           </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 title="建店布机" name="2">
+            <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
           </van-collapse-item>
-          <van-collapse-item title="质感外墙SAP(千元)" name="4">
-            <zhiganwaiqiangSAP :reportTargetAll="reportTargetAll"></zhiganwaiqiangSAP>
+          <van-collapse-item name="16" title="专业时时丽分销店下单">
+            <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
           </van-collapse-item>
           <van-collapse-item name="17" title="超好贴分销店下单">
             <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
@@ -381,6 +224,10 @@ 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';
 export default {
   name: 'home',
   components: {
@@ -391,6 +238,10 @@ export default {
     veryGoodPlaceOrder,
     neiwaiqiangpingtu,
     zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
   },
   data() {
     return {