Ver código fonte

Merge branch 'feature_20250106_日报,周报填写添加应用服务平台'

zhujindu 11 meses atrás
pai
commit
9a448a4b9e

+ 1 - 1
src/utils/index.js

@@ -214,6 +214,6 @@ export function verifyStoreType(dictValue) {
   if (!dictValue) return null;
   let storeData = null;
   storeData = store.getters.storeType.find((val) => val.dictValue == dictValue);
-  let remarkType = JSON.parse(storeData.remark);
+  let remarkType = storeData ? JSON.parse(storeData.remark) : null;
   return remarkType;
 }

+ 2 - 2
src/utils/request.js

@@ -16,7 +16,7 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(
   (config) => {
-    toastLoading(0, '加载中...', true);
+    // toastLoading(0, '加载中...', true);
     config.headers['userId'] = localStorage.getItem('loginName');
     return config;
   },
@@ -28,7 +28,7 @@ service.interceptors.request.use(
 // 响应拦截器
 service.interceptors.response.use(
   (res) => {
-    toastLoading().clear();
+    // toastLoading().clear();
     const code = res.data.code || 200;
     const msg = errorCode[code] || res.data.msg || errorCode['default'];
     if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {

+ 47 - 12
src/views/deviceOutside/index.vue

@@ -25,7 +25,7 @@
       </van-tabs>
     </div>
     <!--        主体内容-->
-    <div class="container" style="margin-top: 144px">
+    <div class="container content" style="margin-top: 144px" @touchmove="handleTouch">
       <van-list
         class="myList"
         v-model="loading"
@@ -348,21 +348,17 @@
         </div>
         <van-empty v-if="list.length == 0" />
       </van-list>
-      <br />
-      <br />
-      <br />
-      <br />
-      <br />
     </div>
     <van-popup v-model="showPicker" position="bottom" class="textsize">
       <van-row
         style="
-          position: fixed;
-          top: 0;
+          /* position: fixed; */
+          /* top: 0; */
           width: 100%;
           z-index: 998;
           background-color: #fff;
           border-bottom: 1px solid #ccc;
+          height: 50px;
         ">
         <van-col span="3" style="text-align: center; margin: 14px 0" @click="showPicker = false">
           <van-icon name="cross" size="20" color="#909399" />
@@ -377,8 +373,8 @@
           <van-button type="default" size="small" style="height: 28px">重置</van-button>
         </van-col>
       </van-row>
-      <div style="height: 48px; width: 100%"></div>
-      <div class="searchcheck">
+      <!-- <div style="height: 48px; width: 100%"></div> -->
+      <div class="searchcheck" @touchmove="handleTouch">
         <p class="searchchecktitle">&nbsp;经销商</p>
         <van-row>
           <van-col span="24">
@@ -742,7 +738,24 @@ export default {
     }
     this.getMonth();
   },
+  mounted() {
+    // 上拉边界下拉出现白色空白
+    let node = document.getElementsByClassName('deviceOutside')[0];
+    node.addEventListener(
+      'touchmove',
+      (e) => {
+        if (e._isScroller) return;
+        e.preventDefault();
+      },
+      {
+        passive: false,
+      }
+    );
+  },
   methods: {
+    handleTouch(e) {
+      e._isScroller = true;
+    },
     setStroeNameStyle(item) {
       // 家装或工装 approvalStatus:是否结案 0:未结案,1:已结案
       if (
@@ -2295,6 +2308,20 @@ export default {
   font-size: 16px;
   font-weight: 600;
 }
+.deviceOutside {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  .content {
+    flex: 1;
+    overflow-y: auto;
+  }
+  .tabBar {
+    height: 50px;
+  }
+}
 </style>
 <style lang="scss">
 .van-tabs__nav--card .van-tab.van-tab--active {
@@ -2387,8 +2414,8 @@ export default {
   width: 100%;
 }
 .searchcheck {
-  height: 93vh;
-  overflow-y: auto;
+  /* height: 93vh;
+  overflow-y: auto; */
 }
 .searchchecktitle {
   width: 100%;
@@ -2405,6 +2432,14 @@ export default {
 }
 .textsize {
   font-size: 14px;
+  /* overflow: hidden; */
+  display: flex;
+  flex-direction: column;
+  .searchcheck {
+    flex: 1;
+    overflow-y: auto;
+    margin-bottom: 50px;
+  }
 }
 .deviceOutside {
   .TCFXListItem {

+ 0 - 6
src/views/home/bottomBtn.vue

@@ -124,11 +124,6 @@ export default {
   },
   methods: {
     getReportInfo() {
-      //   let loading1 = this.$toast.loading({
-      //     duration: 0,
-      //     message: '加载中...',
-      //     forbidClick: true,
-      //   });
       getReportInfo({ isContent: false }).then((res) => {
         if (res.code == 200) {
           if (res.data.postType == 'GZ') {
@@ -141,7 +136,6 @@ export default {
           } else {
             this.JZQuota = false;
           }
-          //   loading1.clear();
           localStorage.setItem('powerGrade', res.data.positionId);
           localStorage.setItem('isDiy', res.data.diy);
           localStorage.setItem('uType', res.data.userType);

+ 6 - 6
src/views/home/hintTabPage/hintDetail.vue

@@ -139,7 +139,7 @@ export default {
           childredColumn: [
             {
               label: '(近2月)',
-              prop: 'tongANotVisited',
+              prop: 'TuLiaoNotVisited',
             },
           ],
         },
@@ -148,7 +148,7 @@ export default {
           childredColumn: [
             {
               label: '(近3月)',
-              prop: 'tongBNotVisited',
+              prop: 'QiTaNotVisited',
             },
           ],
         },
@@ -182,7 +182,7 @@ export default {
           childredColumn: [
             {
               label: '(7天未结案)',
-              prop: 'tongAAbnormalNum',
+              prop: 'TuLiaoAbnormalNum',
             },
           ],
         },
@@ -191,7 +191,7 @@ export default {
           childredColumn: [
             {
               label: '(7天未结案)',
-              prop: 'tongBAbnormalNum',
+              prop: 'QiTaAbnormalNum',
             },
           ],
         },
@@ -316,12 +316,12 @@ export default {
       this.maskShow = true;
       if (this.fromType == 'noVisit') {
         // 未拜访
-        this.deptId = tree ? tree.onlyId : this.userInfo.deptId;
+        this.deptId = tree ? tree.onlyId : null;
         this.firstProp = 'onlyName';
         this.selectNoVisitsInfoFun(resolve);
       } else if (this.fromType == 'createStore') {
         // 建店
-        this.deptId = tree ? tree.onlyId : this.userInfo.deptId;
+        this.deptId = tree ? tree.onlyId : null;
         this.firstProp = 'onlyName';
         this.selectPendingCasesInfoFun(resolve);
       } else if (this.fromType == 'pantone') {

+ 37 - 19
src/views/home/hintTabPage/index.vue

@@ -4,11 +4,14 @@
       <van-collapse v-model="activeNames">
         <!-- 拜访(实时) -->
         <van-collapse-item :name="visitCollapse.name">
-          <span class="updateTime">更新时间:{{ visitCollapse.latestUpdateTime }}</span>
+          <span class="updateTime" v-if="visitCollapse.latestUpdateTime != ''">
+            更新时间:
+            {{ visitCollapse.latestUpdateTime }}
+          </span>
           <template #title>
             <div class="itemHeader">
-              <span class="itemTitle">{{ visitCollapse.title }}</span>
-              <span @click.stop>
+              <span class="itemTitle" v-if="visitCollapse.title">{{ visitCollapse.title }}</span>
+              <span @click.stop v-if="visitCollapse.tipsPopoverlabel">
                 <el-popover placement="right" trigger="click" popper-class="hintPopover">
                   <div
                     class="popoverConten"
@@ -24,6 +27,7 @@
             </div>
           </template>
           <visitPage
+            v-if="visitCollapse.resData"
             fromType="noVisit"
             :empLevel="empLevel"
             :contentData="visitCollapse.contentData"
@@ -34,8 +38,12 @@
         <van-collapse-item :name="createStore.name">
           <template #title>
             <div class="itemHeader" @click.stop>
-              <span class="itemTitle">{{ createStore.title }}</span>
-              <el-popover placement="right" trigger="click" popper-class="hintPopover">
+              <span class="itemTitle" v-if="createStore.title">{{ createStore.title }}</span>
+              <el-popover
+                placement="right"
+                trigger="click"
+                popper-class="hintPopover"
+                v-if="createStore.tipsPopoverlabel">
                 <div
                   class="popoverConten"
                   v-for="(item, index) in createStore.tipsPopoverlabel"
@@ -49,6 +57,7 @@
             </div>
           </template>
           <visitPage
+            v-if="createStore.resData"
             fromType="createStore"
             :empLevel="empLevel"
             :contentData="createStore.contentData"
@@ -268,7 +277,7 @@ export default {
           },
           {
             title: '同城分销-涂料店',
-            titleProp: 'tongA',
+            titleProp: 'TuLiao',
             bagColor: '#88abda',
             visitDetail: [
               {
@@ -285,7 +294,7 @@ export default {
           },
           {
             title: '同城分销-其他店',
-            titleProp: 'tongB',
+            titleProp: 'QiTa',
             bagColor: '#8f82bc',
             visitDetail: [
               {
@@ -371,7 +380,7 @@ export default {
           },
           {
             title: '同城分销-涂料店',
-            titleProp: 'tongA',
+            titleProp: 'TuLiao',
             bagColor: '#88abda',
             visitDetail: [
               {
@@ -386,7 +395,7 @@ export default {
                 leftUnit: '家',
                 leftIsClick: false,
                 rightTable: '7天未结案:',
-                rightProp: 'tongAAbnormalNum',
+                rightProp: 'TuLiaoAbnormalNum',
                 rightUnit: '家',
                 rightIsClick: true,
               },
@@ -394,7 +403,7 @@ export default {
           },
           {
             title: '同城分销-其他店',
-            titleProp: 'tongB',
+            titleProp: 'QiTa',
             bagColor: '#8f82bc',
             visitDetail: [
               {
@@ -409,7 +418,7 @@ export default {
                 leftUnit: '家',
                 leftIsClick: false,
                 rightTable: '7天未结案:',
-                rightProp: 'tongBAbnormalNum',
+                rightProp: 'QiTaAbnormalNum',
                 rightUnit: '家',
                 rightIsClick: true,
               },
@@ -429,13 +438,14 @@ export default {
         pantoneLosding: true,
         pantoneData: {},
       },
+      isLoading: false,
     };
   },
   watch: {
     tabVal: {
       handler(val) {
         if (val == -1) {
-          this.initData();
+          // this.initData();
         }
       },
       immediate: true,
@@ -443,6 +453,10 @@ export default {
   },
   activated() {},
   methods: {
+    onRefresh() {
+      this.initData();
+      this.isLoading = false;
+    },
     initData() {
       if (!this.userInfo) return;
       this.empLevel = this.userInfo.empLevel;
@@ -458,18 +472,22 @@ export default {
     getVisitCollapseData() {
       this.visitCollapse.collapseLosding = true;
       selectVisitsRealTime().then((res) => {
-        this.visitCollapse.resData = res.data;
-        this.visitCollapse.tipsPopoverlabel = res.data.reminderContent;
-        this.visitCollapse.latestUpdateTime = res.data.latestUpdateTime;
-        this.visitCollapse.collapseLosding = false;
+        if (res.code == 200) {
+          this.visitCollapse.resData = res.data;
+          this.visitCollapse.tipsPopoverlabel = res.data.reminderContent;
+          this.visitCollapse.latestUpdateTime = res.data.latestUpdateTime;
+          this.visitCollapse.collapseLosding = false;
+        }
       });
     },
     getSelectBuildingStore() {
       this.createStore.collapseLosding = true;
       selectBuildingStore().then((res) => {
-        this.createStore.resData = res.data;
-        this.createStore.tipsPopoverlabel = res.data.reminderContent;
-        this.createStore.collapseLosding = false;
+        if (res.code == 200) {
+          this.createStore.resData = res.data;
+          this.createStore.tipsPopoverlabel = res.data.reminderContent;
+          this.createStore.collapseLosding = false;
+        }
       });
     },
     getReportData() {

+ 2 - 2
src/views/home/hintTabPage/noVisit.vue

@@ -90,9 +90,9 @@ export default {
         type = '可控店';
       } else if (value == 'jinPai') {
         type = '金牌店';
-      } else if (value == 'tongA') {
+      } else if (value == 'TuLiao') {
         type = '同城分销-涂料店';
-      } else if (value == 'tongB') {
+      } else if (value == 'QiTa') {
         type = '同城分销-其他店';
       }
       return type;

+ 63 - 52
src/views/home/index.vue

@@ -1,41 +1,30 @@
 <template>
   <div class="homePage" ref="homePage">
-    <van-nav-bar class="navBar" left-arrow title="门店拜访" @click-left="onClickLeft" />
-    <van-tabs
-      class="myTab"
-      type="card"
-      v-model="tabVal"
-      color="#0057ba"
-      @click="onClickTabs"
-      v-if="isGZorJZ">
-      <van-tab title="提示类" name="-1" v-if="isGZorJZ == 'false'">
-        <hintTabPage :tabVal="tabVal" ref="hintTabPage"></hintTabPage
-      ></van-tab>
-      <van-tab title="A类指标" name="0"
-        ><ABtarget :tabVal="tabVal" ref="Atarget"></ABtarget
-      ></van-tab>
-      <van-tab title="B类指标" name="1"
-        ><ABtarget :tabVal="tabVal" ref="Btarget"></ABtarget
-      ></van-tab>
-    </van-tabs>
-    <div class="bottomBtn">
-      <bottomBtn :tabVal="tabVal"></bottomBtn>
-    </div>
-    <!-- <van-dialog v-model="shows" @confirm="titleconfirm">
-      <div class="tipTitleBox" style="padding: 10px">
-        <p class="p">系统提示</p>
-        <p>各位好,因五一假期,汇报提交时间有调整。</p>
-        <div style="font-size: 14px">
-          <p style="margin-bottom: 6px; line-height: 20px">1、5月1-3日,销售员无需提交日报。</p>
-          <p style="margin-bottom: 6px; line-height: 20px">
-            2、销售部主管周报提交时间改为4月27日-30日。
-          </p>
-          <p>3、大区主管半月报提交时间改为5月4日-7日。</p>
-        </div>
-        <br />
-        <p style="text-align: right">祝大家假期愉快!</p>
+    <div class="content">
+      <van-nav-bar class="navBar" left-arrow title="门店拜访" @click-left="onClickLeft" />
+      <van-tabs
+        class="myTab"
+        type="card"
+        v-model="tabVal"
+        color="#0057ba"
+        @click="onClickTabs"
+        v-if="isGZorJZ">
+        <van-tab title="提示类" name="-1" v-if="isGZorJZ == 'false'">
+          <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+            <hintTabPage :tabVal="tabVal" ref="hintTabPage"></hintTabPage>
+          </van-pull-refresh>
+        </van-tab>
+        <van-tab title="A类指标" name="0">
+          <ABtarget :tabVal="tabVal" ref="Atarget"></ABtarget>
+        </van-tab>
+        <van-tab title="B类指标" name="1">
+          <ABtarget :tabVal="tabVal" ref="Btarget"></ABtarget>
+        </van-tab>
+      </van-tabs>
+      <div class="bottomBtn">
+        <bottomBtn :tabVal="tabVal" ref="bottomBtn"></bottomBtn>
       </div>
-    </van-dialog> -->
+    </div>
     <tab-bar></tab-bar>
   </div>
 </template>
@@ -60,6 +49,7 @@ export default {
       tabVal: '-1',
       hintTabPageIndex: 0,
       isGZorJZ: null,
+      isLoading: false,
     };
   },
   watch: {
@@ -77,25 +67,26 @@ export default {
   activated() {
     if (this.tabVal == '-1') {
       // 从其他页面跳转过来如果;要重新获取对应tab数据
-      if (this.$refs.hintTabPage) this.$refs.hintTabPage.initData();
+      // if (this.$refs.hintTabPage) this.$refs.hintTabPage.initData();
     } else if (this.tabVal == '0') {
-      if (this.$refs.Atarget) this.$refs.Atarget.initData();
+      // if (this.$refs.Atarget) this.$refs.Atarget.initData();
     } else if (this.tabVal == '1') {
-      if (this.$refs.Btarget) this.$refs.Btarget.initData();
+      // if (this.$refs.Btarget) this.$refs.Btarget.initData();
     }
   },
   created() {
     this.getDict();
   },
+  mounted() {},
   methods: {
-    async getDict() {
-      this.isGZorJZ = null;
-      let gz_Option = await getDictOption({}, 'gz_customer_post'); //公装业务员岗位
-      let jz_Option = await getDictOption({}, 'jz_post_name'); //家装业务员岗位
-      let postName = this.userInfo.postName;
-      let is_gz = gz_Option.data.find((res) => res.dictLabel == postName);
-      let is_jz = jz_Option.data.find((res) => res.dictLabel == postName);
-      if (is_gz || is_jz) {
+    onRefresh() {
+      this.getDict(true);
+      this.isLoading = false;
+    },
+    async getDict(isRefresh) {
+      let postType = this.userInfo.postType;
+      // postType:人员类型,JZ(家装)、GZ(公装)、YF(应服)、DIY(DIY)
+      if (postType == 'JZ' || postType == 'GZ') {
         localStorage.setItem('isGZorJZ', 'true');
         this.isGZorJZ = 'true';
       } else {
@@ -104,11 +95,22 @@ export default {
       }
       // 家装或工装不显示提示类tab
       this.$nextTick(() => {
-        if (this.isGZorJZ == 'true') {
-          this.tabVal = '0';
-        } else {
-          this.tabVal = '-1';
+        // 刷新状态
+        if (!isRefresh) {
+          if (this.isGZorJZ == 'true') {
+            this.tabVal = '0';
+          } else {
+            this.tabVal = '-1';
+          }
+        }
+        if (this.tabVal == '-1') {
+          if (this.$refs.hintTabPage) this.$refs.hintTabPage.initData();
+        } else if (this.tabVal == '0') {
+          if (this.$refs.Atarget) this.$refs.Atarget.initData();
+        } else if (this.tabVal == '1') {
+          if (this.$refs.Btarget) this.$refs.Btarget.initData();
         }
+        if (this.$refs.bottomBtn) this.$refs.bottomBtn.getReportInfo();
       });
     },
     onClickTabs(val) {
@@ -152,9 +154,18 @@ export default {
     width: 100%;
     height: 100%;
     .homePage {
-      width: 100%;
       height: 100%;
-      /* overflow-y: auto; */
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+      .content {
+        flex: 1;
+        overflow-y: auto;
+      }
+      .tabBar {
+        height: 50px;
+      }
     }
   }
 }

+ 7 - 83
src/views/week/daily.vue

@@ -26,7 +26,8 @@
     <div style="height: 4px"></div>
     <!--        主体内容-->
     <div class="container linepAdd">
-      <van-collapse v-model="activeNames">
+      <van-collapse v-model="activeNames" v-if="!YFQuota">
+        <!-- YFQuota:应用服务平台 不显示各项指标 -->
         <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
           <visitedRealTime
             :reportTargetAll="reportTargetAll"
@@ -244,85 +245,6 @@
             >
           </van-row>
         </van-collapse-item>
-        <!-- <van-collapse-item v-if="JZQuota" name="20" 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.czjPostCustomerMonth }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                客户数:<span class="colorbalck">{{ reportTargetAll.czjPostCustomerQuarter }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数(包):<span class="colorbalck">{{
-                  reportTargetAll.czjPostOrderNumMonth
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                下单数(包):<span class="colorbalck">{{
-                  reportTargetAll.czjPostOrderNumQuarter
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceQuarter)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单率:<span class="colorbalck">{{ reportTargetAll.czjPostOrderRateMonth }}%</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.czjPostOrderRateQuarter }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-            <van-col span="24"
-              ><p>
-                客户数:<span class="colorbalck">{{ reportTargetAll.czjPostCustomerYear }}</span>
-              </p>
-            </van-col>
-            <van-col span="24"
-              ><p>
-                下单数(包):<span class="colorbalck">{{ reportTargetAll.czjPostOrderNumYear }}</span>
-              </p>
-            </van-col>
-            <van-col span="24"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceYear)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24"
-              ><p>
-                下单率:<span class="colorbalck">{{ reportTargetAll.czjPostOrderRateYear }}%</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item> -->
         <van-collapse-item v-if="JZQuota" name="22" title="基材粉料过账(千元)">
           <van-row>
             <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
@@ -621,8 +543,9 @@ export default {
         },
       ],
       type: '-1',
-      JZQuota: false,
-      GZQuota: false,
+      JZQuota: false, //家装
+      GZQuota: false, //工装
+      YFQuota: false, //应用服务
       titlejz: '',
       notVisitReason: '', //今日拜访0家店的原因;
     };
@@ -681,6 +604,7 @@ export default {
             localStorage.setItem('powerGrade', res.data.positionId);
             this.GZQuota = false;
             this.JZQuota = false;
+            this.YFQuota = res.data.postType == 'YF' ? true : false;
             if (res.data.postType == 'JZ') {
               this.JZQuota = true;
             } else if (res.data.postType == 'GZ') {
@@ -784,7 +708,6 @@ export default {
             return false;
           }
         }
-        debugger;
         if (
           (this.$route.query.reportId && this.notVisitReason) ||
           this.reportTarget.showNotVisitReason
@@ -862,6 +785,7 @@ export default {
         this.reportTarget = res.data;
         this.GZQuota = false;
         this.JZQuota = false;
+        this.YFQuota = res.data.postType == 'YF' ? true : false;
         if (res.data.postType == 'JZ') {
           this.JZQuota = true;
         } else if (res.data.postType == 'GZ') {

+ 4 - 80
src/views/week/dailyApproval.vue

@@ -11,7 +11,8 @@
     <div style="height: 4px"></div>
     <!--        主体内容-->
     <div class="container linep">
-      <van-collapse v-model="activeNames">
+      <van-collapse v-model="activeNames" v-if="!YFQuota">
+        <!-- YFQuota:应用服务平台 不显示各项指标 -->
         <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
           <visitedRealTime
             :reportTargetAll="reportTargetAll"
@@ -229,85 +230,6 @@
             >
           </van-row>
         </van-collapse-item>
-        <!-- <van-collapse-item v-if="JZQuota" name="20" 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.czjPostCustomerMonth }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                客户数:<span class="colorbalck">{{ reportTargetAll.czjPostCustomerQuarter }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数(包):<span class="colorbalck">{{
-                  reportTargetAll.czjPostOrderNumMonth
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                下单数(包):<span class="colorbalck">{{
-                  reportTargetAll.czjPostOrderNumQuarter
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceQuarter)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单率:<span class="colorbalck">{{ reportTargetAll.czjPostOrderRateMonth }}%</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.czjPostOrderRateQuarter }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-            <van-col span="24"
-              ><p>
-                客户数:<span class="colorbalck">{{ reportTargetAll.czjPostCustomerYear }}</span>
-              </p>
-            </van-col>
-            <van-col span="24"
-              ><p>
-                下单数(包):<span class="colorbalck">{{ reportTargetAll.czjPostOrderNumYear }}</span>
-              </p>
-            </van-col>
-            <van-col span="24"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceYear)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24"
-              ><p>
-                下单率:<span class="colorbalck">{{ reportTargetAll.czjPostOrderRateYear }}%</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item> -->
         <van-collapse-item v-if="JZQuota" name="22" title="基材粉料过账(千元)">
           <van-row>
             <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
@@ -613,6 +535,7 @@ export default {
       type: '-1',
       JZQuota: false,
       GZQuota: false,
+      YFQuota: false,
       titlejz: '',
       //
     };
@@ -735,6 +658,7 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         this.GZQuota = false;
         this.JZQuota = false;
+        this.YFQuota = res.data.postType == 'YF' ? true : false;
         if (res.data.postType == 'JZ') {
           this.JZQuota = true;
         } else if (res.data.postType == 'GZ') {

+ 167 - 128
src/views/week/dailyApprovalList.vue

@@ -2,16 +2,11 @@
   <div class="bgcolor">
     <!--        顶部条-->
     <div class="navBarTOP">
-    <van-nav-bar
-        class="navBar"
-        title="汇报审批"
-        left-arrow
-        @click-left="onClickLeft"
-    />
-    <van-tabs v-model="type" color="#0057ba"  @change="tabChange">
-      <van-tab title="待审批" name="approvalPending" :disabled="disabled"></van-tab>
-      <van-tab title="已审批" name="approvalSuccess" :disabled="disabled"></van-tab>
-    </van-tabs>
+      <van-nav-bar class="navBar" title="汇报审批" left-arrow @click-left="onClickLeft" />
+      <van-tabs v-model="type" color="#0057ba" @change="tabChange">
+        <van-tab title="待审批" name="approvalPending" :disabled="disabled"></van-tab>
+        <van-tab title="已审批" name="approvalSuccess" :disabled="disabled"></van-tab>
+      </van-tabs>
     </div>
     <div class="container">
       <div class="lineGrey"></div>
@@ -23,143 +18,182 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
-      <van-list  v-model="loading" :finished="finished" finished-text="--已经到底了--" @load="onLoad">
-      <div class="cellcontent brud weekList" v-for="(item,index) in  list" :key="index">
-        <van-cell @click="approveFn(item)">
-          <div class="cardContent">
-            <div class="title" v-if="type=='approvalPending'">
-              <p class="textLeft" v-if="item.reportType==1">{{item.nickName}}的{{item.reportTypeStr}}</p>
-              <p class="textLeft" v-if="item.reportType==2">{{item.deptName}}的{{item.reportTypeStr}}</p>
-              <p class="textLeft" v-if="item.reportType==3">{{item.dqName}}的{{item.reportTypeStr}}</p>
-              <p class="textRight">审批</p></div>
-            <div class="title" v-if="type=='approvalSuccess'">
-              <p class="textLeft" v-if="item.reportType==1">{{item.nickName}}的{{item.reportTypeStr}}</p>
-              <p class="textLeft" v-if="item.reportType==2">{{item.deptName}}的{{item.reportTypeStr}}</p>
-              <p class="textLeft" v-if="item.reportType==3">{{item.dqName}}的{{item.reportTypeStr}}</p>
-              <p class="textRight">
-                <van-rate
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="--已经到底了--"
+        @load="onLoad">
+        <div class="cellcontent brud weekList" v-for="(item, index) in list" :key="index">
+          <van-cell @click="approveFn(item)">
+            <div class="cardContent">
+              <div class="title" v-if="type == 'approvalPending'">
+                <!-- reportType: 1日报;2周报;3半月报 -->
+                <!-- <p class="textLeft" v-if="item.reportType == 1">
+                  {{ item.nickName }}的{{ item.reportTypeStr }}
+                </p>
+                <p class="textLeft" v-if="item.reportType == 2">
+                  {{ item.deptName }}的{{ item.reportTypeStr }}
+                </p>
+                <p class="textLeft" v-if="item.reportType == 3">
+                  {{ item.dqName }}的{{ item.reportTypeStr }}
+                </p> -->
+                <p class="textLeft">{{ filterName(item) }}的{{ item.reportTypeStr }}</p>
+                <p class="textRight">审批</p>
+              </div>
+              <div class="title" v-if="type == 'approvalSuccess'">
+                <p class="textLeft" v-if="item.reportType == 1">
+                  {{ item.nickName }}的{{ item.reportTypeStr }}
+                </p>
+                <p class="textLeft" v-if="item.reportType == 2">
+                  {{ item.deptName }}的{{ item.reportTypeStr }}
+                </p>
+                <p class="textLeft" v-if="item.reportType == 3">
+                  {{ item.dqName }}的{{ item.reportTypeStr }}
+                </p>
+                <p class="textRight">
+                  <van-rate
                     v-model="item.number"
                     :size="18"
                     color="#ffd21e"
                     void-icon="star"
                     void-color="#eee"
-                    readonly
-                />
-              </p>
+                    readonly />
+                </p>
+              </div>
+              <div class="info" v-if="type == 'approvalPending'">
+                提交时间:{{ item.commitTime }}
+              </div>
+              <div class="info" v-if="type == 'approvalSuccess'">
+                审批时间:{{ item.approvalTime }}
+              </div>
             </div>
-            <div class="info" v-if="type=='approvalPending'">提交时间:{{item.commitTime}}</div>
-            <div class="info" v-if="type=='approvalSuccess'">审批时间:{{item.approvalTime}}</div>
-          </div>
-        </van-cell>
-      </div>
-      <van-empty description="" v-if="list.length==0"/>
+          </van-cell>
+        </div>
+        <van-empty description="" v-if="list.length == 0" />
       </van-list>
     </div>
   </div>
 </template>
 
 <script>
-import {approveList} from "@/api/index";
+import { approveList } from '@/api/index';
 export default {
-  name: "MyHistoricalWeekly",
+  name: 'MyHistoricalWeekly',
   data() {
     return {
-      type:"approvalPending",
-      disabled:false,
-      pageNum:1,
-      pageSize:10,
+      type: 'approvalPending',
+      disabled: false,
+      pageNum: 1,
+      pageSize: 10,
       loading: false,
       finished: false,
-      list:[]
-    }
+      list: [],
+    };
   },
   created() {
     // this.approveList()
   },
   watch: {
     $route(to, from) {
-      this.powerGrade = localStorage.getItem("powerGrade")
-      this.pageNum=1
-      if(to.path=="/dailyApprovalList"&&from.path=="/home"){
-        this.approveList()
+      this.powerGrade = localStorage.getItem('powerGrade');
+      this.pageNum = 1;
+      if (to.path == '/dailyApprovalList' && from.path == '/home') {
+        this.approveList();
       }
-      if(to.path=="/dailyApprovalList"&&from.path=="/daily"){
-        this.pageNum=1
-        this.approveList()
+      if (to.path == '/dailyApprovalList' && from.path == '/daily') {
+        this.pageNum = 1;
+        this.approveList();
       }
-      if(to.path=="/dailyApprovalList"&&from.path=="/dailyApproval"){
-        this.pageNum=1
-        this.approveList()
+      if (to.path == '/dailyApprovalList' && from.path == '/dailyApproval') {
+        this.pageNum = 1;
+        this.approveList();
       }
-      if(to.path=="/dailyApprovalList"&&from.path=="/weeklyApproval"){
-        this.pageNum=1
-        this.approveList()
+      if (to.path == '/dailyApprovalList' && from.path == '/weeklyApproval') {
+        this.pageNum = 1;
+        this.approveList();
       }
-      if(to.path=="/dailyApprovalList"&&from.path=="/doubleWeeklyApproval"){
-        this.pageNum=1
-        this.approveList()
+      if (to.path == '/dailyApprovalList' && from.path == '/doubleWeeklyApproval') {
+        this.pageNum = 1;
+        this.approveList();
       }
-      if(to.path=="/dailyApprovalList"&&from.path=="/dailyDetails"){
-        this.pageNum=1
-        this.approveList()
+      if (to.path == '/dailyApprovalList' && from.path == '/dailyDetails') {
+        this.pageNum = 1;
+        this.approveList();
       }
-      if(to.path=="/dailyApprovalList"&&from.path=="/weeklyApprovalDetils"){
-        this.pageNum=1
-        this.approveList()
+      if (to.path == '/dailyApprovalList' && from.path == '/weeklyApprovalDetils') {
+        this.pageNum = 1;
+        this.approveList();
       }
-      if(to.path=="/dailyApprovalList"&&from.path=="/doubleWeeklyDetils"){
-        this.pageNum=1
-        this.approveList()
+      if (to.path == '/dailyApprovalList' && from.path == '/doubleWeeklyDetils') {
+        this.pageNum = 1;
+        this.approveList();
       }
-    }
+    },
   },
   methods: {
-    onLoad(){
-      this.approveList()
+    filterName(item) {
+      // <!-- reportType: 1日报;2周报;3半月报 -->
+      let name = '';
+      // 应用服务平台
+      if (item.postType == 'DIY') {
+        if (item.reportType == 1) {
+          name = item.nickName;
+        } else if (item.reportType == 2) {
+          name = item.deptName;
+        } else if (item.reportType == 3) {
+          name = item.dqName;
+        }
+      } else {
+        name = item.nickName;
+      }
+      return name;
     },
-    approveFn(row){
-      this.list=[];
-      if(this.type=="approvalPending"){
-        if(row.reportType=="1"){
+    onLoad() {
+      this.approveList();
+    },
+    approveFn(row) {
+      this.list = [];
+      if (this.type == 'approvalPending') {
+        if (row.reportType == '1') {
           this.$router.push({
-            path: "/dailyApproval",
-            query: {reportId: row.id,}
-          })
-        }else if(row.reportType=="2"){
+            path: '/dailyApproval',
+            query: { reportId: row.id },
+          });
+        } else if (row.reportType == '2') {
           this.$router.push({
-            path: "/weeklyApproval",
-            query: {reportId: row.id,}
-          })
-        }else{
+            path: '/weeklyApproval',
+            query: { reportId: row.id },
+          });
+        } else {
           this.$router.push({
-            path: "/doubleWeeklyApproval",
-            query: {reportId: row.id,}
-          })
+            path: '/doubleWeeklyApproval',
+            query: { reportId: row.id },
+          });
         }
-      }else{
-        if(row.reportType=="1"){
+      } else {
+        if (row.reportType == '1') {
           this.$router.push({
-            path: "/dailyDetails",
-            query: {reportId: row.id,}
-          })
-        }else if(row.reportType=="2"){
+            path: '/dailyDetails',
+            query: { reportId: row.id },
+          });
+        } else if (row.reportType == '2') {
           this.$router.push({
-            path: "/weeklyApprovalDetils",
-            query: {reportId: row.id,}
-          })
-        }else{
+            path: '/weeklyApprovalDetils',
+            query: { reportId: row.id },
+          });
+        } else {
           this.$router.push({
-            path: "/doubleWeeklyDetils",
-            query: {reportId: row.id,}
-          })
+            path: '/doubleWeeklyDetils',
+            query: { reportId: row.id },
+          });
         }
       }
     },
     tabChange() {
       this.disabled = true;
-      this.list=[];
-      this.pageNum=1
-      this.approveList()
+      this.list = [];
+      this.pageNum = 1;
+      this.approveList();
     },
     approveList() {
       let loading1 = this.$toast.loading({
@@ -171,35 +205,36 @@ export default {
         this.list = [];
         this.refreshing = false;
       }
-      approveList({type: this.type, pageNum:this.pageNum, pageSize:this.pageSize,}).then(res => {
-        loading1.clear()
-        this.disabled = false;
-        this.loading = false;
-        if(this.pageNum==1){
-          this.list=[];
-          this.refreshing =false;
-        }
-        this.list = this.list.concat(res.data)
-        if(this.list.length >=res.total) {
-          this.finished = true;
-        }else{
-          this.finished = false;
+      approveList({ type: this.type, pageNum: this.pageNum, pageSize: this.pageSize }).then(
+        (res) => {
+          loading1.clear();
+          this.disabled = false;
+          this.loading = false;
+          if (this.pageNum == 1) {
+            this.list = [];
+            this.refreshing = false;
+          }
+          this.list = this.list.concat(res.data);
+          if (this.list.length >= res.total) {
+            this.finished = true;
+          } else {
+            this.finished = false;
+          }
+          this.pageNum = this.pageNum + 1;
         }
-        this.pageNum=this.pageNum+1
-      })
+      );
     },
     onClickLeft() {
-      this.$router.push("/home")
-    }
-  }
-}
+      this.$router.push('/home');
+    },
+  },
+};
 </script>
 <style>
 .bgcolor {
   background-color: #f5f5f5;
 }
 
-
 .cardContent {
   box-sizing: border-box;
 }
@@ -219,7 +254,7 @@ export default {
 
 .cardContent .title p {
   padding: 0;
-  margin: 0
+  margin: 0;
 }
 
 .cardContent .title .textLeft {
@@ -241,10 +276,14 @@ export default {
   border-radius: 8px;
   overflow: hidden;
 }
-.weekList{
-  border-radius:0;
+.weekList {
+  border-radius: 0;
+}
+.weekList .van-cell {
+  border-radius: 6px;
+  overflow: hidden;
+}
+.weekList .cardContent .title {
+  line-height: 32px;
 }
-.weekList .van-cell{border-radius: 6px;
-  overflow: hidden;}
-.weekList .cardContent .title{line-height: 32px}
-</style>
+</style>

+ 4 - 1
src/views/week/dailyDetails.vue

@@ -11,7 +11,8 @@
     <div class="lineGrey"></div>
     <!--        主体内容-->
     <div class="container linep">
-      <van-collapse v-model="activeNames">
+      <van-collapse v-model="activeNames" v-if="!YFQuota">
+        <!-- YFQuota:应用服务平台 不显示各项指标 -->
         <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
           <visitedRealTime
             :reportTargetAll="reportTargetAll"
@@ -527,6 +528,7 @@ export default {
       type: '-1',
       JZQuota: false,
       GZQuota: false,
+      YFQuota: false, //应用服务
       titlejz: '',
       saptitle: '业绩目标SAP(千元)',
       ptitle: '',
@@ -580,6 +582,7 @@ export default {
         this.reportTarget = res.data;
         this.JZQuota = false;
         this.GZQuota = false;
+        this.YFQuota = res.data.postType == 'YF' ? true : false;
         this.ptitle = res.data.pdeptName + '-' + res.data.ppostName + '-' + res.data.pnickName;
         if (res.data.postType == 'JZ') {
           this.JZQuota = true;

+ 4 - 91
src/views/week/dailyHistoricalDetails.vue

@@ -17,7 +17,8 @@
       <p style="font-size: 16px; margin: 10px 0" v-if="reportTarget.commitTime">
         提交时间: {{ reportTarget.commitTime }}
       </p>
-      <van-collapse v-model="activeNames">
+      <van-collapse v-model="activeNames" v-if="!YFQuota">
+        <!-- YFQuota:应用服务平台 不显示各项指标 -->
         <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
           <visitedRealTime
             :reportTargetAll="reportTargetAll"
@@ -54,8 +55,6 @@
                 }}</span>
               </p></van-col
             >
-            <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjMonthSuccessRate) }}%</span></p></van-col>-->
-            <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjQuarterSuccessRate) }}%</span></p></van-col>-->
             <van-col span="12"
               ><p>
                 业绩成长率:<span class="colorbalck"
@@ -90,8 +89,6 @@
                 }}</span>
               </p></van-col
             >
-            <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzZgwqMonthSuccessRate) }}%</span></p></van-col>-->
-            <!--            <van-col span="12" ><p>业绩达成率:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzZgwqQuarterSuccessRate) }}%</span></p></van-col>-->
             <van-col span="12"
               ><p>
                 业绩成长率:<span class="colorbalck"
@@ -110,7 +107,6 @@
         </van-collapse-item>
         <van-collapse-item v-if="GZQuota" name="41" title="公装客户开发">
           <van-row>
-            <!--            <van-col span="12"><span class="leftTitle">全年开户</span></van-col><van-col span="12"><span class="rightTitle">本月报备</span></van-col>-->
             <van-col span="12"
               ><p>
                 全年实际:<span class="colorbalck">{{
@@ -118,8 +114,6 @@
                 }}</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">{{
@@ -235,85 +229,6 @@
             >
           </van-row>
         </van-collapse-item>
-        <!-- <van-collapse-item v-if="JZQuota" name="20" 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.czjPostCustomerMonth }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                客户数:<span class="colorbalck">{{ reportTargetAll.czjPostCustomerQuarter }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数(包):<span class="colorbalck">{{
-                  reportTargetAll.czjPostOrderNumMonth
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                下单数(包):<span class="colorbalck">{{
-                  reportTargetAll.czjPostOrderNumQuarter
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceQuarter)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单率:<span class="colorbalck">{{ reportTargetAll.czjPostOrderRateMonth }}%</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.czjPostOrderRateQuarter }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="24"><span class="leftTitle">年度累计实际</span></van-col>
-            <van-col span="24"
-              ><p>
-                客户数:<span class="colorbalck">{{ reportTargetAll.czjPostCustomerYear }}</span>
-              </p>
-            </van-col>
-            <van-col span="24"
-              ><p>
-                下单数(包):<span class="colorbalck">{{ reportTargetAll.czjPostOrderNumYear }}</span>
-              </p>
-            </van-col>
-            <van-col span="24"
-              ><p>
-                下单销售额:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.czjPostOrderPriceYear)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24"
-              ><p>
-                下单率:<span class="colorbalck">{{ reportTargetAll.czjPostOrderRateYear }}%</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item> -->
         <van-collapse-item v-if="JZQuota" name="22" title="基材粉料过账(千元)">
           <van-row>
             <van-col span="12"><span class="leftTitle">本月实际</span></van-col>
@@ -471,10 +386,6 @@
           <div style="padding: 10px 0">
             <van-field readonly v-model="projectFollowNum" type="digit" />
           </div>
-          <!--          <p class="contentContainerTitle">报备数量</p>-->
-          <!--          <div style="padding: 10px 0">-->
-          <!--            <van-field readonly v-model="reportingNum" type="digit"  />-->
-          <!--          </div>-->
           <p class="contentContainerTitle">今日TUC成功报备数量</p>
           <div style="padding: 10px 0">
             <van-field readonly v-model="tucReportingSuccessNum" type="digit" />
@@ -662,6 +573,7 @@ export default {
       JZQuota: false,
       titlejz: '',
       GZQuota: false,
+      YFQuota: false, //应用服务
       saptitle: '业绩目标SAP(千元)',
       //
     };
@@ -844,6 +756,7 @@ export default {
         loading1.clear();
         this.GZQuota = false;
         this.JZQuota = false;
+        this.YFQuota = res.data.postType == 'YF' ? true : false;
         if (res.data.postType == 'JZ') {
           this.JZQuota = true;
         } else if (res.data.postType == 'GZ') {

+ 179 - 162
src/views/week/index.vue

@@ -1,183 +1,185 @@
 <template>
-  <div>
+  <div class="userPage">
     <div class="navBarTOP">
       <van-nav-bar class="navBar" title="我的" />
     </div>
-    <div class="lineGrey"></div>
-    <div class="lineGrey"></div>
-    <div class="lineGrey"></div>
-    <div class="lineGrey"></div>
-    <div style="height: 8px"></div>
-    <div class="myHeader">
-      <van-row>
-        <van-col span="7">
-          <van-image round width="8rem" height="8rem" :src="avatar" @click="login" />
-        </van-col>
-        <van-col span="17">
-          <div class="avatarContent">
-            <p class="nickName">{{ nickName }}</p>
-            <p>
-              <span class="postName">{{ postName }}</span>
-            </p>
-          </div>
-        </van-col>
-      </van-row>
-    </div>
-    <!--        主体内容-->
-    <div class="container">
-      <!--      门店及拜访-->
-      <van-cell-group inset class="mtb10">
-        <van-cell :title="addBTN" is-link @click="onSelect('B')" v-if="addShow">
-          <template #icon>
-            <van-icon :name="addShop" class="zicon" />
-          </template>
-        </van-cell>
-        <van-cell title="新增专卖店/金牌店" is-link @click="onSelect('A')" v-if="addShow1">
-          <template #icon>
-            <van-icon :name="addShop" class="zicon" />
-          </template>
-        </van-cell>
-        <van-cell :title="title" is-link to="/storemanagementlist">
-          <template #icon>
-            <van-icon :name="storeselect" class="zicon" />
-          </template>
-        </van-cell>
-        <van-cell title="历史拜访" is-link to="/historAllVisit">
-          <template #icon>
-            <van-icon :name="history" class="zicon" />
-          </template>
-        </van-cell>
-      </van-cell-group>
-      <!--      客资类-->
-      <van-cell-group inset class="mtb10">
-        <van-cell title="客资&投诉任务" to="/clew" v-if="customerClueButton">
-          <template #icon>
-            <van-icon :name="history" class="zicon" />
-          </template>
-          <template #title>
-            <span>客资&投诉任务</span>
-            &nbsp;<van-tag type="danger" v-if="customerClueNum > 0">{{ customerClueNum }}</van-tag>
-          </template>
-          <template #right-icon>
-            <van-icon name="arrow" size="16" />
-          </template>
-        </van-cell>
-        <van-cell title="待分配客资" to="/assignAwait" v-if="isAssignFlag">
-          <template #icon>
-            <van-icon :name="history" class="zicon" />
-          </template>
-          <template #title>
-            <span>待分配客资</span>
-            &nbsp;<van-tag type="danger" v-if="notAllocationNum > 0">{{
-              notAllocationNum
-            }}</van-tag>
-          </template>
-          <template #right-icon>
-            <van-icon name="arrow" size="16" />
-          </template>
-        </van-cell>
-      </van-cell-group>
-      <!--      汇报类-->
-      <van-cell-group inset class="mtb10">
-        <van-cell
-          title="我的历史汇报"
-          v-if="historyButton"
-          is-link
-          to="/myHistoricalDaily"
-          class="MYTile">
-          <template #title>
-            <span class="custom-title">我的历史汇报&nbsp;&nbsp;</span>
-          </template>
-          <template #icon>
-            <van-icon :name="daily" class="zicon" />
-          </template>
-          <template #right-icon>
-            <van-tag type="danger" v-if="existReject">退回待处理</van-tag>
-            <van-icon name="arrow" />
-          </template>
-        </van-cell>
-        <van-cell v-if="showDaily || isDiy == 'true'" is-link to="/subordinateHistoricalDaily">
-          下属业务员历史日报
-          <span
-            style="font-weight: 600; font-size: 16px; color: red; margin-left: 15px"
-            v-if="thisWeekRemarkNum != null"
-            >{{ thisWeekRemarkNum }}/5</span
-          >
-          <template #icon>
-            <van-icon :name="daily" class="zicon" />
-          </template>
-        </van-cell>
-        <van-cell
-          title="下属部主管历史周报"
-          v-if="showWeekly || isDiy == 'true'"
-          is-link
-          to="/subordinateHistoricalWeekly">
-          <template #icon>
-            <van-icon :name="daily" class="zicon" />
-          </template>
-        </van-cell>
-        <van-cell
-          title="下属大区主管历史半月报"
-          v-if="showDouble || isDiy == 'true'"
-          is-link
-          to="/doubleWeeklyHistorical">
-          <template #icon>
-            <van-icon :name="daily" class="zicon" />
-          </template>
-        </van-cell>
-        <van-cell
-          title="下属汇报率审批率统计"
-          v-if="showDaily || showWeekly || showDouble || isDiy == 'true'"
-          is-link
-          to="/reportingRate">
-          <template #icon>
-            <van-icon :name="daily" class="zicon" />
-          </template>
-        </van-cell>
-      </van-cell-group>
-      <!--      物料类-->
-      <van-cell-group inset class="mtb10">
-        <van-cell title="我的物料库存" is-link to="/myInventory" class="MYTile">
-          <template #title>
-            <span class="custom-title">我的物料库存&nbsp;&nbsp;</span>
-          </template>
-          <template #icon>
-            <van-icon :name="daily" class="zicon" />
-          </template>
-        </van-cell>
-      </van-cell-group>
-      <!--      <p style="margin: -8px 16px 8px;color: #888;" v-if="list">主管任务</p>-->
-      <van-cell-group inset>
-        <div style="border-radius: 6px; overflow: hidden">
+    <div class="content">
+      <div class="myHeader">
+        <van-row>
+          <van-col span="7">
+            <van-image round width="8rem" height="8rem" :src="avatar" @click="login" />
+          </van-col>
+          <van-col span="17">
+            <div class="avatarContent">
+              <p class="nickName">{{ nickName }}</p>
+              <p>
+                <span class="postName">{{ postName }}</span>
+              </p>
+            </div>
+          </van-col>
+        </van-row>
+      </div>
+      <!--        主体内容-->
+      <div class="container">
+        <!--      门店及拜访-->
+        <van-cell-group inset class="mtb10">
+          <van-cell :title="addBTN" is-link @click="onSelect('B')" v-if="addShow">
+            <template #icon>
+              <van-icon :name="addShop" class="zicon" />
+            </template>
+          </van-cell>
+          <van-cell title="新增专卖店/金牌店" is-link @click="onSelect('A')" v-if="addShow1">
+            <template #icon>
+              <van-icon :name="addShop" class="zicon" />
+            </template>
+          </van-cell>
+          <van-cell :title="title" is-link to="/storemanagementlist">
+            <template #icon>
+              <van-icon :name="storeselect" class="zicon" />
+            </template>
+          </van-cell>
+          <van-cell title="历史拜访" is-link to="/historAllVisit">
+            <template #icon>
+              <van-icon :name="history" class="zicon" />
+            </template>
+          </van-cell>
+        </van-cell-group>
+        <!--      客资类-->
+        <van-cell-group inset class="mtb10">
+          <van-cell title="客资&投诉任务" to="/clew" v-if="customerClueButton">
+            <template #icon>
+              <van-icon :name="history" class="zicon" />
+            </template>
+            <template #title>
+              <span>客资&投诉任务</span>
+              &nbsp;<van-tag type="danger" v-if="customerClueNum > 0">{{
+                customerClueNum
+              }}</van-tag>
+            </template>
+            <template #right-icon>
+              <van-icon name="arrow" size="16" />
+            </template>
+          </van-cell>
+          <van-cell title="待分配客资" to="/assignAwait" v-if="isAssignFlag">
+            <template #icon>
+              <van-icon :name="history" class="zicon" />
+            </template>
+            <template #title>
+              <span>待分配客资</span>
+              &nbsp;<van-tag type="danger" v-if="notAllocationNum > 0">{{
+                notAllocationNum
+              }}</van-tag>
+            </template>
+            <template #right-icon>
+              <van-icon name="arrow" size="16" />
+            </template>
+          </van-cell>
+        </van-cell-group>
+        <!--      汇报类-->
+        <van-cell-group inset class="mtb10">
           <van-cell
+            title="我的历史汇报"
+            v-if="historyButton"
             is-link
-            v-for="(item, index) in list"
-            :key="index"
-            :to="'/VisitSummaryAdd?summaryId=' + item.summaryId + '&title=' + item.summaryTaskName">
+            to="/myHistoricalDaily"
+            class="MYTile">
             <template #title>
-              <span class="custom-title">{{ item.summaryTaskName }}</span>
+              <span class="custom-title">我的历史汇报&nbsp;&nbsp;</span>
             </template>
             <template #icon>
               <van-icon :name="daily" class="zicon" />
             </template>
+            <template #right-icon>
+              <van-tag type="danger" v-if="existReject">退回待处理</van-tag>
+              <van-icon name="arrow" />
+            </template>
           </van-cell>
-          <van-cell title="主管任务查询" is-link to="/VisitSummary" v-if="summaryTaskButton">
+          <van-cell v-if="showDaily || isDiy == 'true'" is-link to="/subordinateHistoricalDaily">
+            下属业务员历史日报
+            <span
+              style="font-weight: 600; font-size: 16px; color: red; margin-left: 15px"
+              v-if="thisWeekRemarkNum != null"
+              >{{ thisWeekRemarkNum }}/5</span
+            >
             <template #icon>
-              <van-icon :name="history" class="zicon" />
+              <van-icon :name="daily" class="zicon" />
             </template>
           </van-cell>
-          <van-cell title="家装推广会历史提报查询" is-link to="/VisitSummaryMy" v-if="jzTaskButton">
+          <van-cell
+            title="下属部主管历史周报"
+            v-if="showWeekly || isDiy == 'true'"
+            is-link
+            to="/subordinateHistoricalWeekly">
             <template #icon>
-              <van-icon :name="history" class="zicon" />
+              <van-icon :name="daily" class="zicon" />
+            </template>
+          </van-cell>
+          <van-cell
+            title="下属大区主管历史半月报"
+            v-if="showDouble || isDiy == 'true'"
+            is-link
+            to="/doubleWeeklyHistorical">
+            <template #icon>
+              <van-icon :name="daily" class="zicon" />
             </template>
           </van-cell>
-        </div>
-      </van-cell-group>
-      <br /><br />
-      <br /><br />
-      <br /><br />
-      <tab-bar tabBarActive="MyList"></tab-bar>
+          <van-cell
+            title="下属汇报率审批率统计"
+            v-if="showDaily || showWeekly || showDouble || isDiy == 'true'"
+            is-link
+            to="/reportingRate">
+            <template #icon>
+              <van-icon :name="daily" class="zicon" />
+            </template>
+          </van-cell>
+        </van-cell-group>
+        <!--      物料类-->
+        <van-cell-group inset class="mtb10">
+          <van-cell title="我的物料库存" is-link to="/myInventory" class="MYTile">
+            <template #title>
+              <span class="custom-title">我的物料库存&nbsp;&nbsp;</span>
+            </template>
+            <template #icon>
+              <van-icon :name="daily" class="zicon" />
+            </template>
+          </van-cell>
+        </van-cell-group>
+        <!--      <p style="margin: -8px 16px 8px;color: #888;" v-if="list">主管任务</p>-->
+        <van-cell-group inset>
+          <div style="border-radius: 6px; overflow: hidden">
+            <van-cell
+              is-link
+              v-for="(item, index) in list"
+              :key="index"
+              :to="
+                '/VisitSummaryAdd?summaryId=' + item.summaryId + '&title=' + item.summaryTaskName
+              ">
+              <template #title>
+                <span class="custom-title">{{ item.summaryTaskName }}</span>
+              </template>
+              <template #icon>
+                <van-icon :name="daily" class="zicon" />
+              </template>
+            </van-cell>
+            <van-cell title="主管任务查询" is-link to="/VisitSummary" v-if="summaryTaskButton">
+              <template #icon>
+                <van-icon :name="history" class="zicon" />
+              </template>
+            </van-cell>
+            <van-cell
+              title="家装推广会历史提报查询"
+              is-link
+              to="/VisitSummaryMy"
+              v-if="jzTaskButton">
+              <template #icon>
+                <van-icon :name="history" class="zicon" />
+              </template>
+            </van-cell>
+          </div>
+        </van-cell-group>
+      </div>
     </div>
+    <tab-bar tabBarActive="MyList"></tab-bar>
   </div>
 </template>
 
@@ -361,7 +363,22 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style scoped lang="scss">
+.userPage {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  .content {
+    flex: 1;
+    margin-top: 46px;
+    overflow-y: auto;
+  }
+  .tabBar {
+    height: 50px;
+  }
+}
 .myHeader {
   background-color: #1c84c6;
   padding: 24px 30px;

+ 258 - 248
src/views/week/weekly.vue

@@ -27,254 +27,261 @@
       <div class="lineGrey"></div>
       <div style="height: 8px"></div>
       <van-collapse v-model="activeNames" style="margin-top: -3px">
-        <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="乳胶漆中高端(千元)">
-          <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>
-        <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">
-          <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.zgwqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.zgwqQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </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">{{
-                  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">-->
-        <!--          <van-row>-->
-        <!--            <van-col span="24"><p>未分配点数:<span class="colorbalck">{{reportTargetAll.undistrNum}}</span></p></van-col>-->
-        <!--            <van-col span="24"><p>已覆盖未排线点数:<span class="colorbalck">{{reportTargetAll.coverNotPlan}}</span></p></van-col>-->
-        <!--          </van-row>-->
-        <!--        </van-collapse-item>-->
+        <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="乳胶漆中高端(千元)">
+            <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>
+          <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">
+            <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.zgwqMonthAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  实际:<span class="colorbalck">{{
+                    Micrometer(reportTargetAll.zgwqQuarterAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck"
+                    >{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span
+                  >
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
+                </p></van-col
+              >
+            </van-row>
+          </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>
+        </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">
             <div v-for="(item2, index2) in reportContentsList2" :key="index2">
@@ -429,6 +436,7 @@ export default {
       temporaryShow: '',
       type: '-1',
       JZQuota: false,
+      YFQuota: false, //应用服务
     };
   },
   created() {
@@ -463,6 +471,7 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         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;
@@ -696,6 +705,7 @@ export default {
         localStorage.setItem('powerGrade', res.data.positionId);
         this.type = res.data.userType;
         var dayTime = res.data.date;
+        this.YFQuota = res.data.postType == 'YF' ? true : false;
         this.timeList = this.parseTimeParagraph(
           dayTime.slice(0, 4) + '-' + dayTime.slice(4, 6) + '-' + dayTime.slice(6, 8)
         );

+ 264 - 248
src/views/week/weeklyApproval.vue

@@ -12,254 +12,268 @@
       <div class="lineGrey"></div>
       <div style="height: 4px"></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="乳胶漆中高端(千元)">
-          <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>
-        <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">
-          <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.zgwqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.zgwqQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </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">{{
-                  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">-->
-        <!--          <van-row>-->
-        <!--            <van-col span="24"><p>未分配点数:<span class="colorbalck">{{reportTargetAll.undistrNum}}</span></p></van-col>-->
-        <!--            <van-col span="24"><p>已覆盖未排线点数:<span class="colorbalck">{{reportTargetAll.coverNotPlan}}</span></p></van-col>-->
-        <!--          </van-row>-->
-        <!--        </van-collapse-item>-->
+        <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="乳胶漆中高端(千元)">
+            <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>
+          <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">
+            <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.zgwqMonthAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  实际:<span class="colorbalck">{{
+                    Micrometer(reportTargetAll.zgwqQuarterAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck"
+                    >{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span
+                  >
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
+                </p></van-col
+              >
+            </van-row>
+          </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">{{
+                    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>
+        </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">
             <div v-for="(item2, index2) in reportContentsList2" :key="index2">
@@ -429,6 +443,7 @@ export default {
       reportTarget: {},
       type: '-1',
       JZQuota: false,
+      YFQuota: false, //应用服务
     };
   },
   created() {
@@ -536,6 +551,7 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         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;

+ 257 - 248
src/views/week/weeklyApprovalDetils.vue

@@ -12,254 +12,261 @@
       <div class="lineGrey"></div>
       <div style="height: 4px"></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="乳胶漆中高端(千元)">
-          <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>
-        <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">
-          <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.zgwqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.zgwqQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </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">{{
-                  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">-->
-        <!--          <van-row>-->
-        <!--            <van-col span="24"><p>未分配点数:<span class="colorbalck">{{reportTargetAll.undistrNum}}</span></p></van-col>-->
-        <!--            <van-col span="24"><p>已覆盖未排线点数:<span class="colorbalck">{{reportTargetAll.coverNotPlan}}</span></p></van-col>-->
-        <!--          </van-row>-->
-        <!--        </van-collapse-item>-->
-
+        <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="乳胶漆中高端(千元)">
+            <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>
+          <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">
+            <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.zgwqMonthAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  实际:<span class="colorbalck">{{
+                    Micrometer(reportTargetAll.zgwqQuarterAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck"
+                    >{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span
+                  >
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
+                </p></van-col
+              >
+            </van-row>
+          </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>
+        </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">
             <div v-for="(item2, index2) in reportContentsList2" :key="index2">
@@ -447,6 +454,7 @@ export default {
       type: '-1',
       ptitle: '',
       JZQuota: false,
+      YFQuota: false, //应用服务
     };
   },
   created() {
@@ -477,6 +485,7 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         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;

+ 257 - 248
src/views/week/weeklyHistoricalDetils.vue

@@ -13,254 +13,261 @@
       <div class="lineGrey"></div>
       <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="乳胶漆中高端(千元)">
-          <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>
-        <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">
-          <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.zgwqMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.zgwqQuarterAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </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">{{
-                  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">-->
-        <!--                  <van-row>-->
-        <!--                    <van-col span="24"><p>未分配点数:<span class="colorbalck">{{reportTargetAll.undistrNum}}</span></p></van-col>-->
-        <!--                    <van-col span="24"><p>已覆盖未排线点数:<span class="colorbalck">{{reportTargetAll.coverNotPlan}}</span></p></van-col>-->
-        <!--                  </van-row>-->
-        <!--                </van-collapse-item>-->
+        <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="乳胶漆中高端(千元)">
+            <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>
+          <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">
+            <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.zgwqMonthAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  实际:<span class="colorbalck">{{
+                    Micrometer(reportTargetAll.zgwqQuarterAct)
+                  }}</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthSuccessRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  达成率:<span class="colorbalck"
+                    >{{ reportTargetAll.zgwqQuarterSuccessRate }}%</span
+                  >
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqMonthGrowRate }}%</span>
+                </p></van-col
+              >
+              <van-col span="12"
+                ><p>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.zgwqQuarterGrowRate }}%</span>
+                </p></van-col
+              >
+            </van-row>
+          </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>
+        </template>
         <van-collapse-item title="上周工作成果" name="8">
           <div style="margin-top: -10px">
             <div v-for="(item2, index2) in reportContentsList2" :key="index2">
@@ -461,6 +468,7 @@ export default {
       isDiy: false,
       type: '-1',
       JZQuota: false,
+      YFQuota: false, //应用服务
     };
   },
   created() {
@@ -580,6 +588,7 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         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;