A、B类指标修改

src/views/home/ABtarget.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="ABtarage">
-    <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p>
+    <p class="updataTime" v-if="userType != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p>
     <template v-if="tabVal == 0 || tabVal == 1">
-      <div v-if="tabVal == 1 && type != 4" class="container linep">
+      <div v-if="tabVal == 1 && userType != 4" class="container linep">
         <van-collapse v-model="activeNames">
           <!-- 拜访数据(实时) -->
           <van-collapse-item name="7" v-if="powerGrade == 1 && !GZdata">
@@ -32,10 +32,10 @@
           </van-collapse-item>
         </van-collapse>
       </div>
-      <div v-if="tabVal == 0 && type != 4" class="container linep">
+      <div v-if="tabVal == 0 && userType != 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">
+          <van-collapse-item v-if="userType != 3 && userType != 4" name="1" :title="saptitle">
             <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
           </van-collapse-item>
           <van-collapse-item
@@ -344,33 +344,12 @@
           </van-collapse-item>
         </van-collapse>
       </div>
-      <div v-if="tabVal == 1 && type != 4" class="container linep">
+      <div v-if="tabVal == 1 && userType != 4" class="container linep">
         <van-collapse v-model="activeNames">
           <!-- 超好贴分销店下单 -->
           <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>
@@ -405,7 +384,7 @@
         </van-collapse>
       </div>
       <!-- 经销商负责人 查看下属 -->
-      <div v-if="tabVal == 1 && type == 4" class="container linep">
+      <div v-if="tabVal == 1 && userType == 4" class="container linep">
         <van-collapse v-model="activeNames" v-if="reportInfoData.customerUserTargets">
           <van-collapse-item
             :name="index + ''"
@@ -541,6 +520,10 @@ export default {
       type: [String, Number],
       default: '-1',
     },
+    userType: {
+      type: [String, Number],
+      default: 1,
+    },
   },
   data() {
     return {
@@ -624,12 +607,18 @@ export default {
       handler(val) {
         if (val == 0) {
           // keep-alive 模式watch执行了两次
-          this.initData();
+          // this.initData();
         }
       },
       immediate: true,
     },
   },
+  activated() {
+    this.initData();
+  },
+  created() {
+    this.initData();
+  },
   methods: {
     initData() {
       console.log(this.tabVal);
@@ -711,6 +700,7 @@ export default {
             this.updataTime = res.data.reportTargetAll.updateTime;
           }
           this.approvalPendingNum = res.data.approvalPendingNum;
+          // 用户类型（默认0）：0=DIY员工；1=DIY经销商-分销人员；2=YSL；3=DIY经销商-倍增和先锋；4=DIY经销商-老板；经销商多身份时：1,4
           this.type = res.data.userType;
           // if (res.data.userType == 4) {
           //   this.tabVal = '1';

src/views/home/bottomBtn.vue

@@ -123,7 +123,7 @@ export default {
     this.getReportInfo();
   },
   methods: {
-    getReportInfo() {
+    getReportInfo(callback) {
       getReportInfo({ isContent: false }).then((res) => {
         if (res.code == 200) {
           if (res.data.postType == 'GZ') {
@@ -155,6 +155,7 @@ export default {
         } else {
           this.$toast(res.msg);
         }
+        callback && callback();
       });
     },
     dailyLink() {

src/views/home/hintTabPage/index.vue

@@ -65,7 +65,7 @@
             :resData="createStore.resData"></visitPage>
         </van-collapse-item>
         <!-- 日报、周报、半月报 -->
-        <van-collapse-item name="3" v-if="empLevel != '4'">
+        <van-collapse-item name="3" v-if="empLevel != '4' && userType != 1 && userType != 3">
           <template #title>
             <div class="itemHeader" @click.stop>
               <span class="itemTitle">{{ report.title }}</span>
@@ -121,7 +121,7 @@
           </div>
         </van-collapse-item>
         <!-- 色卡 -->
-        <van-collapse-item name="4">
+        <van-collapse-item name="4" v-if="userType != 1 && userType != 3">
           <template #title>
             <div class="itemHeader" @click.stop>
               <span class="itemTitle">{{ pantone.title }}</span>
@@ -227,6 +227,10 @@ export default {
       type: [String, Number],
       default: '-1',
     },
+    userType: {
+      type: [String, Number],
+      default: 1,
+    },
   },
   data() {
     return {

src/views/home/index.vue

@@ -10,16 +10,19 @@
         color="#0057ba"
         @click="onClickTabs"
         v-if="isGZorJZ">
-        <van-tab title="提示类" name="-1" v-if="isGZorJZ == 'false'">
+        <van-tab title="提示类" name="-1" v-if="isGZorJZ == 'false' && userType != '4'">
           <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-            <hintTabPage :tabVal="tabVal" ref="hintTabPage"></hintTabPage>
+            <hintTabPage :tabVal="tabVal" ref="hintTabPage" :userType="userType"></hintTabPage>
           </van-pull-refresh>
         </van-tab>
-        <van-tab title="A类指标" name="0">
+        <van-tab
+          title="A类指标"
+          name="0"
+          v-if="userType != '1' && userType != '3' && userType != '4'">
           <ABtarget :tabVal="tabVal" ref="Atarget"></ABtarget>
         </van-tab>
-        <van-tab title="B类指标" name="1">
-          <ABtarget :tabVal="tabVal" ref="Btarget"></ABtarget>
+        <van-tab title="B类指标" name="1" v-if="isGZorJZ == 'false'">
+          <ABtarget :tabVal="tabVal" ref="Btarget" :userType="userType"></ABtarget>
         </van-tab>
       </van-tabs>
       <div class="bottomBtn">
@@ -60,6 +63,7 @@ export default {
       hintTabPageIndex: 0,
       isGZorJZ: null,
       isLoading: false,
+      userType: null,
     };
   },
   watch: {
@@ -120,7 +124,11 @@ export default {
         } else if (this.tabVal == '1') {
           if (this.$refs.Btarget) this.$refs.Btarget.initData();
         }
-        if (this.$refs.bottomBtn) this.$refs.bottomBtn.getReportInfo();
+        if (this.$refs.bottomBtn)
+          this.$refs.bottomBtn.getReportInfo(() => {
+            // 用户类型（默认0）：0=DIY员工；1=DIY经销商-分销人员；2=YSL；3=DIY经销商-倍增和先锋；4=DIY经销商-老板；经销商多身份时：1,4
+            this.userType = localStorage.getItem('uType');
+          });
       });
     },
     onClickTabs(val) {
@@ -147,6 +155,7 @@ export default {
           localStorage.setItem('jzType', res.data.jzType);
           localStorage.setItem('customerVisits', res.data.customerManagerVisits);
           localStorage.setItem('postType', res.data.postType);
+          this.userType = res.data.userType;
         } else {
           this.$toast(res.msg);
         }

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -200,30 +200,6 @@
         <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">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</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>
         <van-collapse-item title="上期工作成果" name="7">
           <div style="margin-top: -10px">
             <div v-for="(item, index) in reportContentsList2" :key="index">

src/views/week/doubleWeekly.vue

@@ -213,31 +213,6 @@
         <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">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</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>
-
         <van-collapse-item title="上期工作成果" name="7" class="collapsettitle">
           <template #title>
             <div>上期工作成果 <span class="colorRed">(必填)</span></div>

src/views/week/doubleWeeklyApproval.vue

@@ -199,30 +199,6 @@
         <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">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</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>
         <van-collapse-item title="上期工作成果" name="7">
           <div style="margin-top: -10px">
             <div v-for="(item, index) in reportContentsList2" :key="index">

src/views/week/doubleWeeklyDetils.vue

@@ -200,30 +200,6 @@
         <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">{{
-                  Micrometer(reportTargetAll.customerAct)
-                }}</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>
         <van-collapse-item title="上期工作成果" name="7">
           <div style="margin-top: -10px">
             <div v-for="(item, index) in reportContentsList2" :key="index">
@@ -343,7 +319,7 @@ export default {
     ZYSAP,
     veryGoodPlaceOrder,
     neiwaiqiangpingtu,
-    zhiganwaiqiangSAP
+    zhiganwaiqiangSAP,
   },
   data() {
     return {

src/views/week/weekly.vue

@@ -72,23 +72,6 @@
           <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>
         </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">

src/views/week/weeklyApproval.vue

@@ -57,23 +57,6 @@
           <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>
         </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">

src/views/week/weeklyApprovalDetils.vue

@@ -57,23 +57,6 @@
           <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>
         </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">

src/views/week/weeklyHistoricalDetils.vue

@@ -58,23 +58,6 @@
           <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>
         </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">