Pārlūkot izejas kodu

Merge branch 'feature_20241014_首页增加提示类tab,B类指标页优化,我的-增加业务员日常工作统计'

# Conflicts:
#	src/api/index.js
#	src/router/index.js
#	src/views/home/index.vue
#	src/views/home/reportingRate.vue
#	src/views/storeManagement/index.vue
#	src/views/week/doubleWeeklyDetils.vue
#	src/views/week/index.vue
#	src/views/week/weeklyApprovalDetils.vue
zhujindu 1 gadu atpakaļ
vecāks
revīzija
e48bc3e16c
47 mainītis faili ar 4956 papildinājumiem un 5416 dzēšanām
  1. 1 0
      package.json
  2. 13 1
      src/App.vue
  3. 90 0
      src/api/index.js
  4. BIN
      src/assets/hintIcon.png
  5. 69 58
      src/components/tabBar.vue
  6. 3 0
      src/main.js
  7. 34 0
      src/permission.js
  8. 19 1
      src/router/index.js
  9. 4 0
      src/store/getters.js
  10. 15 0
      src/store/index.js
  11. 44 0
      src/store/modules/user.js
  12. 39 12
      src/utils/TXApiFun.js
  13. 53 50
      src/utils/request.js
  14. 56 0
      src/views/componentsTarget/ZYPlaceOrder.vue
  15. 52 0
      src/views/componentsTarget/ZYSAP.vue
  16. 42 0
      src/views/componentsTarget/chunTaiSAP.vue
  17. 117 0
      src/views/componentsTarget/createStoreBJ.vue
  18. 52 0
      src/views/componentsTarget/index.css
  19. 85 0
      src/views/componentsTarget/performanceSAP.vue
  20. 89 0
      src/views/componentsTarget/placeOrder.vue
  21. 54 0
      src/views/componentsTarget/veryGoodPlaceOrder.vue
  22. 159 0
      src/views/componentsTarget/visitedRealTime.vue
  23. 8 4
      src/views/deviceOutside/suishenbangOutstoreVisit.vue
  24. 2 1
      src/views/deviceWithin/storeVisit.vue
  25. 1239 0
      src/views/home/ABtarget.vue
  26. 181 0
      src/views/home/bottomBtn.vue
  27. 562 0
      src/views/home/hintTabPage/hintDetail.vue
  28. 639 0
      src/views/home/hintTabPage/index.vue
  29. 470 0
      src/views/home/hintTabPage/noVisit.vue
  30. 121 0
      src/views/home/hintTabPage/pantoneNoGet.vue
  31. 136 0
      src/views/home/hintTabPage/visitPage.vue
  32. 137 1733
      src/views/home/index.vue
  33. 2 0
      src/views/home/login.vue
  34. 5 5
      src/views/home/reportingRate.vue
  35. 23 4
      src/views/storeManagement/index.vue
  36. 37 379
      src/views/week/daily.vue
  37. 37 380
      src/views/week/dailyApproval.vue
  38. 35 378
      src/views/week/dailyDetails.vue
  39. 35 385
      src/views/week/dailyHistoricalDetails.vue
  40. 21 253
      src/views/week/doubleHistoricalWeeklyDetils.vue
  41. 23 254
      src/views/week/doubleWeekly.vue
  42. 21 253
      src/views/week/doubleWeeklyApproval.vue
  43. 26 253
      src/views/week/doubleWeeklyDetils.vue
  44. 28 254
      src/views/week/weekly.vue
  45. 26 253
      src/views/week/weeklyApproval.vue
  46. 26 253
      src/views/week/weeklyApprovalDetils.vue
  47. 26 252
      src/views/week/weeklyHistoricalDetils.vue

+ 1 - 0
package.json

@@ -24,6 +24,7 @@
     "vue-baidu-map": "^0.21.22",
     "vue-jsonp": "^2.0.0",
     "vue-router": "^3.5.3",
+    "vuex": "^3.6.0",
     "watermark-dom": "^2.3.0",
     "weixin-js-sdk": "^1.6.5"
   },

+ 13 - 1
src/App.vue

@@ -5,7 +5,6 @@
 </template>
 <script>
 import watermark from 'watermark-dom';
-
 export default {
   name: 'App',
   created() {
@@ -40,5 +39,18 @@ export default {
       }
     }, 1000);
   },
+  methods: {},
 };
 </script>
+<style lang="scss">
+#wm_div_id {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 9999999;
+}
+</style>

+ 90 - 0
src/api/index.js

@@ -817,6 +817,15 @@ export function getOrderByStoreCode(query) {
   });
 }
 
+// 提示类页签-汇报指标查询接口 日报、周报、半月报
+export function getReportTarget(query) {
+  return request({
+    url: '/mobile/reportMobile/getReportTarget',
+    method: 'get',
+    params: query,
+  });
+}
+
 // 部门主管审批新建店铺-通过
 export function getStoreApprovalList(query) {
   return request({
@@ -826,10 +835,45 @@ export function getStoreApprovalList(query) {
   });
 }
 
+// 移动端获取用户信息接口
+export function getMobileUserInfo(query) {
+  return request({
+    url: '/mobile/getMobileUserInfo',
+    method: 'get',
+    params: query,
+  });
+}
+
 // 部门主管审批新建同城店铺
 export function approvalStore(data) {
   return request({
     url: '/mobile/store/approvalStore',
+    params: query,
+  });
+}
+
+// 各部门未拜访门店数量
+export function selectNoVisitsInfo(query) {
+  return request({
+    url: '/mobile/storeStatistics/selectNoVisitsInfo',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 提示类页签-色卡查询接口
+export function getReportMaterial(query) {
+  return request({
+    url: '/mobile/reportMobile/getReportMaterial',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 提示类页签-查询下属业务员色卡指标接口
+export function getReportMaterialType(data) {
+  return request({
+    url: '/mobile/reportMobile/getReportMaterialType',
     method: 'post',
     data: data,
   });
@@ -844,6 +888,15 @@ export function submitApproval(query) {
   });
 }
 
+// 提示类拜访(实时)接口
+export function selectVisitsRealTime(query) {
+  return request({
+    url: '/mobile/storeStatistics/selectVisitsRealTime',
+    method: 'get',
+    params: query,
+  });
+}
+
 // 审批历史
 export function storeApprovaHistory(query) {
   return request({
@@ -852,6 +905,43 @@ export function storeApprovaHistory(query) {
     params: query,
   });
 }
+
+// 提示类建店统计接口
+export function selectBuildingStore(query) {
+  return request({
+    url: '/mobile/storeStatistics/selectBuildingStore',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 提示类色卡未领取-根据门店ID查询门店列表接口
+export function getNotSignStoreList(data) {
+  return request({
+    url: '/mobile/reportMobile/getNotSignStoreList',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 提示类用户拜访(实时)详情接口
+export function selectUserStoreNoVisits(data) {
+  return request({
+    url: '/mobile/storeStatistics/selectUserStoreNoVisits',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 提示类建店详情接口
+export function selectPendingCasesInfo(query) {
+  return request({
+    url: '/mobile/storeStatistics/selectPendingCasesInfo',
+    method: 'get',
+    params: query,
+  });
+}
+
 // 获取字典
 export function getDictOption(query, dictTypr) {
   return request({

BIN
src/assets/hintIcon.png


+ 69 - 58
src/components/tabBar.vue

@@ -1,59 +1,62 @@
 <template>
-  <div>
-      <van-tabbar v-model="ActiveMessage" @change="tabBarChange" active-color="#0057ba" inactive-color="#222">
-        <van-tabbar-item name="home">
-          <span>首页</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'home' ? honeselect: home"/>
-          </template>
-        </van-tabbar-item>
-<!--        <van-tabbar-item name="ai" >-->
-<!--          <span>AI参谋</span>-->
-<!--          <template #icon>-->
-<!--            <van-icon :name="tabBarActive == 'ai' ? aiselect : ai"/>-->
-<!--          </template>-->
-<!--        </van-tabbar-item>-->
-        <van-tabbar-item name="deviceWithin">
-          <span>计划内</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'deviceWithin' ? jihuaselect : jihua"/>
-          </template>
-        </van-tabbar-item>
-        <van-tabbar-item name="outsidelist">
-          <span>计划外</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'outsidelist' ? outselect : out"/>
-          </template>
-        </van-tabbar-item>
-        <van-tabbar-item name="MyList">
-          <span>我的</span>
-          <template #icon>
-            <van-icon :name="tabBarActive == 'MyList' ? storeselect : store"/>
-          </template>
-        </van-tabbar-item>
-      </van-tabbar>
-    </div>
-
+  <div class="tabBar">
+    <van-tabbar
+      v-model="ActiveMessage"
+      @change="tabBarChange"
+      active-color="#0057ba"
+      inactive-color="#222">
+      <van-tabbar-item name="home">
+        <span>首页</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'home' ? honeselect : home" />
+        </template>
+      </van-tabbar-item>
+      <!--        <van-tabbar-item name="ai" >-->
+      <!--          <span>AI参谋</span>-->
+      <!--          <template #icon>-->
+      <!--            <van-icon :name="tabBarActive == 'ai' ? aiselect : ai"/>-->
+      <!--          </template>-->
+      <!--        </van-tabbar-item>-->
+      <van-tabbar-item name="deviceWithin">
+        <span>计划内</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'deviceWithin' ? jihuaselect : jihua" />
+        </template>
+      </van-tabbar-item>
+      <van-tabbar-item name="outsidelist">
+        <span>计划外</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'outsidelist' ? outselect : out" />
+        </template>
+      </van-tabbar-item>
+      <van-tabbar-item name="MyList">
+        <span>我的</span>
+        <template #icon>
+          <van-icon :name="tabBarActive == 'MyList' ? storeselect : store" />
+        </template>
+      </van-tabbar-item>
+    </van-tabbar>
+  </div>
 </template>
 
 <script>
-import home from "@/assets/Icon/home.png";
-import honeselect from "@/assets/Icon/hone-select.png";
-import jihua from "@/assets/Icon/jihua.png";
-import jihuaselect from "@/assets/Icon/jihuaselect.png";
-import out from "@/assets/Icon/out.png";
-import outselect from "@/assets/Icon/outselect.png";
-import store from "@/assets/Icon/store.png";
-import storeselect from "@/assets/Icon/storeselect.png";
-import ai from "@/assets/Icon/ai.png";
-import aiselect from "@/assets/Icon/aiselect.png";
+import home from '@/assets/Icon/home.png';
+import honeselect from '@/assets/Icon/hone-select.png';
+import jihua from '@/assets/Icon/jihua.png';
+import jihuaselect from '@/assets/Icon/jihuaselect.png';
+import out from '@/assets/Icon/out.png';
+import outselect from '@/assets/Icon/outselect.png';
+import store from '@/assets/Icon/store.png';
+import storeselect from '@/assets/Icon/storeselect.png';
+import ai from '@/assets/Icon/ai.png';
+import aiselect from '@/assets/Icon/aiselect.png';
 export default {
-  name: "tabBar",
+  name: 'tabBar',
   props: {
     tabBarActive: {
       type: String,
-      default: 'home'
-    }
+      default: 'home',
+    },
   },
   data() {
     return {
@@ -68,26 +71,34 @@ export default {
       out: out,
       outselect: outselect,
       tabBarAct: this.tabBarActive,
-      show:false
-    }
+      show: false,
+    };
   },
   computed: {
     ActiveMessage: {
       get() {
-        return this.tabBarAct = this.tabBarActive;
+        return (this.tabBarAct = this.tabBarActive);
       },
       set(newValue) {
         return newValue;
-      }
-    }
+      },
+    },
   },
   methods: {
     tabBarChange(index) {
-      if(localStorage.getItem('loginName')=='lihaoyang.sm'||localStorage.getItem('loginName')=='zhangjunyang.sm'){
-        this.show=true
+      if (
+        localStorage.getItem('loginName') == 'lihaoyang.sm' ||
+        localStorage.getItem('loginName') == 'zhangjunyang.sm'
+      ) {
+        this.show = true;
       }
-      this.$router.push({name: index + ""})
+      this.$router.push({ name: index + '' });
     },
-  }
+  },
+};
+</script>
+<style lang="scss">
+.tabBar {
+  z-index: 9999;
 }
-</script>
+</style>

+ 3 - 0
src/main.js

@@ -1,6 +1,8 @@
 import Vue from 'vue';
 import App from './App.vue';
+import store from './store';
 import router from './router';
+import permission from './permission';
 import '@/assets/styles/index.css';
 import {
   parseTime,
@@ -67,5 +69,6 @@ if (isProd) {
 
 new Vue({
   router,
+  store,
   render: (h) => h(App),
 }).$mount('#app');

+ 34 - 0
src/permission.js

@@ -0,0 +1,34 @@
+import router from './router';
+import store from './store';
+
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
+
+router.beforeEach((to, from, next) => {
+  const username = localStorage.getItem('loginName');
+  if (username) {
+    /* has token*/
+    if (!store.state.user.userInfo) {
+      // 获取移动端获取用户信息接口
+      store
+        .dispatch('getUserInfo')
+        .then(() => {
+          next();
+        })
+        .catch(() => {
+          next();
+        });
+    } else {
+      next();
+    }
+  } else {
+    next();
+    // // 没有token
+    // if (whiteList.indexOf(to.path) !== -1) {
+    //   // 在免登录白名单,直接进入
+    //   next();
+    // } else {
+    //     next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
+    //     NProgress.done();
+    // }
+  }
+});

+ 19 - 1
src/router/index.js

@@ -60,7 +60,25 @@ const router = new VueRouter({
         //     path: "/logincs",
         //     name: "logincs",
         //     component: () => import("@/views/home/logincs.vue")
-        // }
+        // },
+        {
+          path: '/noVisit',
+          name: 'noVisit',
+          meta: { title: '未拜访门店' },
+          component: () => import('@/views/home/hintTabPage/noVisit.vue'),
+        },
+        {
+          path: '/hintDetail',
+          name: 'hintDetail',
+          meta: { title: '提示类-拜访(实时) ' },
+          component: () => import('@/views/home/hintTabPage/hintDetail.vue'),
+        },
+        {
+          path: '/pantoneNoGet',
+          name: 'pantoneNoGet',
+          meta: { title: '提示类-业务员未领取色卡门店 ' },
+          component: () => import('@/views/home/hintTabPage/pantoneNoGet.vue'),
+        },
       ],
     },
     {

+ 4 - 0
src/store/getters.js

@@ -0,0 +1,4 @@
+const getters = {
+  userInfo: (state) => state.user.userInfo,
+};
+export default getters;

+ 15 - 0
src/store/index.js

@@ -0,0 +1,15 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import user from './modules/user';
+import getters from './getters';
+
+Vue.use(Vuex);
+
+const store = new Vuex.Store({
+  modules: {
+    user,
+  },
+  getters,
+});
+
+export default store;

+ 44 - 0
src/store/modules/user.js

@@ -0,0 +1,44 @@
+import { getMobileUserInfo } from '@/api/index';
+
+const user = {
+  state: {
+    userInfo: null,
+    activaTypeStore: null,
+  },
+
+  mutations: {
+    SET_USER_INFO: (state, userInfo) => {
+      state.userInfo = userInfo;
+    },
+    SET_ACTIVA_TYPE_STORE: (state, value) => {
+      state.activaTypeStore = value;
+    },
+  },
+
+  actions: {
+    // 获取用户信息
+    getUserInfo({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        getMobileUserInfo()
+          .then((res) => {
+            commit('SET_USER_INFO', res.data);
+            localStorage.setItem('nickName', res.data.nickName);
+            localStorage.setItem('postName', res.data.postName);
+            localStorage.setItem('zipPhoto', res.data.zipPhoto);
+            localStorage.setItem('deptLevel', res.data.depts[0].deptLevel);
+            localStorage.setItem('userId', res.data.userId);
+            resolve();
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    // 储存提示类-未拜访-从那个店铺类型进入未拜访列表
+    setActivaTypeStore({ commit }, value) {
+      commit('SET_ACTIVA_TYPE_STORE', value);
+    },
+  },
+};
+
+export default user;

+ 39 - 12
src/utils/TXApiFun.js

@@ -84,8 +84,15 @@ export function getPosition(isPermit = false) {
  *当前页面授权 一个url只需要授权一次,wx.config 调用多次,只有第一次会调用成功,后面的都会走失败
  * @param {*object} jsApiList //授权接口列表
  * @param {*String} getLocation //获取定位
+ * @param {*String} configType //注入类型
+ * config,agentConfig
+ * config注入的是企业的身份与权限,
+ * 而agentConfig注入的是应用的身份与权限。
+ * 尤其是当调用者为第三方服务商时,通过config无法准确区分出调用者是哪个第三方应用,
+ * 而在部分场景下,又必须严谨区分出第三方应用的身份,此时即需要通过agentConfig来注入应用的身份信息。
+ *
  */
-export function getTicketFun(jsApiList = ['getLocation']) {
+export function getTicketFun(jsApiList = ['getLocation'], configType = 'config') {
   return new Promise((resolve, reject) => {
     // 当前页面
     let url = window.location.href;
@@ -95,17 +102,37 @@ export function getTicketFun(jsApiList = ['getLocation']) {
       toastLoading().clear();
       if (response.code == 200) {
         let qiyeData = response.data;
-        wx.config({
-          beta: true, // 必须这么写,否则wx.invoke调用形式的jsapi会有问题
-          debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
-          appId: qiyeData.appId, // 必填,企业微信的corpID
-          timestamp: qiyeData.timestamp, // 必填,生成签名的时间戳
-          nonceStr: qiyeData.nonceStr, // 必填,生成签名的随机串
-          signature: qiyeData.signature, // 必填,签名,见 附录-JS-SDK使用权限签名算法
-          jsApiList: ['ready', ...jsApiList], // 必填,需要使用的JS接口列表,凡是要调用的接口都需要传进来
-        });
-        console.log('获取签名成功');
-        resolve('获取签名成功');
+        if (configType == 'config') {
+          wx.config({
+            beta: true, // 必须这么写,否则wx.invoke调用形式的jsapi会有问题
+            debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+            appId: qiyeData.appId, // 必填,企业微信的corpID
+            timestamp: qiyeData.timestamp, // 必填,生成签名的时间戳
+            nonceStr: qiyeData.nonceStr, // 必填,生成签名的随机串
+            signature: qiyeData.signature, // 必填,签名,见 附录-JS-SDK使用权限签名算法
+            jsApiList: ['ready', ...jsApiList], // 必填,需要使用的JS接口列表,凡是要调用的接口都需要传进来
+          });
+          console.log('获取签名成功');
+          resolve('获取签名成功');
+        } else if (configType == 'agentConfig') {
+          wx.agentConfig({
+            corpid: qiyeData.appId, // 必填,企业微信的corpid,必须与当前登录的企业一致
+            agentid: qiyeData.agentId, // 必填,企业微信的应用id (e.g. 1000247)
+            timestamp: qiyeData.timestamp, // 必填,生成签名的时间戳
+            nonceStr: qiyeData.nonceStr, // 必填,生成签名的随机串
+            signature: qiyeData.signature, // 必填,签名,见附录-JS-SDK使用权限签名算法
+            jsApiList: [...jsApiList], //必填,传入需要使用的接口名称
+            success: function (res) {
+              console.log('获取签名成功');
+              resolve('获取签名成功');
+            },
+            fail: function (res) {
+              if (res.errMsg.indexOf('function not exist') > -1) {
+                alert('版本过低请升级');
+              }
+            },
+          });
+        }
       } else {
         console.log('获取签名失败');
         reject('获取签名失败');

+ 53 - 50
src/utils/request.js

@@ -2,60 +2,63 @@
  * 封装的axios的工具类
  * 负责请求的公共配置,以及请求拦截,响应拦截,错误处理,网络不佳处理
  */
-import axios from 'axios'
-import {Toast,Dialog} from 'vant';
-import errorCode from '@/utils/errorCode'
+import axios from 'axios';
+import { Toast, Dialog } from 'vant';
+import errorCode from '@/utils/errorCode';
 
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
 const service = axios.create({
-    baseURL: process.env.VUE_APP_BASE_API,
-    timeout: 30000,
-    withCredentials: true
+  baseURL: process.env.VUE_APP_BASE_API,
+  timeout: 30000,
+  withCredentials: true,
 });
 // request拦截器
-service.interceptors.request.use(config => {
-    config.headers['userId'] = localStorage.getItem("loginName")
-    return config
-}, error => {
-    Promise.reject(error)
-})
+service.interceptors.request.use(
+  (config) => {
+    config.headers['userId'] = localStorage.getItem('loginName');
+    return config;
+  },
+  (error) => {
+    Promise.reject(error);
+  }
+);
 
 // 响应拦截器
-service.interceptors.response.use(res => {
-
-        const code = res.data.code || 200;
-        const msg = errorCode[code] || res.data.msg || errorCode['default']
-        if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
-            return res.data
-        }
-        if (code === 401) {
-            Toast("认证信息未通过");
-        } else if (code === 500) {
-            // Toast({
-            //     message:msg,
-            //     duration:5000
-            // });
-            return res.data
-        } else if (code !== 200) {
-            Toast({
-                message:msg,
-                duration:5000
-            });
-        } else {
-            return res.data
-        }
-    },
-    error => {
-        let {message} = error;
-        if (message == "Network Error") {
-            message = "网络异常";
-        } else if (message.includes("timeout")) {
-            message = "请求超时";
-        } else if (message.includes("Request failed with status code")) {
-            message = "系统接口" + message.substr(message.length - 3) + "异常";
-        }
-        Toast(message);
-        return Promise.reject(error)
+service.interceptors.response.use(
+  (res) => {
+    const code = res.data.code || 200;
+    const msg = errorCode[code] || res.data.msg || errorCode['default'];
+    if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+      return res.data;
+    }
+    if (code === 401) {
+      Toast('认证信息未通过');
+    } else if (code === 500) {
+      // Toast({
+      //     message:msg,
+      //     duration:5000
+      // });
+      return res.data;
+    } else if (code !== 200) {
+      Toast({
+        message: msg,
+        duration: 5000,
+      });
+    } else {
+      return res.data;
+    }
+  },
+  (error) => {
+    let { message } = error;
+    if (message == 'Network Error') {
+      message = '网络异常';
+    } else if (message.includes('timeout')) {
+      message = '请求超时';
+    } else if (message.includes('Request failed with status code')) {
+      message = '系统接口' + message.substr(message.length - 3) + '异常';
     }
-)
-export default service
+    Toast(message);
+    return Promise.reject(error);
+  }
+);
+export default service;

+ 56 - 0
src/views/componentsTarget/ZYPlaceOrder.vue

@@ -0,0 +1,56 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <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.professionalSslYes)
+        }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        下单点数:<span class="colorbalck">{{
+          Micrometer(reportTargetAll.professionalSslMonth)
+        }}</span>
+      </p></van-col
+    >
+    <van-col span="12"><p></p></van-col>
+    <van-col span="12"
+      ><p>
+        下单率:<span class="colorbalck">{{ reportTargetAll.professionalSslOrderRateMonth }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        下单数量(桶):<span class="colorbalck">{{
+          Micrometer(reportTargetAll.professionalSslOrderNumYes)
+        }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        下单数量(桶):<span class="colorbalck">{{
+          Micrometer(reportTargetAll.professionalSslOrderNumMonth)
+        }}</span>
+      </p></van-col
+    >
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 52 - 0
src/views/componentsTarget/ZYSAP.vue

@@ -0,0 +1,52 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <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.czjMonthAct) }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
+      </p></van-col
+    >
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 42 - 0
src/views/componentsTarget/chunTaiSAP.vue

@@ -0,0 +1,42 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <van-row style="margin-top: -10px">
+    <van-col span="12"><span class="leftTitle">本月</span></van-col
+    ><van-col span="12"><span class="rightTitle">本季</span></van-col>
+    <van-col span="12"
+      ><p>
+        业绩实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjMonthAct) }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        业绩实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.gzCtzjQuarterAct) }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        业绩成长率:<span class="colorbalck">{{ reportTargetAll.gzCtzjMonthGrowRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        业绩成长率:<span class="colorbalck">{{ reportTargetAll.gzCtzjQuarterGrowRate }}%</span>
+      </p></van-col
+    >
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 117 - 0
src/views/componentsTarget/createStoreBJ.vue

@@ -0,0 +1,117 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <van-row>
+    <van-col span="12">
+      <p>
+        <span class="leftTitle">本月实际</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p>
+        <span class="rightTitle">今年目标(达成率)</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p>
+        可控店点数:
+        <span class="colorbalck">{{ Micrometer(reportTargetAll.controlledShopMonthAct) }}</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p>
+        可控店点数:
+        <span class="colorbalck">{{ Micrometer(reportTargetAll.controlledShopYearAct) }}</span>
+        <span class="colorbalck">({{ reportTargetAll.controlledShopYearRate }}%)</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p>
+        分销店点数:
+        <span class="colorbalck">{{ Micrometer(reportTargetAll.allShopMonthAct) }}</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p>
+        分销店点数:
+        <span class="colorbalck">{{ Micrometer(reportTargetAll.allShopYearTarget) }}</span>
+        <span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
+      </p>
+    </van-col>
+    <div class="colBack">
+      <div class="backLeft back"></div>
+      <div class="backRight back"></div>
+      <van-col span="12">
+        <p>
+          金牌店点数:
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.goldShopMonthAct) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          金牌店点数:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.goldShopYearTarget)
+          }}</span
+          ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
+        </p>
+      </van-col>
+      <van-col span="12"
+        ><p>
+          金牌店布机:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.goldShopBjMonthAct)
+          }}</span>
+        </p></van-col
+      >
+      <van-col span="12">
+        <p>
+          金牌店布机:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.goldShopBjYearTarget)
+          }}</span
+          ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
+        </p>
+      </van-col>
+
+      <van-col span="12"
+        ><p>
+          同A店点数:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcAShopMonthAct)
+          }}</span>
+        </p></van-col
+      >
+      <van-col span="12">
+        <p>
+          同A店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tcAShopYearAct) }}</span
+          ><span class="colorbalck">家({{ reportTargetAll.tcAShopYearRate || '-' }})</span>
+        </p>
+      </van-col>
+
+      <van-col span="12"
+        ><p>
+          同B店点数:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcBShopMonthAct)
+          }}</span>
+        </p></van-col
+      >
+      <van-col span="12">
+        <p>
+          同B店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tcBShopYearAct) }}</span
+          ><span class="colorbalck">({{ reportTargetAll.tcBShopYearRate }}%)</span>
+        </p>
+      </van-col>
+    </div>
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 52 - 0
src/views/componentsTarget/index.css

@@ -0,0 +1,52 @@
+p{
+    margin: 10px 0 0 0;
+    font-size: 14px;
+    color: #666;
+}
+.leftTitle {
+    background-color: #74a4d9;
+    color: #fff;
+    display: inline-block;
+    padding: 0 4px;
+    border-radius: 2px;
+}
+.rightTitle {
+    background-color: #e7b4bb;
+    color: #fff;
+    display: inline-block;
+    padding: 0 4px;
+    border-radius: 2px;
+}
+
+.colBack {
+    width: 100%;
+    height: 100%;
+    display: block;
+    /* overflow: unset; */
+    position: relative;
+    z-index: 2;
+    float: left;
+    z-index: 2;
+    .back {
+        position: absolute;
+        background: rgb(226, 240, 217);
+        height: 100%;
+        display: block;
+        overflow: hidden;
+        /* z-index: 1; */
+        border-radius: 12px;
+        bottom: -4px;
+    }
+    .backLeft {
+        width: 45%;
+        left: -12px;
+    }
+    .backRight {
+        width: 50%;
+        left: calc(50% - 12px);
+    }
+    .van-col {
+        position: relative;
+        z-index: 3;
+    }
+}

+ 85 - 0
src/views/componentsTarget/performanceSAP.vue

@@ -0,0 +1,85 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <van-row>
+    <!--            <van-col span="24" v-if="GZdata"><p style="margin: 0;margin-bottom: 10px">昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
+    <van-col span="12"
+      ><span v-if="!JZQuota" class="leftTitle">本月业绩</span
+      ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
+    >
+    <van-col span="12"
+      ><span v-if="!JZQuota" class="rightTitle">本季业绩</span
+      ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
+    >
+    <van-col span="12">
+      <p v-if="!JZQuota">
+        本月实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapMonthAct) }}</span>
+      </p>
+      <p v-if="JZQuota">
+        本月累计:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapMonthAct) }}</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p v-if="!JZQuota">
+        本季实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapQuarterAct) }}</span>
+      </p>
+      <p v-if="JZQuota">
+        本季累计:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapQuarterAct) }}</span>
+      </p>
+    </van-col>
+    <van-col span="12"
+      ><p>
+        本月达成率:<span class="colorbalck">{{ reportTargetAll.sapMonthSuccessRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        本季达成率:<span class="colorbalck">{{ reportTargetAll.sapQuarterSuccessRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="24" v-if="JZQuota"><span class="leftTitle">年度累计</span></van-col>
+    <van-col span="24" v-if="JZQuota"
+      ><p>
+        年度累计:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapYearAct) }}</span>
+      </p></van-col
+    >
+    <van-col span="24" v-if="JZQuota"
+      ><p>
+        年度达成率:<span class="colorbalck">{{ reportTargetAll.sapYearSuccessRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="24" v-if="JZQuota"
+      ><p>
+        年度成长率:<span class="colorbalck">{{ reportTargetAll.sapYearGrowRate }}%</span>
+      </p></van-col
+    >
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+    JZQuota: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 89 - 0
src/views/componentsTarget/placeOrder.vue

@@ -0,0 +1,89 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <van-row>
+    <van-col span="24"><span class="leftTitle">本月进度</span></van-col>
+    <van-col span="12">
+      <p>
+        可控店下单点数:
+        <span class="colorbalck">{{
+          Micrometer(reportTargetAll.controlledOrderShopMonthAct)
+        }}</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p>
+        可控店下单率:
+        <span class="colorbalck">{{ reportTargetAll.controlledShopMonthOrderRate }}%</span>
+      </p>
+    </van-col>
+    <van-col span="12"
+      ><p>
+        分销店下单点数:<span class="colorbalck">{{
+          Micrometer(reportTargetAll.fxOrderShopMonthAct)
+        }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        分销店下单率:<span class="colorbalck">{{ reportTargetAll.fxShopMonthOrderRate }}%</span>
+      </p></van-col
+    >
+    <div class="colBack">
+      <div class="backLeft back"></div>
+      <div class="backRight back"></div>
+      <van-col span="12"
+        ><p>
+          金牌店下单点数:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.jpOrderShopMonthAct)
+          }}</span>
+        </p></van-col
+      >
+      <van-col span="12"
+        ><p>
+          金牌店下单率:<span class="colorbalck">{{ reportTargetAll.jpShopMonthOrderRate }}%</span>
+        </p></van-col
+      >
+
+      <van-col span="12"
+        ><p>
+          同A店下单点数:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcAOrderShopMonthAct)
+          }}</span>
+        </p></van-col
+      >
+      <van-col span="12">
+        <p>
+          同A店下单率:<span class="colorbalck">{{ reportTargetAll.tcAShopMonthOrderRate }}%</span>
+        </p>
+      </van-col>
+
+      <van-col span="12"
+        ><p>
+          同B店下单点数:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcBOrderShopMonthAct)
+          }}</span>
+        </p></van-col
+      >
+      <van-col span="12">
+        <p>
+          同B店下单率:<span class="colorbalck">{{ reportTargetAll.tcBShopMonthOrderRate }}%</span>
+        </p>
+      </van-col>
+    </div>
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 54 - 0
src/views/componentsTarget/veryGoodPlaceOrder.vue

@@ -0,0 +1,54 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <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.excellentPostYes) }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        下单点数:<span class="colorbalck">{{
+          Micrometer(reportTargetAll.excellentPostMonth)
+        }}</span>
+      </p></van-col
+    >
+    <van-col span="12"><p></p></van-col>
+    <van-col span="12"
+      ><p>
+        下单率:<span class="colorbalck">{{ reportTargetAll.excellentPostOrderRateMonth }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        下单数量(包):<span class="colorbalck">{{
+          Micrometer(reportTargetAll.excellentPostOrderNumYes)
+        }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        下单数量(包):<span class="colorbalck">{{
+          Micrometer(reportTargetAll.excellentPostOrderNumMonth)
+        }}</span>
+      </p>
+    </van-col>
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 159 - 0
src/views/componentsTarget/visitedRealTime.vue

@@ -0,0 +1,159 @@
+<!-- 拜访数据(实时) -->
+<template>
+  <!-- 家装和公装 -->
+  <van-row v-if="JZQuota">
+    <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.inVisitAct }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        线内拜访点数:<span class="colorbalck">{{ reportTargetAll.inVisitActMonth }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        计划拜访点数:<span class="colorbalck">{{ reportTargetAll.visitTarget }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        计划拜访点数:<span class="colorbalck">{{ reportTargetAll.coverStoreNum }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitMonthRate }}%</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        整体拜访数:<span class="colorbalck">{{ reportTargetAll.allVisitNum }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        整体拜访率:<span class="colorbalck">{{ reportTargetAll.allVisitMonthRate }}%</span>
+      </p></van-col
+    >
+    <!--            <van-col v-if="powerGrade==2&&!JZQuota&&!GZdata" span="24"><p>未分配点数:<span-->
+    <!--                class="colorbalck">{{ reportTargetAll.undistrNum }}</span></p></van-col>-->
+    <!--            <van-col v-if="powerGrade==2&&!JZQuota&&!GZdata" span="24"><p>已覆盖未排线点数:<span-->
+    <!--                class="colorbalck">{{ reportTargetAll.coverNotPlan }}</span></p></van-col>-->
+    <!--            <van-col span="24" v-if="powerGrade==2"><p>未挂接销售门店数:<span class="colorbalck">{{reportTargetAll.customerYearTarget}}%</span></p></van-col>-->
+    <!--            <van-col span="24" v-if="powerGrade==2"><p>已挂接销售,但不在拜访计划中的门店数量:<span class="colorbalck">{{reportTargetAll.customerYearTarget}}%</span></p></van-col>-->
+  </van-row>
+  <!-- 其他 -->
+  <van-row v-else>
+    <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.controlledShopVisitDayNum) }}</span>
+      </p>
+    </van-col>
+    <van-col span="12">
+      <p>
+        <span style="font-weight: 600">本月</span>可控店:
+        <span class="colorbalck">{{
+          Micrometer(reportTargetAll.controlledShopVisitMonthNum)
+        }}</span>
+        <span class="colorbalck">({{ reportTargetAll.controlledShopVisitMonthRate }}%)</span>
+      </p>
+    </van-col>
+    <van-col span="12"
+      ><p>
+        分销店:<span class="colorbalck">{{ Micrometer(reportTargetAll.fxShopVisitDayNum) }}</span>
+      </p></van-col
+    >
+    <van-col span="12"
+      ><p>
+        <span style="font-weight: 600">本月</span>分销店:
+        <span class="colorbalck">{{ Micrometer(reportTargetAll.fxShopVisitMonthNum) }}</span>
+        <span class="colorbalck"> ({{ reportTargetAll.fxShopVisitMonthRate }}%) </span>
+      </p>
+    </van-col>
+    <div class="colBack">
+      <div class="backLeft back"></div>
+      <div class="backRight back"></div>
+      <van-col span="12">
+        <p>
+          金牌店:
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.jpShopVisitDayNum) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span style="font-weight: 600">本月</span>金牌店:
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.jpShopVisitMonthNum) }}</span>
+          <span class="colorbalck"> ({{ reportTargetAll.jpShopVisitMonthRate }}%) </span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          同A店:
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcAShopVisitDayNum) }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span style="font-weight: 600">近2月</span>同A店:
+          <span class="colorbalck">{{ Micrometer(reportTargetAll.tcAShopVisitMonthNum) }}</span>
+          <span class="colorbalck"> ({{ reportTargetAll.tcAShopVisitMonthRate }}%) </span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          同B店:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcBShopVisitDayNum)
+          }}</span>
+        </p>
+      </van-col>
+      <van-col span="12">
+        <p>
+          <span style="font-weight: 600">近3月</span>同B店:<span class="colorbalck">{{
+            Micrometer(reportTargetAll.tcBShopVisitMonthNum)
+          }}</span>
+          <span class="colorbalck"> ({{ reportTargetAll.tcBShopVisitMonthRate }}%) </span>
+        </p>
+      </van-col>
+    </div>
+  </van-row>
+</template>
+<script>
+export default {
+  props: {
+    reportTargetAll: {
+      type: Object,
+    },
+    powerGrade: {
+      type: [Number, String],
+    },
+    JZQuota: {
+      type: Boolean,
+    },
+    GZdata: {
+      type: Boolean,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+<style scoped>
+@import './index.css';
+</style>

+ 8 - 4
src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -262,7 +262,9 @@ export default {
                   message: '拜访中任务结束成功!',
                 })
                 .then(() => {
-                  window.location.replace(window.location.origin + '/mobile/outsidelist/index');
+                  // this.$router.replace({});
+                  this.onClickLeft();
+                  // window.location.replace(window.location.origin + '/mobile/outsidelist/index');
                 });
             } else {
               this.$dialog.alert({
@@ -464,6 +466,7 @@ export default {
             message: '加载中...',
             forbidClick: true,
           });
+          debugger;
           getStoreGroupTask(params).then((res) => {
             loading2.clear();
             if (res.code == 200) {
@@ -625,9 +628,10 @@ export default {
               if (this.$route.query.urltype == 1) {
                 window.location.replace(window.location.origin + '/mobile/home');
               } else {
-                window.location.replace(
-                  window.location.origin + '/mobile/outsidelist/index?info=y'
-                );
+                this.onClickLeft();
+                // window.location.replace(
+                //   window.location.origin + '/mobile/outsidelist/index?info=y'
+                // );
               }
             }
           } else {

+ 2 - 1
src/views/deviceWithin/storeVisit.vue

@@ -737,7 +737,8 @@ export default {
               if (this.$route.query.urltype == 2) {
                 window.location.replace(window.location.origin + '/mobile/home');
               } else {
-                window.location.replace(window.location.origin + '/mobile/deviceWithin/index');
+                this.$router.go(-1);
+                // window.location.replace(window.location.origin + '/mobile/deviceWithin/index');
               }
             } else {
               this.$toast({

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1239 - 0
src/views/home/ABtarget.vue


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

@@ -0,0 +1,181 @@
+<template>
+  <div class="bottomBtn">
+    <div style="color: #999; font-size: 12px; margin: 0 10px">
+      <!--      昨日新增的数据统一在上午9点更新.-->
+      <span v-if="reportInfoData.newUser"
+        ><van-icon name="info-o" />&nbsp;新人入职后5个工作日不用提交日报.</span
+      >
+    </div>
+    <div class="lineGrey"></div>
+    <div v-if="approvalButton && !GZdata" class="contentborder">
+      <van-cell class="homeTitle" title="汇报审批" to="/dailyApprovalList">
+        <template #title>
+          <span class="custom-title">汇报审批&nbsp;&nbsp;</span>
+          <van-tag v-if="approvalPendingNum > 0" type="danger">{{ approvalPendingNum }}</van-tag>
+        </template>
+        <template #right-icon>
+          <van-icon class="homeCellIcon" name="arrow" size="16" />
+        </template>
+      </van-cell>
+      <div class="lineGrey"></div>
+    </div>
+    <!-- <div  class="contentborder"  v-if="todayGoal.storeAddressCheckNum>0">
+      <van-cell class="homeTitle" title="待规范门店地址" to="/storeAddress">
+        <template #title><span class="custom-title">待规范门店地址</span>&nbsp<van-tag type="danger">{{ todayGoal.storeAddressCheckNum }}</van-tag></template>
+        <template #right-icon><van-icon class="homeCellIcon" name="arrow" size="16"/></template>
+      </van-cell>
+      <div class="lineGrey"></div>
+    </div> -->
+    <div class="contentborder">
+      <van-cell class="homeTitle" title="流程审批" to="/signApprovalList">
+        <template #title
+          ><span class="custom-title">流程审批</span>&nbsp<van-tag
+            v-if="proccessPendingNum > 0"
+            type="danger"
+            >{{ proccessPendingNum }}</van-tag
+          ></template
+        >
+        <template #right-icon><van-icon class="homeCellIcon" name="arrow" size="16" /></template>
+      </van-cell>
+      <div class="lineGrey"></div>
+    </div>
+    <!-- 同城店建店审批 -->
+    <div
+      class="contentborder"
+      v-if="reportInfoData.storeApprovalNum != null && reportInfoData.storeApprovalNum > 0">
+      <van-cell class="homeTitle" title="同城店建店审批" to="/newStoreApprovalList">
+        <template #title>
+          <span class="custom-title">同城店建店审批&nbsp;&nbsp;</span>
+          <van-tag type="danger">{{ reportInfoData.storeApprovalNum }}</van-tag>
+        </template>
+        <template #right-icon>
+          <van-icon class="homeCellIcon" name="arrow" size="16" />
+        </template>
+      </van-cell>
+      <div class="lineGrey"></div>
+    </div>
+    <div class="contentborder">
+      <van-button
+        v-if="powerGrade == 3 && showButton"
+        class="Btn1"
+        plain
+        size="small"
+        type="info"
+        @click="doubleWeeklyLink"
+        >填写半月报</van-button
+      >
+      <van-button
+        v-if="powerGrade == 2 && showButton"
+        class="Btn1"
+        plain
+        size="small"
+        type="info"
+        @click="weeklyLink"
+        >填写周报</van-button
+      >
+      <van-button
+        v-if="powerGrade == 1 && showButton"
+        class="Btn1"
+        plain
+        size="small"
+        type="info"
+        @click="dailyLink"
+        >填写日报</van-button
+      >
+      <van-button
+        v-if="powerGrade < 4 && isCommit"
+        class="Btn1"
+        plain
+        size="small"
+        type="info"
+        @click="dailyLinks"
+        >查看我的历史汇报</van-button
+      >
+    </div>
+    <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p>
+  </div>
+</template>
+<script>
+import { getReportInfo } from '@/api/index';
+export default {
+  props: {
+    tabVal: {
+      type: [String, Number],
+      default: '-1',
+    },
+  },
+  data() {
+    return {
+      reportInfoData: {},
+      approvalButton: false,
+      JZQuota: false,
+      GZdata: false,
+      approvalPendingNum: 0,
+      proccessPendingNum: 0,
+      powerGrade: '2',
+      showButton: false,
+      isCommit: null,
+      updataTime: '',
+      type: '-1',
+    };
+  },
+  activated() {
+    this.getReportInfo();
+  },
+  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') {
+            this.GZdata = true;
+          } else {
+            this.GZdata = false;
+          }
+          if (res.data.postType == 'JZ') {
+            this.JZQuota = true;
+          } else {
+            this.JZQuota = false;
+          }
+          //   loading1.clear();
+          localStorage.setItem('powerGrade', res.data.positionId);
+          localStorage.setItem('isDiy', res.data.diy);
+          localStorage.setItem('uType', res.data.userType);
+          localStorage.setItem('jzType', res.data.jzType);
+          localStorage.setItem('customerVisits', res.data.customerManagerVisits);
+          localStorage.setItem('postType', res.data.postType);
+          this.proccessPendingNum = res.data.proccessPendingNum;
+          this.reportInfoData = res.data;
+          this.approvalButton = res.data.approvalButton;
+          this.powerGrade = res.data.positionId;
+          this.showButton = res.data.showButton;
+          if (res.data.reportTargetAll != null) {
+            this.updataTime = res.data.reportTargetAll.updateTime;
+          }
+          this.approvalPendingNum = res.data.approvalPendingNum;
+          this.type = res.data.userType;
+        } else {
+          this.$toast(res.msg);
+        }
+      });
+    },
+    dailyLink() {
+      this.$router.push('/daily');
+    },
+    weeklyLink() {
+      this.$router.push('/weekly');
+    },
+    doubleWeeklyLink() {
+      this.$router.push('/doubleWeekly');
+    },
+    dailyLinks() {
+      this.$router.push('/myHistoricalDaily');
+    },
+  },
+};
+</script>
+<style scoped lang="scss"></style>

+ 562 - 0
src/views/home/hintTabPage/hintDetail.vue

@@ -0,0 +1,562 @@
+<template>
+  <div class="hintDetail">
+    <div class="header">
+      <van-nav-bar class="navBar" title="门店拜访" left-arrow @click-left="onClickLeft" />
+    </div>
+    <div class="tabBox">
+      <van-tabs class="myTab" v-model="activeTabName" color="#0057ba" @change="tabChange">
+        <van-tab
+          v-for="(item, index) in tabsItem"
+          :title="item.title"
+          :name="item.name"
+          :key="index"></van-tab>
+      </van-tabs>
+      <van-tabs
+        class="myTab"
+        v-model="activaPantoneName"
+        color="#0057ba"
+        @change="tabChangePantone"
+        v-if="activeTabName == 'pantone'">
+        <van-tab
+          v-for="(val, key, index) in tabsItemPantone"
+          :key="index"
+          :title="key"
+          :name="key"></van-tab>
+      </van-tabs>
+    </div>
+    <div class="content">
+      <el-table
+        v-if="fromType"
+        :data="tableList"
+        :load="load"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        border
+        class="elTreeTable"
+        lazy
+        :row-key="rowKey"
+        :key="toggleIndex">
+        <el-table-column
+          class="firstName"
+          :label="firstLabel"
+          :prop="firstProp"
+          align="center"
+          width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row[firstProp] }}</span>
+            <!-- <span v-if="scope.row.reportType != 1">{{ scope.row.deptName }}</span> -->
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="item.label"
+          width="46"
+          align="center"
+          v-for="(item, index) in tableColumn"
+          :key="index"
+          v-if="tableColumn.length">
+          <el-table-column
+            :label="val.label"
+            :prop="val.prop"
+            width="46"
+            align="center"
+            v-if="item.childredColumn"
+            v-for="(val, ind) in item.childredColumn"
+            :key="ind">
+          </el-table-column>
+        </el-table-column>
+      </el-table>
+      <div class="mask" v-if="maskShow"><van-loading type="spinner" color="#1989fa" /></div>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  selectNoVisitsInfo,
+  selectPendingCasesInfo,
+  getReportMaterialType,
+  getReportMaterial,
+} from '@/api/index';
+import { mapState } from 'vuex';
+export default {
+  name: 'hintDetail',
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+    }),
+  },
+  data() {
+    return {
+      empLevel: '',
+      deptId: null,
+      fromType: null,
+      activeTabName: 'noVisit',
+      activaPantoneName: '',
+      tabsItem: [
+        {
+          title: '未拜访',
+          name: 'noVisit',
+        },
+        {
+          title: '建店',
+          name: 'createStore',
+        },
+        // {
+        //   title: '色卡',
+        //   name: 'pantone',
+        // },
+      ],
+      activePantoneTabName: '', //色卡tabName
+      tabsItemPantone: {}, //色卡tabItem
+      toggleIndex: 0,
+      firstLabel: '',
+      firstProp: '',
+      tableColumn: [],
+      tableList: [],
+      // 未拜访
+      noVisit: [
+        {
+          label: '可控店',
+          childredColumn: [
+            {
+              label: '(当月)',
+              prop: 'keKongNotVisited',
+            },
+          ],
+        },
+        {
+          label: '金牌店',
+          childredColumn: [
+            {
+              label: '(当月)',
+              prop: 'jinPaiNotVisited',
+            },
+          ],
+        },
+        {
+          label: '同A店',
+          childredColumn: [
+            {
+              label: '(近2月)',
+              prop: 'tongANotVisited',
+            },
+          ],
+        },
+        {
+          label: '同B店',
+          childredColumn: [
+            {
+              label: '(近3月)',
+              prop: 'tongBNotVisited',
+            },
+          ],
+        },
+      ],
+      // 建店
+      createStore: [
+        {
+          label: '可控店',
+          childredColumn: [
+            {
+              label: '(45天未结案)',
+              prop: 'keKongAbnormalNum',
+            },
+          ],
+        },
+        {
+          label: '金牌店',
+          childredColumn: [
+            {
+              label: '(7天未完工)',
+              prop: 'jinPaiUnfinishedNum',
+            },
+            {
+              label: '(30天未结案)',
+              prop: 'jinPaiAbnormalNum',
+            },
+          ],
+        },
+        {
+          label: '同A店',
+          childredColumn: [
+            {
+              label: '(30天未结案)',
+              prop: 'tongAAbnormalNum',
+            },
+          ],
+        },
+        {
+          label: '同B店',
+          childredColumn: [
+            {
+              label: '(30天未结案)',
+              prop: 'tongBAbnormalNum',
+            },
+          ],
+        },
+      ],
+      // 色卡
+      pantone: [
+        {
+          label: '直发销售部',
+          childredColumn: [
+            {
+              label: '(本)',
+              prop: 'zfxsbNum',
+            },
+          ],
+        },
+        {
+          label: '已领用',
+          childredColumn: [
+            {
+              label: '(本)',
+              prop: 'ywyylyNum',
+            },
+          ],
+        },
+        {
+          label: '门店发放',
+          childredColumn: [
+            {
+              label: '(本)',
+              prop: 'ywyyffNum',
+            },
+          ],
+        },
+        {
+          label: '门店未签收',
+          childredColumn: [
+            {
+              label: '(本)',
+              prop: 'mdwqsNum',
+            },
+          ],
+        },
+        {
+          label: '未签收门店',
+          childredColumn: [
+            {
+              label: '(家)',
+              prop: 'wqsmdNum',
+            },
+          ],
+        },
+      ],
+      materialCode: null, //色卡物料来源
+      maskShow: true,
+    };
+  },
+  watch: {
+    // 监听tab切换的状态
+    fromType: {
+      handler(newVal) {
+        this.tableColumn = this[newVal]; //表格头
+        this.activeTabName = newVal; // 当前激活tab
+      },
+      immediate: true,
+    },
+    // 初始化监听fromType,不同类型显示不同的tabItem
+    '$route.query.fromType': {
+      handler(newVal) {
+        if (newVal) this.setTabsItem();
+      },
+      immediate: true,
+    },
+  },
+  activated() {
+    this.empLevel = this.userInfo.empLevel;
+    this.firstLabel = this.empLevel == '1' ? '组织名称/大区主管' : '组织名称/销售部主管';
+    this.fromType = this.$route.query.fromType; // fromType: 'noVisit':未拜访; 'createStore':建店; 'pantone':色卡
+    this.deptId = this.userInfo.deptId; // 当前用户部门id
+    this.activaPantoneName = this.$route.query.pantoneName; //当前色卡
+    this.materialCode = this.$route.query.materialCode; // 色卡code
+    this.initData();
+  },
+  methods: {
+    rowKey(row) {
+      return this.fromType == 'pantone' ? row['id'] : row['onlyId'];
+    },
+    setTabsItem() {
+      this.tabsItem = [
+        {
+          title: '未拜访',
+          name: 'noVisit',
+        },
+        {
+          title: '建店',
+          name: 'createStore',
+        },
+      ];
+      // 2销售部主管显示色卡
+      if (this.userInfo.empLevel == '2') {
+        this.tabsItem.push({
+          title: '色卡',
+          name: 'pantone',
+        });
+      }
+    },
+    /**
+     * 初始化数据和搜索操作接口的入口
+     * @param {*function} resolve //子级数据数据回调
+     * @param {*object} tree //展开时当前节点数据
+     * */
+    initData(resolve, tree) {
+      // 请求子级数据时不需要loading
+      if (!resolve && !tree) {
+        this.toggleIndex = this.toggleIndex++;
+        this.maskShow = true;
+      }
+      if (this.fromType == 'noVisit') {
+        // 未拜访
+        this.deptId = tree ? tree.onlyId : this.userInfo.deptId;
+        this.firstProp = 'onlyName';
+        this.selectNoVisitsInfoFun(resolve);
+      } else if (this.fromType == 'createStore') {
+        // 建店
+        this.deptId = tree ? tree.onlyId : this.userInfo.deptId;
+        this.firstProp = 'onlyName';
+        this.selectPendingCasesInfoFun(resolve);
+      } else if (this.fromType == 'pantone') {
+        // 色卡
+        this.firstProp = 'warehouseName';
+        let empLevel = tree ? tree.empLevel : null;
+        this.getPantoneData(resolve, empLevel);
+      }
+    },
+    tabChange(val) {
+      this.tableList = []; // 清楚tab数
+      this.tabsItemPantone = {}; // 清楚色卡tab数据
+      this.fromType = val;
+      this.initData();
+    },
+    tabChangePantone(val) {
+      this.tableList = [];
+      this.materialCode = this.tabsItemPantone[val].materialCode;
+      this.initData();
+    },
+    onClickLeft() {
+      this.$router.go(-1);
+    },
+    linKReportHistory(row, type) {},
+    // 加载子节点数据的函数
+    load(tree, treeNode, resolve) {
+      this.initData(resolve, tree);
+    },
+    // 未拜访
+    selectNoVisitsInfoFun(resolve) {
+      selectNoVisitsInfo({ deptId: this.deptId }).then((res) => {
+        if (res.code == 200) {
+          res.data.forEach((val) => {
+            if (val.empLevel < 3) val.hasChildren = true;
+          });
+          // 是否是子级
+          if (resolve) {
+            resolve && resolve(res.data);
+          } else {
+            this.maskShow = false;
+            this.tableList = res.data;
+          }
+        } else {
+          this.maskShow = false;
+          this.Toast({
+            message: res.msg,
+            duration: 5000,
+          });
+        }
+      });
+    },
+    // 建店
+    selectPendingCasesInfoFun(resolve) {
+      selectPendingCasesInfo({ deptId: this.deptId }).then((res) => {
+        if (res.code == 200) {
+          res.data.forEach((val) => {
+            if (val.empLevel < 3) val.hasChildren = true;
+          });
+          // 是否是子级
+          if (resolve) {
+            resolve && resolve(res.data);
+          } else {
+            this.maskShow = false;
+            this.tableList = res.data;
+          }
+        } else {
+          this.maskShow = false;
+          this.Toast({
+            message: res.msg,
+            duration: 5000,
+          });
+        }
+      });
+    },
+    // 色卡tab
+    getPantoneData(resolve, empLevel) {
+      if (JSON.stringify(this.tabsItemPantone) != '{}') {
+        // this.tabsItemPantone != {} 不是初次获取tab数据不需要在赋值
+        this.getReportMaterialTypeFun(resolve, empLevel);
+      } else {
+        getReportMaterial().then((res) => {
+          this.tabsItemPantone = res.data;
+          delete this.tabsItemPantone.tip;
+          // 初次获取tab数据延迟等待this.activaPantoneName当前激活tab赋值成功,获取其物料code
+          this.$nextTick(() => {
+            this.materialCode = this.materialCode
+              ? this.materialCode
+              : this.tabsItemPantone[this.activaPantoneName].materialCode;
+            this.getReportMaterialTypeFun(null, null);
+          });
+        });
+      }
+    },
+    // 色卡详情
+    getReportMaterialTypeFun(resolve, empLevel) {
+      // empLevel 第一次传 null
+      getReportMaterialType({ materialCode: this.materialCode, empLevel: empLevel }).then((res) => {
+        if (res.code == 200) {
+          res.data.colorCardList.forEach((val) => {
+            if (val.empLevel < 3) val.hasChildren = true;
+          });
+          // 是否是子级
+          if (resolve) {
+            resolve && resolve(res.data.colorCardList);
+          } else {
+            this.maskShow = false;
+            this.tableList = res.data.colorCardList;
+          }
+        } else {
+          this.maskShow = false;
+          this.Toast({
+            message: res.msg,
+            duration: 5000,
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.hintDetail {
+  .tabBox {
+    position: sticky;
+    top: 0px;
+    z-index: 10;
+  }
+}
+</style>
+<style lang="scss">
+#app {
+  width: 100%;
+  height: 100%;
+  .bgcolor {
+    width: 100%;
+    height: 100%;
+    .hintDetail {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      .content {
+        flex: 1;
+        overflow: hidden;
+        padding-bottom: 20px;
+        background: #fff;
+        position: relative;
+        .el-table {
+          overflow: hidden;
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          .el-table__body-wrapper {
+            overflow: auto;
+            flex: 1;
+          }
+        }
+        .mask {
+          position: absolute;
+          width: 100%;
+          height: 100%;
+          top: 0;
+          background: rgba(255, 255, 255, 0.8);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+}
+.hintDetail {
+  .el-table__head .el-table__body {
+    overflow: hidden;
+    width: 99.9% !important;
+  }
+  .elTreeTable table {
+    width: 99.9% !important;
+  }
+  .el-table__body {
+    width: 99.9% !important;
+  }
+  .el-table__empty-block {
+    width: 99.9% !important;
+  }
+  .elTreeTable .el-table__cell:first-child .cell {
+    padding-left: 2px !important;
+  }
+
+  .elTreeTable .el-table__cell {
+    padding: 0px;
+  }
+
+  .elTreeTable .el-table__body td.el-table__cell {
+    padding: 2px;
+  }
+
+  .elTreeTable table col {
+    text-align: center;
+  }
+
+  .elTreeTable th.el-table__cell > .cell {
+    padding: 1px !important;
+  }
+
+  .elTreeTable {
+    font-size: 12px !important;
+  }
+
+  .elTreeTable th.el-table__cell {
+    padding: 1px !important;
+  }
+
+  .elTreeTable th.el-table__cell > .cell {
+    text-align: center;
+  }
+
+  .elTreeTable .el-table__header tr:first-child th.el-table__cell:first-child .cell {
+    /* width: 98px; */
+  }
+
+  .elTreeTable .linkSpan {
+    text-decoration: underline;
+    color: #0057ba;
+    display: block;
+    text-align: right;
+    padding: 6px 10px;
+  }
+
+  .elTreeTable td.el-table__cell div {
+    padding: 0px;
+  }
+
+  .elTreeTable .cell .spanNum {
+    display: block;
+    text-align: right;
+    padding: 6px 10px;
+  }
+
+  .elTreeTable .el-table__expand-icon {
+    float: right;
+    .el-icon-arrow-right {
+      vertical-align: -2px;
+    }
+  }
+}
+</style>

+ 639 - 0
src/views/home/hintTabPage/index.vue

@@ -0,0 +1,639 @@
+<template>
+  <div class="hintTabPage">
+    <div class="itemTab">
+      <van-collapse v-model="activeNames">
+        <!-- 拜访(实时) -->
+        <van-collapse-item :name="visitCollapse.name">
+          <span class="updateTime">更新时间:{{ visitCollapse.latestUpdateTime }}</span>
+          <template #title>
+            <div class="itemHeader">
+              <span class="itemTitle">{{ visitCollapse.title }}</span>
+              <span @click.stop>
+                <el-popover placement="right" trigger="click" popper-class="hintPopover">
+                  <div
+                    class="popoverConten"
+                    v-for="(item, index) in visitCollapse.tipsPopoverlabel"
+                    :key="index">
+                    {{ item }}
+                  </div>
+                  <div slot="reference" class="hintIconBox">
+                    <img class="hintIcon" :src="hintIcon" />
+                  </div>
+                </el-popover>
+              </span>
+            </div>
+          </template>
+          <visitPage
+            fromType="noVisit"
+            :empLevel="empLevel"
+            :contentData="visitCollapse.contentData"
+            :maskShow="visitCollapse.collapseLosding"
+            :resData="visitCollapse.resData"></visitPage>
+        </van-collapse-item>
+        <!-- 建店 -->
+        <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">
+                <div
+                  class="popoverConten"
+                  v-for="(item, index) in createStore.tipsPopoverlabel"
+                  :key="index">
+                  {{ item }}
+                </div>
+                <div slot="reference" class="hintIconBox">
+                  <img class="hintIcon" :src="hintIcon" />
+                </div>
+              </el-popover>
+            </div>
+          </template>
+          <visitPage
+            fromType="createStore"
+            :empLevel="empLevel"
+            :contentData="createStore.contentData"
+            :maskShow="createStore.collapseLosding"
+            :resData="createStore.resData"></visitPage>
+        </van-collapse-item>
+        <!-- 日报、周报、半月报 -->
+        <van-collapse-item name="3" v-if="empLevel != '4'">
+          <template #title>
+            <div class="itemHeader" @click.stop>
+              <span class="itemTitle">{{ report.title }}</span>
+              <el-popover placement="right" trigger="click" popper-class="hintPopover">
+                <div class="popoverConten">
+                  {{ report.reportData.tip }}
+                </div>
+                <div slot="reference" class="hintIconBox">
+                  <img class="hintIcon" :src="hintIcon" />
+                </div>
+              </el-popover>
+            </div>
+          </template>
+          <div class="reportContent">
+            <div class="reportItem">
+              <div class="label">填写率:</div>
+              <div class="value">本月{{ report.reportData.fillingRate }}</div>
+              <div class="itemDetail" v-if="empLevel != '3'" @click="reportClick('fillingRate')">
+                下属详情
+              </div>
+            </div>
+            <div class="reportItem" v-show="empLevel != '3'">
+              <div class="label">审批率:</div>
+              <div class="value">本月{{ report.reportData.approvalRate }}</div>
+            </div>
+            <div class="reportItem" v-show="empLevel == '1'">
+              <div class="label">
+                本周点评业务员日报数(目标数):{{ report.reportData.commentNum }}个(5个)
+              </div>
+            </div>
+            <div class="reportItem reportNum" v-show="empLevel == '1'">
+              <div class="label"></div>
+              <div class="itemDetail" @click="reportClick('commentNum')">进入点评</div>
+            </div>
+            <div class="mask" v-if="report.reportLosding">
+              <van-loading type="spinner" color="#1989fa" />
+            </div>
+          </div>
+        </van-collapse-item>
+        <!-- 色卡 销售员和销售部主管显示-->
+        <van-collapse-item name="4" v-if="empLevel == '2' || empLevel == '3'">
+          <template #title>
+            <div class="itemHeader" @click.stop>
+              <span class="itemTitle">{{ pantone.title }}</span>
+              <el-popover placement="right" trigger="click" popper-class="hintPopover">
+                <div class="popoverConten">
+                  {{ pantone.tip }}
+                </div>
+                <div slot="reference" class="hintIconBox">
+                  <img class="hintIcon" :src="hintIcon" />
+                </div>
+              </el-popover>
+            </div>
+          </template>
+          <div class="pantoneContent">
+            <template v-if="empLevel == '3'">
+              <div v-for="(val, key, index) in pantone.pantoneData" :key="index">
+                <div class="title">{{ key }}</div>
+                <div class="pantoneItem">
+                  <div class="firstItem item">
+                    <div class="left">
+                      <div class="lebel">已领用:</div>
+                      <div class="value">{{ val.ywyylyNum }}本</div>
+                    </div>
+                    <div class="right">
+                      <div class="lebel">已发放门店:</div>
+                      <div class="value">{{ val.ywyyffNum }}本</div>
+                    </div>
+                  </div>
+                  <div class="secondItem item">
+                    <div class="left">
+                      <div class="lebel">门店未签收:</div>
+                      <div class="value">{{ val.mdwqsNum }}本</div>
+                    </div>
+                    <div class="right">
+                      <div class="lebel">门店未签收:</div>
+                      <div class="value valueIsClick" @click="pantoneClick(val, key)">
+                        {{ val.wqsmdNum }}家
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </template>
+            <template v-if="empLevel == '2'">
+              <div v-for="(val, key, index) in pantone.pantoneData" :key="index">
+                <div class="title">{{ key }}</div>
+                <div class="pantoneItem">
+                  <div class="firstItem item">
+                    <div class="left">
+                      <div class="lebel">直发销售部数:</div>
+                      <div class="value">{{ val.zfxsbNum }}本</div>
+                    </div>
+                    <div class="right">
+                      <div class="lebel">业务员已领用:</div>
+                      <div class="value">{{ val.ywyylyNum }}本</div>
+                    </div>
+                  </div>
+                  <div class="secondItem item">
+                    <div class="left">
+                      <div class="lebel">业务员已发放:</div>
+                      <div class="value">{{ val.ywyyffNum }}本</div>
+                    </div>
+                    <div class="right">
+                      <div class="lebel">门店未签收:</div>
+                      <div class="value valueIsClick" @click="pantoneClick(val, key)">
+                        {{ val.mdwqsNum }}本
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </template>
+            <div class="mask" v-if="pantone.pantoneLosding">
+              <van-loading type="spinner" color="#1989fa" />
+            </div>
+          </div>
+        </van-collapse-item>
+      </van-collapse>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  selectVisitsRealTime,
+  selectBuildingStore,
+  getReportTarget,
+  getReportMaterial,
+} from '@/api/index';
+import hintIcon from '@/assets/hintIcon.png';
+import visitPage from './visitPage.vue';
+import { mapState } from 'vuex';
+export default {
+  name: 'hintTabPage',
+  components: { visitPage },
+  computed: {
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+    }),
+  },
+  props: {
+    tabVal: {
+      type: [String, Number],
+      default: '-1',
+    },
+  },
+  data() {
+    return {
+      empLevel: '', //员工级别,1大区主管2销售部主管3业务员4其他 ***其他级别4,不显示日报、周报、半月报和色卡
+      hintIcon: hintIcon,
+      activeNames: ['1', '2', '3', '4', '5'],
+      visitCollapse: {
+        name: '1',
+        title: '拜访(实时)',
+        collapseLosding: true,
+        latestUpdateTime: '',
+        tipsPopoverlabel: [],
+        tipsPopoverValue: null,
+        contentData: [
+          {
+            title: '可控店',
+            titleProp: 'keKong',
+            bagColor: '#eb6877',
+            visitDetail: [
+              {
+                leftTable: '本月拜访率:',
+                leftProp: 'visitRateThisMonth',
+                leftUnit: '%',
+                leftIsClick: false,
+                rightTable: '未拜访:',
+                rightProp: 'notVisited',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+          {
+            title: '金牌店',
+            titleProp: 'jinPai',
+            bagColor: '#f1b789',
+            visitDetail: [
+              {
+                leftTable: '本月拜访率:',
+                leftProp: 'visitRateThisMonth',
+                leftUnit: '%',
+                leftIsClick: false,
+                rightTable: '未拜访:',
+                rightProp: 'notVisited',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+          {
+            title: '同A店',
+            titleProp: 'tongA',
+            bagColor: '#88abda',
+            visitDetail: [
+              {
+                leftTable: '近2个月拜访率:',
+                leftProp: 'visitRateInThePastTwoMonths',
+                leftUnit: '%',
+                leftIsClick: false,
+                rightTable: '未拜访:',
+                rightProp: 'notVisited',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+          {
+            title: '同B店',
+            titleProp: 'tongB',
+            bagColor: '#8f82bc',
+            visitDetail: [
+              {
+                leftTable: '近3个月拜访率:',
+                leftProp: 'visitRateInThePastThreeMonths',
+                leftUnit: '%',
+                leftIsClick: false,
+                rightTable: '未拜访:',
+                rightProp: 'notVisited',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+        ],
+        resData: null,
+      },
+      createStore: {
+        name: '2',
+        title: '建店',
+        collapseLosding: true,
+        tipsPopoverlabel: [
+          {
+            label: '未完工',
+            prop: '',
+          },
+          {
+            label: '为结案',
+            prop: '',
+          },
+        ],
+        tipsPopoverValue: null,
+        contentData: [
+          {
+            title: '可控店',
+            titleProp: 'keKong',
+            bagColor: '#eb6877',
+            visitDetail: [
+              {
+                leftTable: '本月累计:',
+                leftProp: 'month',
+                leftUnit: '家',
+                leftIsClick: false,
+              },
+              {
+                leftTable: '今年累计:',
+                leftProp: 'year',
+                leftUnit: '家',
+                leftIsClick: false,
+                rightTable: '45天未结案:',
+                rightProp: 'keKongAbnormalNum',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+          {
+            title: '金牌店',
+            titleProp: 'jinPai',
+            bagColor: '#f1b789',
+            visitDetail: [
+              {
+                leftTable: '本月累计:',
+                leftProp: 'month',
+                leftUnit: '家',
+                leftIsClick: false,
+                rightTable: '7天未完工:',
+                rightProp: 'jinPaiUnfinishedNum',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+              {
+                leftTable: '今年累计:',
+                leftProp: 'year',
+                leftUnit: '家',
+                leftIsClick: false,
+                rightTable: '30天未结案:',
+                rightProp: 'jinPaiAbnormalNum',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+          {
+            title: '同A店',
+            titleProp: 'tongA',
+            bagColor: '#88abda',
+            visitDetail: [
+              {
+                leftTable: '本月累计:',
+                leftProp: 'month',
+                leftUnit: '家',
+                leftIsClick: false,
+              },
+              {
+                leftTable: '今年累计:',
+                leftProp: 'year',
+                leftUnit: '家',
+                leftIsClick: false,
+                rightTable: '30天未结案:',
+                rightProp: 'tongAAbnormalNum',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+          {
+            title: '同B店',
+            titleProp: 'tongB',
+            bagColor: '#8f82bc',
+            visitDetail: [
+              {
+                leftTable: '本月累计:',
+                leftProp: 'month',
+                leftUnit: '家',
+                leftIsClick: false,
+              },
+              {
+                leftTable: '今年累计:',
+                leftProp: 'year',
+                leftUnit: '家',
+                leftIsClick: false,
+                rightTable: '30天未结案:',
+                rightProp: 'tongBAbnormalNum',
+                rightUnit: '家',
+                rightIsClick: true,
+              },
+            ],
+          },
+        ],
+        resData: null,
+      },
+      report: {
+        title: '',
+        reportLosding: true,
+        reportData: {},
+      },
+      pantone: {
+        title: '色卡',
+        tip: '',
+        pantoneLosding: true,
+        pantoneData: {},
+      },
+    };
+  },
+  watch: {
+    tabVal: {
+      handler(val) {
+        if (val == -1) {
+          this.initData();
+        }
+      },
+      immediate: true,
+    },
+  },
+  activated() {},
+  methods: {
+    initData() {
+      if (!this.userInfo) return;
+      this.empLevel = this.userInfo.empLevel;
+      // 获取拜访数据
+      this.getVisitCollapseData();
+      // 获取建店数据
+      this.getSelectBuildingStore();
+      // 获取汇报数据 日报、周报、半月报
+      this.getReportData();
+      // 获取色卡数据
+      this.getPantoneData();
+    },
+    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;
+      });
+    },
+    getSelectBuildingStore() {
+      this.createStore.collapseLosding = true;
+      selectBuildingStore().then((res) => {
+        this.createStore.resData = res.data;
+        this.createStore.tipsPopoverlabel = res.data.reminderContent;
+        this.createStore.collapseLosding = false;
+      });
+    },
+    getReportData() {
+      if (this.empLevel == '1') {
+        this.report.title = '半月报';
+      } else if (this.empLevel == '2') {
+        this.report.title = '周报';
+      } else if (this.empLevel == '3') {
+        this.report.title = '日报';
+      }
+      this.report.reportLosding = true;
+      getReportTarget().then((res) => {
+        this.report.reportLosding = false;
+        this.report.reportData = res.data || {};
+      });
+    },
+    getPantoneData() {
+      if (this.empLevel == 2 || this.empLevel == 3) {
+        this.pantone.pantoneLosding = true;
+        getReportMaterial().then((res) => {
+          this.pantone.pantoneLosding = false;
+          this.pantone.tip = res.data.tip;
+          this.pantone.pantoneData = res.data;
+          delete this.pantone.pantoneData.tip;
+        });
+      }
+    },
+    // 汇报下属详情-点击
+    reportClick(type) {
+      if (type == 'fillingRate') {
+        // 下属汇报率审批率统计
+        this.$router.push({ path: 'reportingRate' });
+      } else if (type == 'commentNum') {
+        // 下属业务员历史日报
+        this.$router.push({ path: 'subordinateHistoricalDaily' });
+      }
+    },
+    // 色卡查看详情
+    pantoneClick(val, key) {
+      // 业务员进入未拜访列表
+      if (this.empLevel == '3') {
+        this.$router.push({ path: '/pantoneNoGet', query: { storeId: val.storeId } });
+      } else if (this.empLevel == '2') {
+        // 销售部主管
+        this.$router.push({
+          path: '/hintDetail',
+          query: { fromType: 'pantone', materialCode: val.materialCode, pantoneName: key }, // materialCode物料来源
+        });
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.hintTabPage {
+  padding: 6px;
+  /* padding: 10px; */
+  .itemTab {
+    /* background: #fff; */
+    padding: 8px;
+    /* padding: 10px; */
+    /* margin-bottom: 10px; */
+    border-radius: 5px;
+    .itemHeader {
+      /* width: 150px; */
+      color: #0057ba;
+      font-weight: 500;
+      font-size: 16px;
+      padding: 10px 0;
+      display: inline-flex;
+      align-items: center;
+      .itemTitle {
+        margin-right: 10px;
+      }
+      .hintIconBox {
+        display: flex;
+        .hintIcon {
+          width: 16px;
+          height: 16px;
+        }
+      }
+      .van-popover__wrapper {
+        display: flex;
+      }
+    }
+    .updateTime {
+      /* margin-left: 10px; */
+      font-size: 14px;
+      color: #0057ba;
+    }
+    .van-collapse-item {
+      margin-bottom: 15px;
+    }
+    /* 汇报 日报、周报、半月报 */
+    .reportContent {
+      color: #666666;
+      padding: 8px 0;
+      .reportItem {
+        display: flex;
+        position: relative;
+        padding: 3px 0;
+        .value {
+          font-weight: 600;
+        }
+        .itemDetail {
+          text-decoration: underline;
+          color: #0057ba;
+          position: absolute;
+          right: 10px;
+        }
+      }
+      .reportNum {
+        height: 25px;
+      }
+    }
+    /* 色卡 */
+    .pantoneContent {
+      padding-bottom: 10px;
+      .title {
+        padding: 2px 5px;
+        border-radius: 2px;
+        background-color: #13b5b1;
+        margin: 4px 0;
+        display: inline-block;
+        color: #fff;
+      }
+      .pantoneItem {
+        .item {
+          display: flex;
+          justify-content: space-between;
+          .left {
+            display: flex;
+          }
+          .right {
+            display: flex;
+            width: 48%;
+            justify-content: left;
+            .valueIsClick {
+              text-decoration: underline;
+              color: #0057ba;
+            }
+          }
+        }
+        .firstItem {
+        }
+        .secondItem {
+        }
+      }
+    }
+  }
+  .mask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    background: rgba(255, 255, 255, 0.8);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>
+<style lang="scss">
+.hintTabPage {
+  .itemTab {
+    .van-cell {
+      padding: 0 8px;
+      align-items: center;
+    }
+    .van-collapse-item__content {
+      padding: 0 8px;
+    }
+  }
+}
+.hintPopover {
+  background: #deedff;
+  .popper__arrow {
+    &::after {
+      border-right-color: #deedff !important;
+    }
+  }
+}
+</style>

+ 470 - 0
src/views/home/hintTabPage/noVisit.vue

@@ -0,0 +1,470 @@
+<template>
+  <div class="noVisit">
+    <div class="header">
+      <van-nav-bar class="navBar" title="未拜访门店" left-arrow @click-left="onClickLeft" />
+    </div>
+    <div class="content">
+      <van-collapse v-model="activeName" accordion @change="collapseCange">
+        <van-collapse-item v-for="(val, key, ind) in list" :key="ind" :name="key">
+          <template #title>
+            <div class="title">{{ key | storeType }}</div>
+            <div class="num">{{ val.storeNum }}家</div>
+          </template>
+          <div class="itemContent">
+            <template v-if="val.storeList.length">
+              <div class="item" v-for="(item, index) in val.storeList" :key="index">
+                <div class="itemLeft">
+                  <div class="storeName">{{ item.storeName }}</div>
+                  <div class="address">
+                    <van-icon name="location-o" />
+                    {{ item.addressLine }}
+                    <!-- <img v-if="item.distance" style="width: 36px" :src="sbpmdh" @click="linkapp(item)" /> -->
+                  </div>
+                  <div class="distance" v-if="item.distance">
+                    (距离{{ Micrometer(item.distance) }}m)
+                  </div>
+                </div>
+                <div class="itemRight">
+                  <div
+                    class="statstext"
+                    :style="{
+                      'background-color': item.stateString == '未拜访' ? '#ed5c68' : 'white',
+                    }">
+                    <van-icon
+                      v-if="item.stateString == '拜访中'"
+                      :name="times"
+                      color="#ee0a24"
+                      size="32" />
+                    {{ item.stateString == '未拜访' ? '未拜访' : '' }}
+                  </div>
+                  <div class="toVisit" @click="storeVisit(item)">
+                    进入拜访 <van-icon name="arrow" />
+                  </div>
+                </div>
+              </div>
+            </template>
+            <template v-else><div style="text-align: center">暂无数据</div></template>
+          </div>
+        </van-collapse-item>
+      </van-collapse>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  selectUserStoreNoVisits,
+  mobileReposition,
+  checkVisit,
+  addVisitsPosition,
+} from '@/api/index';
+import { checkStoreAddressByStoreCode } from '@/api/visitstore';
+import { getPosition, getTicketFun } from '@/utils/TXApiFun';
+import sbpmdh from '@/assets/sbpmdh.png';
+import times from '@/assets/Icon/times.png';
+import { mapState } from 'vuex';
+import store from '@/store';
+export default {
+  name: 'noVisit',
+  computed: {
+    ...mapState({
+      activaTypeStore: (state) => state.user.activaTypeStore,
+    }),
+  },
+  data() {
+    return {
+      sbpmdh: sbpmdh,
+      times: times,
+      activeName: '',
+      list: {},
+      TXPiont: {}, //腾讯定位数据
+      TXisBD: {}, // 腾讯定位数据转百度
+      activatStoreVal: {}, //当前点击门店数据
+      visitRoutePath: '', //拜访页面路径
+      clickIsFlage: true,
+    };
+  },
+  filters: {
+    storeType(value) {
+      let type = '';
+      if (value == 'keKong') {
+        type = '可控店';
+      } else if (value == 'jinPai') {
+        type = '金牌店';
+      } else if (value == 'tongA') {
+        type = '同城A';
+      } else if (value == 'tongB') {
+        type = '同城B';
+      }
+      return type;
+    },
+  },
+  activated() {
+    // 授权
+    getTicketFun().then(() => {
+      // 获取定位
+      getPosition()
+        .then((res) => {
+          let { TXisBD } = res;
+          this.getList(TXisBD);
+        })
+        .catch((error) => {
+          this.$dialog.alert({
+            message: error,
+          });
+        });
+    });
+    this.activeName = this.activaTypeStore || '';
+  },
+  methods: {
+    collapseCange(value) {
+      store.dispatch('setActivaTypeStore', value);
+    },
+    getList(TXisBD) {
+      selectUserStoreNoVisits({
+        lat: TXisBD.lat,
+        lon: TXisBD.lon,
+      }).then((res) => {
+        this.list = res.data;
+        console.log(this.list);
+      });
+    },
+    tabChange(val) {},
+    // 进入拜访
+    storeVisit(val) {
+      if (!this.clickIsFlage) return;
+      this.clickIsFlage = false;
+      this.toastLoading(0, '加载中...', true);
+      // 删除拜访id
+      localStorage.removeItem('visitId');
+      checkVisit({ storeId: val.storeId }).then((res) => {
+        if (res.code == 200) {
+          this.activatStoreVal = val;
+          // 拜访页面分为 计划外、计划内; 0计划内 1计划外
+          this.visitRoutePath =
+            this.activatStoreVal.visitEntry == '1'
+              ? '/suishenbangOutstoreVisit'
+              : '/storeVisitpage';
+          if (val.stateString.indexOf('拜访中') != -1) {
+            this.clickIsFlage = true;
+            localStorage.setItem('startTime', new Date());
+            localStorage.setItem('ORGName', this.activatStoreVal.deptName);
+            localStorage.setItem('chainNameR', this.activatStoreVal.storeName);
+            this.$router.push({
+              path: this.visitRoutePath,
+              query: {
+                storeId: this.activatStoreVal.storeId,
+                rdId: this.activatStoreVal.rdId,
+                lat: this.activatStoreVal.lat,
+                lon: this.activatStoreVal.lon,
+                visitId: this.activatStoreVal.visitId,
+                pageType: 'out',
+                addressLine: this.activatStoreVal.addressLine,
+                storeCategory: this.activatStoreVal.storeCategoryName,
+                storeName: this.activatStoreVal.storeName,
+                hisTime: this.activatStoreVal.hisTime,
+                contactName: this.activatStoreVal.contactName,
+                storeCode: this.activatStoreVal.storeCode,
+                tabVal: this.tabVal,
+                visitModel: '1',
+                latNew: this.activatStoreVal.lat,
+                lonNew: this.activatStoreVal.lon,
+                PointSum: 0,
+                marklat: this.activatStoreVal.lat,
+                marklon: this.activatStoreVal.lon,
+                from: 'outPlan',
+              },
+            });
+          } else {
+            // 拜访时重新获取定位
+            getPosition()
+              .then((res) => {
+                let { TXisBD, resData } = res;
+                this.TXisBD = TXisBD;
+                this.TXPiont = resData;
+                localStorage.setItem('lat', TXisBD.lat);
+                localStorage.setItem('lon', TXisBD.lon);
+                this.checkStoreAddressByStoreCodeFun();
+              })
+              .catch((error) => {
+                this.clickIsFlage = true;
+                this.$dialog.alert({
+                  message: error,
+                });
+              });
+          }
+        } else {
+          this.toastLoading().clear();
+          this.clickIsFlage = true;
+          this.$dialog.alert({
+            message: res.msg,
+          });
+        }
+      });
+    },
+    checkStoreAddressByStoreCodeFun() {
+      this.toastLoading(0, '加载中...', true);
+      let PointSumval = this.twoPointSum(
+        this.TXisBD.lat,
+        this.TXisBD.lon,
+        this.TXisBD.lat,
+        this.TXisBD.lon
+      ).toFixed(2);
+      // GZ:工装店铺 直接进入拜访
+      if (localStorage.getItem('postType') == 'GZ') {
+        localStorage.setItem('startTime', new Date());
+        localStorage.setItem('ORGName', this.activatStoreVal.deptName);
+        localStorage.setItem('chainNameR', this.activatStoreVal.storeName);
+        this.toSuishenbangOutstoreVisit(PointSumval);
+        return;
+      }
+      checkStoreAddressByStoreCode({
+        storeCode: this.activatStoreVal.storeCode,
+        lon: this.TXisBD.lon,
+        lat: this.TXisBD.lat,
+      })
+        .then((response) => {
+          this.clickIsFlage = true;
+          // 门店校验 地址不通过
+          if (response.code != 200) {
+            this.toastLoading().clear();
+            // updateAddress : ,1:同城AB+金牌,去修改地址;2:非金牌店铺,非同城店铺偏差过大不允许拜访,可以重置定位;0非金牌店铺,非同城店铺 位置信息不存在 可以继续拜访
+            if (response.data) {
+              if (response.data.updateAddress == 0) {
+                // 非金牌店铺,非同城店铺 位置信息不存在 可以继续拜访
+                this.$dialog
+                  .confirm({
+                    confirmButtonText: '确定拜访',
+                    cancelButtonText: '取消拜访',
+                    title: '系统提示',
+                    message:
+                      '该客户没有经纬度,此次拜访会保存定位点作为客户经纬度,下次拜访时判断是否偏差过大。',
+                    closeOnClickOverlay: true,
+                  })
+                  .then(() => {
+                    this.toSuishenbangOutstoreVisit(PointSumval);
+                  });
+              } else if (response.data.updateAddress == 1) {
+                // 同城AB+金牌,去修改地址
+                // addressUpdateTimesOver: true=已经达到最大次数,不让修改; false=没有达到可以修改
+                if (!response.data.addressUpdateTimesOver) {
+                  this.$dialog
+                    .confirm({
+                      title: '系统提示',
+                      message: response.msg + '请立即修改后再拜访',
+                      messageAlign: 'left',
+                      confirmButtonText: '立即修改',
+                      cancelButtonText: '取消',
+                    })
+                    .then(() => {
+                      this.$router.push({
+                        path: '/storeDetail',
+                        query: {
+                          id: this.activatStoreVal.storeId,
+                          type: 'address',
+                          storeAddressId: this.activatStoreVal.storeAddressId,
+                        },
+                      });
+                    });
+                } else {
+                  this.$dialog.confirm({
+                    title: '系统提示',
+                    message: '已经达到最大修改次数',
+                    messageAlign: 'left',
+                    confirmButtonText: '确定',
+                  });
+                }
+              } else if (response.data.updateAddress == 2) {
+                // 1.非金牌店铺,非同城店铺 位置偏差过大 重置经纬度
+                this.resetCoord(PointSumval);
+                return;
+              }
+            } else {
+              this.$dialog.confirm({
+                title: '系统提示',
+                message: response.msg,
+                showCancelButton: false,
+                confirmButtonText: '确定',
+              });
+            }
+          } else {
+            // 门店编码校验门店地址通过 进入拜访
+            this.toSuishenbangOutstoreVisit(PointSumval);
+          }
+        })
+        .catch((error) => {
+          this.clickIsFlage = true;
+        });
+    },
+    // 进入拜访
+    toSuishenbangOutstoreVisit(PointSumval) {
+      addVisitsPosition({
+        storeId: this.activatStoreVal.storeId,
+        visitsId: '',
+        lon: this.TXPiont.longitude,
+        lat: this.TXPiont.latitude,
+        sourceLon: this.TXisBD.lon,
+        sourceLat: this.TXisBD.lat,
+        positionDesc: '',
+        accuracy: this.TXPiont.accuracy,
+      });
+      this.clickIsFlage = true;
+      this.toastLoading().clear();
+      this.$router.push({
+        path: this.visitRoutePath,
+        query: {
+          storeId: this.activatStoreVal.storeId,
+          rdId: this.activatStoreVal.rdId,
+          lat: this.TXisBD.lat,
+          lon: this.TXisBD.lon,
+          visitId: this.activatStoreVal.visitId,
+          pageType: 'out',
+          addressLine: this.activatStoreVal.addressLine,
+          storeCategory: this.activatStoreVal.storeCategoryName,
+          storeName: this.activatStoreVal.storeName,
+          hisTime: this.activatStoreVal.hisTime,
+          contactName: this.activatStoreVal.contactName,
+          storeCode: this.activatStoreVal.storeCode,
+          tabVal: this.tabVal,
+          visitModel: '1',
+          latNew: this.TXisBD.lat,
+          lonNew: this.TXisBD.lon,
+          PointSum: PointSumval,
+          marklat: this.TXPiont.latitude,
+          marklon: this.TXPiont.longitude,
+          from: 'outPlan',
+        },
+      });
+    },
+    // 重置经纬度
+    resetCoord(PointSumval) {
+      this.$dialog
+        .confirm({
+          confirmButtonText: '初始化定位',
+          cancelButtonText: '取消拜访',
+          title: '系统提示',
+          message: '偏差过大,不允许拜访。可修改本店定位.',
+          closeOnClickOverlay: true,
+        })
+        .then(() => {
+          mobileReposition({
+            storeId: this.activatStoreVal.storeId,
+            lat: this.TXisBD.lat,
+            lon: this.TXisBD.lon,
+          }).then((response) => {
+            if (response.code == 200) {
+              this.$dialog
+                .alert({
+                  title: '系统提示',
+                  message: '本信息定位已更新成功!',
+                })
+                .then(() => {
+                  this.toSuishenbangOutstoreVisit(PointSumval);
+                });
+              localStorage.setItem('startTime', new Date());
+              localStorage.setItem('ORGName', this.activatStoreVal.deptName);
+              localStorage.setItem('chainNameR', this.activatStoreVal.storeName);
+            } else {
+              this.$toast(response.msg);
+            }
+          });
+        });
+    },
+    onClickLeft() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.noVisit {
+  height: 100%;
+  width: 100%;
+  /* overflow-y: auto; */
+  .content {
+    padding: 8px 10px;
+    .item {
+      background: #deedff;
+      padding: 8px;
+      margin: 10px 0;
+      border-radius: 5px;
+      display: flex;
+      .storeName {
+        font-size: 15px;
+        font-weight: bold;
+        color: #333;
+        padding: 3px 0;
+      }
+      .address,
+      .distance {
+        font-size: 14px;
+        color: #909090;
+        padding: 3px 0;
+      }
+      .distance {
+        padding-left: 12px;
+      }
+      .itemLeft {
+        flex: 1;
+      }
+      .itemRight {
+        width: 25%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: end;
+        .statstext {
+          background-color: #0057ba;
+          padding: 2px 6px 2px 12px;
+          border-bottom-left-radius: 60px;
+          border-top-left-radius: 60px;
+          color: #fff;
+          width: 60px;
+          margin-right: -8px;
+          /* overflow: hidden; */
+          white-space: nowrap;
+          .van-icon__image {
+            height: 0.7em;
+          }
+        }
+        .toVisit {
+          height: 40%;
+          font-size: 15px;
+          color: #1989fa;
+          width: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: end;
+          /* overflow: hidden; */
+          white-space: nowrap;
+        }
+      }
+    }
+  }
+  .van-collapse-item {
+    border-bottom: 1px solid #dcdcdc;
+  }
+}
+</style>
+<style lang="scss">
+.noVisit {
+  .van-cell__title {
+    font-size: 15px;
+    font-weight: bold;
+    color: #333;
+    display: flex;
+    justify-content: space-between;
+    .num {
+      color: #909090;
+      margin-right: 5px;
+    }
+  }
+  .van-collapse-item__wrapper {
+    border-top: 1px solid #dcdcdc;
+  }
+  .van-collapse-item__title--expanded {
+    position: sticky;
+    top: 0px;
+    z-index: 10;
+  }
+}
+</style>

+ 121 - 0
src/views/home/hintTabPage/pantoneNoGet.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="pantoneNoGet">
+    <div class="header">
+      <van-nav-bar class="navBar" title="未签收门店" left-arrow @click-left="onClickLeft" />
+    </div>
+    <div class="content">
+      <template v-if="list.length">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <div class="storeName">{{ item.storeName }}</div>
+          <div class="address">
+            <van-icon name="location-o" />
+            {{ item.addressLine }}
+            <!-- <img v-if="item.distance" style="width: 36px" :src="sbpmdh" @click="linkapp(item)" /> -->
+          </div>
+          <div class="distance" v-if="item.distance">(距离{{ Micrometer(item.distance) }}m)</div>
+        </div>
+      </template>
+      <van-empty v-else description="暂无数据" />
+    </div>
+  </div>
+</template>
+<script>
+import { getNotSignStoreList } from '@/api/index';
+import { getPosition, getTicketFun } from '@/utils/TXApiFun';
+import sbpmdh from '@/assets/sbpmdh.png';
+export default {
+  name: 'pantoneNoGet',
+  data() {
+    return {
+      sbpmdh: sbpmdh,
+      list: [],
+      point: {}, //当前定位坐标
+    };
+  },
+  created() {
+    this.storeId = this.$route.query.storeId;
+    // config授权
+    getTicketFun().then(() => {
+      getPosition()
+        .then((res) => {
+          let { TXisBD } = res;
+          this.point = TXisBD;
+          this.getNotSignStoreListFun(TXisBD);
+        })
+        .catch((error) => {
+          this.$dialog.alert({
+            message: error,
+          });
+        });
+    });
+  },
+  methods: {
+    getNotSignStoreListFun(TXisBD) {
+      getNotSignStoreList({
+        storeId: this.storeId, //	string	未签门店ID
+        lon: TXisBD.lon, //	string	经度
+        lat: TXisBD.lat, //	string	纬度
+      }).then((res) => {
+        this.list = res.data;
+      });
+    },
+    linkapp(val) {
+      // agentConfig授权
+      getTicketFun(['launchMiniprogram'], 'agentConfig').then(() => {
+        this.wx.invoke(
+          'launchMiniprogram',
+          {
+            appid: 'wx238bbb5f6d958414',
+            path:
+              'pages/relayStation/relayStation?latitude=' +
+              point.lat +
+              '&longitude=' +
+              point.lon +
+              '&name=' +
+              val.addressLine,
+          },
+          function (res) {
+            if (res.err_msg == 'launchMiniprogram:ok') {
+            } else {
+            }
+          }
+        );
+      });
+    },
+    onClickLeft() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.pantoneNoGet {
+  height: 100%;
+  width: 100%;
+  /* overflow-y: auto; */
+  .content {
+    padding: 8px 10px;
+    .item {
+      background: #deedff;
+      padding: 8px;
+      margin: 10px 0;
+      border-radius: 5px;
+      .storeName {
+        font-size: 15px;
+        font-weight: bold;
+        color: #333;
+        padding: 3px 0;
+      }
+      .address,
+      .distance {
+        font-size: 14px;
+        color: #909090;
+        padding: 3px 0;
+      }
+      .distance {
+        padding-left: 12px;
+      }
+    }
+  }
+}
+</style>

+ 136 - 0
src/views/home/hintTabPage/visitPage.vue

@@ -0,0 +1,136 @@
+<template>
+  <div class="visitPage">
+    <div class="storeType" v-for="(item, index) in contentData" :key="index">
+      <div class="title" :style="{ background: item.bagColor }">{{ item.title }}</div>
+      <div class="itemContent">
+        <div class="temList" v-for="(list, ind) in item.visitDetail" :key="ind" v-if="resData">
+          <div class="itemLeft">
+            <div class="label">{{ list.leftTable }}</div>
+            <div class="label">
+              {{ resData[item.titleProp][list.leftProp]
+              }}<span class="unit" v-if="fromType == 'createStore'">{{ list.leftUnit }}</span>
+            </div>
+          </div>
+          <div class="itemRight" :style="{ width: fromType == 'noVisit' ? '130px' : '140px' }">
+            <div class="label">{{ list.rightTable }}</div>
+            <div class="label" :style="labelStyle(list)" @click="onClick(item, list)">
+              {{ resData[item.titleProp][list.rightProp] }}{{ list.rightUnit }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="mask" v-if="maskShow"><van-loading type="spinner" color="#1989fa" /></div>
+  </div>
+</template>
+
+<script>
+import store from '@/store';
+export default {
+  name: 'visitPage',
+  props: {
+    // 折叠数据label
+    contentData: {
+      type: Array,
+      default: [],
+    },
+    // 遮罩层
+    maskShow: {
+      type: Boolean,
+      default: false,
+    },
+    // 接口返回折叠数据
+    resData: {
+      type: Object,
+      default: () => {},
+    },
+    // 用户等级
+    empLevel: {
+      type: String,
+    },
+    // 来源类型 'noVisit':未拜访; 'createStore':建店;
+    fromType: {
+      type: String,
+    },
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    labelStyle(list) {
+      return {
+        'text-decoration': list.rightIsClick ? 'underline' : 'none',
+        color: list.rightIsClick ? '#0057ba' : '#666666',
+      };
+    },
+    // 跳转详情
+    onClick(item, list) {
+      // 等级3(销售员):点击未拜访;进入未拜访列表(noVIsit);点击建店:进入我的-我的客户(storemanagementlist)
+      // 等级2或1(销售部主管和大区负责人):进入统页面(hintDetail)
+      if (this.empLevel == '3') {
+        if (this.fromType == 'noVisit') {
+          // 进入未拜访列表(noVIsit)
+          // 获取移动端获取用户信息接口
+          store.dispatch('setActivaTypeStore', item.titleProp);
+          // this.$router.push({ path: '/noVisit', query: { activeName: item.titleProp } });
+          this.$router.push({ path: '/noVisit' });
+        } else if (this.fromType == 'createStore') {
+          // 进入我的-我的客户(storemanagementlist)
+          // 1:未完工;2:未结案
+          let storeStatus = list.rightTable.indexOf('未完工') != -1 ? '1' : '2';
+          localStorage.setItem('storeStatus', storeStatus);
+          this.$router.push({ path: '/storemanagementlist', query: { storeStatus: storeStatus } });
+        }
+      } else {
+        // 销售部主管和大区负责人跳转统计页面
+        this.$router.push({ path: '/hintDetail', query: { fromType: this.fromType } });
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.visitPage {
+  position: relative;
+  .storeType {
+    display: flex;
+    padding: 8px 0;
+    .title {
+      color: #fff;
+      height: 21px;
+      margin-right: 6px;
+      width: 50px;
+      text-align: center;
+      line-height: 21px;
+      border-radius: 2px;
+    }
+    .itemContent {
+      /* display: flex; */
+      color: #666666;
+      flex: 1;
+      .temList {
+        display: flex;
+        justify-content: space-between;
+        .itemLeft {
+          display: flex;
+          flex: 1;
+        }
+        .itemRight {
+          /* width: 120px; */
+          display: flex;
+        }
+      }
+    }
+  }
+  .mask {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    background: rgba(255, 255, 255, 0.8);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 137 - 1733
src/views/home/index.vue


+ 2 - 0
src/views/home/login.vue

@@ -12,6 +12,7 @@
   </div>
 </template>
 <script>
+import store from '@/store';
 export default {
   name: 'login',
   data() {
@@ -23,6 +24,7 @@ export default {
     login() {
       localStorage.clear();
       if (this.name.trim() != '') {
+        store.commit('SET_USER_INFO', null);
         // 当前设备:PC/mobile
         let isDevice = window.navigator.userAgent.match(
           /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i

+ 5 - 5
src/views/home/reportingRate.vue

@@ -506,20 +506,20 @@ export default {
       this.StartTimeShow = false;
       if (
         new Date(val).getTime() <
-        new Date(this.GetPreMonthDay(this.formData.startTime, -2, 'end')).getTime()
+        new Date(this.GetPreMonthDay(this.seacherForm.startTime, -2, 'end')).getTime()
       ) {
-        this.endminDate = new Date(this.GetPreMonthDay(this.formData.startTime, -2, 'end'));
-        this.endmaxDate = new Date(this.GetPreMonthDay(this.formData.startTime, -2, 'end'));
+        this.endminDate = new Date(this.GetPreMonthDay(this.seacherForm.startTime, -2, 'end'));
+        this.endmaxDate = new Date(this.GetPreMonthDay(this.seacherForm.startTime, -2, 'end'));
       } else {
         this.endminDate = new Date(val);
-        this.endmaxDate = new Date(this.GetPreMonthDay(this.formData.startTime, -2, 'end'));
+        this.endmaxDate = new Date(this.GetPreMonthDay(this.seacherForm.startTime, -2, 'end'));
       }
       if (
         new Date(this.seacherForm.startTime).getTime() >
           new Date(this.seacherForm.endTime).getTime() ||
         new Date(this.endmaxDate).getTime() < new Date(this.seacherForm.endTime).getTime()
       ) {
-        this.seacherForm.endTime = this.parseTime(new Date(val), '{y}-{m}-{d}') + '';
+        // this.seacherForm.endTime = this.parseTime(new Date(val), '{y}-{m}-{d}') + '';
         this.seacherFormload.endTime = this.parseTime(new Date(val), '{y}-{m}-{d}') + '';
 
         this.endcurrentDate = this.GetPreMonthDay(this.seacherForm.startTime, -2);

+ 23 - 4
src/views/storeManagement/index.vue

@@ -410,6 +410,18 @@ export default {
       this.getstoreCoverPosition();
       this.getStreetQuery();
       this.getMonth();
+      let storeStatus = localStorage.getItem('storeStatus');
+      // 1:未完工;2:未结案
+      if (storeStatus) {
+        if (storeStatus == 2) {
+          this.statusOption = [
+            { text: '已结案', value: 1, selectFlag: false },
+            { text: '已提交', value: 2, selectFlag: true },
+            { text: '未提交', value: 3, selectFlag: true },
+          ];
+        }
+        this.setOption();
+      }
       this.onSearch();
       if (localStorage.getItem('postType') == 'JZ' || localStorage.getItem('postType') == 'GZ') {
         this.mapShows = false;
@@ -419,10 +431,17 @@ export default {
     }
   },
   watch: {
-    $route(to, from) {
-      if (to.path == '/storemanagement/index' && from.path == '/My/index') {
-        this.tabVal = '1';
-      }
+    $route: {
+      handler(to, from) {
+        // if (to.path == '/storemanagement/index' && from.path == '/My/index') {
+        //   this.tabVal = '1';
+        // }
+        if (from.path == '/storemanagement/index') {
+          // 离开当前页面时
+          localStorage.removeItem('storeStatus');
+        }
+      },
+      // immediate: true,
     },
   },
   methods: {

+ 37 - 379
src/views/week/daily.vue

@@ -27,90 +27,23 @@
     <!--        主体内容-->
     <div class="container linepAdd">
       <van-collapse v-model="activeNames">
+        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
+          <visitedRealTime
+            :reportTargetAll="reportTargetAll"
+            :powerGrade="powerGrade"
+            :JZQuota="JZQuota"></visitedRealTime>
+        </van-collapse-item>
+        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
+          <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
+        </van-collapse-item>
+        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-          <van-row>
-            <van-col span="24" v-if="GZQuota"
-              ><p>
-                昨日新增:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapNewYesterday)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本月累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本季累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"><span class="leftTitle">年度累计</span></van-col>
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度达成率:<span class="colorbalck">{{ reportTargetAll.sapYearSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度成长率:<span class="colorbalck">{{ reportTargetAll.sapYearGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
           <van-row style="margin-top: -10px">
@@ -238,112 +171,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col>
-           <van-col span="12">
-             <p>调色机上传数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tsjUploadYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span></p>
-           </van-col> -->
-            <van-col span="24"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>涂料店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tlShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-            <van-col span="24">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>厨卫店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.cwShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
           <van-row>
@@ -387,150 +216,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="分销店下单点数">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">本月进度</span></van-col>
-            <van-col span="12"
-              ><p>
-                分销店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fxOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                分销店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.fxShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.jpOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.jpShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.cwShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.tlShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
           <van-row>
@@ -543,7 +230,7 @@
             >
             <van-col span="12"
               ><p>
-                全年目标(达成率):<span class="colorbalck"
+                全年实际店数:<span class="colorbalck"
                   >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
                 >
               </p></van-col
@@ -771,52 +458,6 @@
             </van-col>
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-          <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.inVisitAct }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访点数:<span class="colorbalck">{{ reportTargetAll.inVisitActMonth }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.visitTarget }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.coverStoreNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitMonthRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访数:<span class="colorbalck">{{ reportTargetAll.allVisitNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访率:<span class="colorbalck">{{ reportTargetAll.allVisitMonthRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
       </van-collapse>
       <div class="contentContainer">
         <div v-if="GZQuota">
@@ -876,9 +517,25 @@ import {
   getDetailById,
   tsContents,
 } from '@/api/index';
+import visitedRealTime from '@/views/componentsTarget/visitedRealTime';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import placeOrder from '@/views/componentsTarget/placeOrder';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 
 export default {
   name: 'daily',
+  components: {
+    visitedRealTime,
+    createStoreBJ,
+    placeOrder,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       show: true,
@@ -1148,7 +805,8 @@ export default {
                   if (this.$route.query.reportId != undefined) {
                     window.location.replace(window.location.origin + '/mobile/myHistoricalDaily');
                   } else {
-                    window.location.replace(window.location.origin + '/mobile/home');
+                    this.onClickLeft();
+                    // window.location.replace(window.location.origin + '/mobile/home');
                   }
                 });
             } else {

+ 37 - 380
src/views/week/dailyApproval.vue

@@ -12,90 +12,26 @@
     <!--        主体内容-->
     <div class="container linep">
       <van-collapse v-model="activeNames">
+        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
+          <visitedRealTime
+            :reportTargetAll="reportTargetAll"
+            :powerGrade="powerGrade"
+            :JZQuota="JZQuota"></visitedRealTime>
+        </van-collapse-item>
+        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
+          <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
+        </van-collapse-item>
+        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-          <van-row>
-            <van-col span="24" v-if="GZQuota"
-              ><p>
-                昨日新增:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapNewYesterday)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本月累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本季累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"><span class="leftTitle">年度累计</span></van-col>
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度达成率:<span class="colorbalck">{{ reportTargetAll.sapYearSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度成长率:<span class="colorbalck">{{ reportTargetAll.sapYearGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
+        </van-collapse-item>
+        <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" title="超好贴分销店下单">
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
           <van-row style="margin-top: -10px">
@@ -223,112 +159,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12" ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col>
-           <van-col span="12">
-             <p>调色机上传数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tsjUploadYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span></p>
-           </van-col> -->
-            <van-col span="24"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>涂料店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tlShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-            <van-col span="24">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>厨卫店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.cwShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
           <van-row>
@@ -372,151 +204,6 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="分销店下单点数">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">本月进度</span></van-col>
-            <van-col span="12"
-              ><p>
-                分销店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fxOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                分销店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.fxShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.jpOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.jpShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.cwShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.tlShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
           <van-row>
             <van-col span="24"
@@ -528,7 +215,7 @@
             >
             <van-col span="12"
               ><p>
-                全年目标(达成率):<span class="colorbalck"
+                全年实际店数:<span class="colorbalck"
                   >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
                 >
               </p></van-col
@@ -756,52 +443,6 @@
             </van-col>
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-          <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.inVisitAct }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访点数:<span class="colorbalck">{{ reportTargetAll.inVisitActMonth }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.visitTarget }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.coverStoreNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitMonthRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访数:<span class="colorbalck">{{ reportTargetAll.allVisitNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访率:<span class="colorbalck">{{ reportTargetAll.allVisitMonthRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photos">
           <div v-for="(item, index) in reportTarget.photos" :key="index">
             <p style="margin-bottom: 10px; margin-top: 0">{{ item.taskName }}</p>
@@ -893,8 +534,24 @@ import {
   getReportInfo,
   buryingPoint,
 } from '@/api/index';
+import visitedRealTime from '@/views/componentsTarget/visitedRealTime';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import placeOrder from '@/views/componentsTarget/placeOrder';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 export default {
   name: 'daily',
+  components: {
+    visitedRealTime,
+    createStoreBJ,
+    placeOrder,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       show: true,

+ 35 - 378
src/views/week/dailyDetails.vue

@@ -14,90 +14,23 @@
     <!--        主体内容-->
     <div class="container linep">
       <van-collapse v-model="activeNames">
+        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
+          <visitedRealTime
+            :reportTargetAll="reportTargetAll"
+            :powerGrade="powerGrade"
+            :JZQuota="JZQuota"></visitedRealTime>
+        </van-collapse-item>
+        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
+          <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
+        </van-collapse-item>
+        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-          <van-row>
-            <van-col span="24" v-if="GZQuota"
-              ><p>
-                昨日新增:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapNewYesterday)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本月累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本季累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"><span class="leftTitle">年度累计</span></van-col>
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度达成率:<span class="colorbalck">{{ reportTargetAll.sapYearSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度成长率:<span class="colorbalck">{{ reportTargetAll.sapYearGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
           <van-row style="margin-top: -10px">
@@ -225,112 +158,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12" ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col>
-           <van-col span="12">
-             <p>调色机上传数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tsjUploadYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span></p>
-           </van-col> -->
-            <van-col span="24"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>涂料店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tlShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-            <van-col span="24">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>厨卫店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.cwShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
           <van-row>
@@ -374,150 +203,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="分销店下单点数">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">本月进度</span></van-col>
-            <van-col span="12"
-              ><p>
-                分销店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fxOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                分销店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.fxShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.jpOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.jpShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.cwShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.tlShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
           <van-row>
@@ -530,7 +217,7 @@
             >
             <van-col span="12"
               ><p>
-                全年目标(达成率):<span class="colorbalck"
+                全年实际店数:<span class="colorbalck"
                   >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
                 >
               </p></van-col
@@ -758,52 +445,6 @@
             </van-col>
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-          <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.inVisitAct }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访点数:<span class="colorbalck">{{ reportTargetAll.inVisitActMonth }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.visitTarget }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.coverStoreNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitMonthRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访数:<span class="colorbalck">{{ reportTargetAll.allVisitNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访率:<span class="colorbalck">{{ reportTargetAll.allVisitMonthRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photos">
           <div v-for="(item, index) in reportTarget.photos" :key="index">
             <p style="margin-bottom: 10px; margin-top: 0">{{ item.taskName }}</p>
@@ -892,9 +533,25 @@
 import history from '@/assets/Icon/history.png';
 import { userTodayPlanNum, loginLog, getDetailById, getReportInfo } from '@/api/index';
 import { ImagePreview } from 'vant';
+import visitedRealTime from '@/views/componentsTarget/visitedRealTime';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import placeOrder from '@/views/componentsTarget/placeOrder';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 
 export default {
   name: 'daily',
+  components: {
+    visitedRealTime,
+    createStoreBJ,
+    placeOrder,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       show: true,

+ 35 - 385
src/views/week/dailyHistoricalDetails.vue

@@ -13,90 +13,23 @@
     <div class="container linep">
       <p style="font-size: 16px; margin: 10px 0">{{ title }}</p>
       <van-collapse v-model="activeNames">
+        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
+          <visitedRealTime
+            :reportTargetAll="reportTargetAll"
+            :powerGrade="powerGrade"
+            :JZQuota="JZQuota"></visitedRealTime>
+        </van-collapse-item>
+        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="下单点数">
+          <placeOrder :reportTargetAll="reportTargetAll"></placeOrder>
+        </van-collapse-item>
+        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item v-if="type != 3 && type != 4" name="1" :title="saptitle">
-          <van-row>
-            <van-col span="24" v-if="GZQuota"
-              ><p>
-                昨日新增:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapNewYesterday)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span v-if="!JZQuota" class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本月累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p v-if="!JZQuota">
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-              <p v-if="JZQuota">
-                本季累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"><span class="leftTitle">年度累计</span></van-col>
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度累计:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度达成率:<span class="colorbalck">{{ reportTargetAll.sapYearSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="24" v-if="JZQuota"
-              ><p>
-                年度成长率:<span class="colorbalck">{{ reportTargetAll.sapYearGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item v-if="GZQuota" name="43" title="纯态之家SAP(千元)">
           <van-row style="margin-top: -10px">
@@ -224,119 +157,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" v-if="!JZQuota && !GZQuota" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="24"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>涂料店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.tlShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-            <van-col span="24">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <!--            <van-col span="12" >-->
-            <!--              <p>厨卫店点数:<span class="colorbalck">{{ Micrometer(reportTargetAll.cwShopYearTarget) }}</span><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span></p>-->
-            <!--            </van-col>-->
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item v-if="!JZQuota && !GZQuota" name="29" title="瓷砖胶SAP(千元)">
           <van-row>
@@ -380,150 +202,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item name="16" v-if="!JZQuota && !GZQuota" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" v-if="!JZQuota && !GZQuota" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item v-if="!JZQuota && !GZQuota" name="33" title="分销店下单点数">
-          <van-row>
-            <van-col span="24"><span class="leftTitle">本月进度</span></van-col>
-            <van-col span="12"
-              ><p>
-                分销店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.fxOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                分销店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.fxShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.jpOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.jpShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                厨卫店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.cwShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlOrderShopMonthAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                涂料店下单率:<span class="colorbalck"
-                  >{{ reportTargetAll.tlShopMonthOrderRate }}%</span
-                >
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item v-if="JZQuota" name="23" title="展厅上样">
           <van-row>
@@ -536,7 +216,7 @@
             >
             <van-col span="12"
               ><p>
-                全年目标(达成率):<span class="colorbalck"
+                全年实际店数:<span class="colorbalck"
                   >{{ Micrometer(reportTargetAll.exhibitionHallYearAct) }}%</span
                 >
               </p></van-col
@@ -764,52 +444,6 @@
             </van-col>
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
-          <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.inVisitAct }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访点数:<span class="colorbalck">{{ reportTargetAll.inVisitActMonth }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.visitTarget }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                计划拜访点数:<span class="colorbalck">{{ reportTargetAll.coverStoreNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                线内拜访率:<span class="colorbalck">{{ reportTargetAll.inVisitMonthRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访数:<span class="colorbalck">{{ reportTargetAll.allVisitNum }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                整体拜访率:<span class="colorbalck">{{ reportTargetAll.allVisitMonthRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photos">
           <div v-for="(item, index) in reportTarget.photos" :key="index">
             <p style="margin-bottom: 10px; margin-top: 0">{{ item.taskName }}</p>
@@ -940,9 +574,25 @@ import envelopes from '@/assets/envelopes.png';
 import { userTodayPlanNum, insertRemark, getDetailById, updateReport } from '@/api/index';
 import axios from 'axios';
 import { ImagePreview } from 'vant';
+import visitedRealTime from '@/views/componentsTarget/visitedRealTime';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import placeOrder from '@/views/componentsTarget/placeOrder';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 
 export default {
   name: 'daily',
+  components: {
+    visitedRealTime,
+    createStoreBJ,
+    placeOrder,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       envelopes: envelopes,

+ 21 - 253
src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -14,56 +14,14 @@
     <div class="container linep">
       <p style="font-size: 16px; margin: 10px 0">{{ title }}</p>
       <van-collapse v-model="activeNames">
+        <van-collapse-item title="建店布机" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item name="16" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <van-row>
-            <!--            <van-col span="24" ><p>昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -108,40 +66,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -303,177 +228,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -631,8 +387,20 @@ import {
 } from '@/api/index';
 import envelopes from '@/assets/envelopes.png';
 import axios from 'axios';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 export default {
   name: 'home',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       envelopes: envelopes,

+ 23 - 254
src/views/week/doubleWeekly.vue

@@ -27,56 +27,14 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <van-collapse v-model="activeNames">
+        <van-collapse-item title="建店布机" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item name="16" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <van-row>
-            <!--            <van-col span="24" ><p>昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -121,40 +79,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -316,177 +241,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -591,9 +347,21 @@ import {
   getReportInfo,
   tsContents,
 } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 
 export default {
   name: 'home',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       activeNames: [
@@ -892,7 +660,8 @@ export default {
                 if (this.$route.query.reportId != undefined) {
                   window.location.replace(window.location.origin + '/mobile/myHistoricalDaily');
                 } else {
-                  window.location.replace(window.location.origin + '/mobile/home');
+                  this.onClickLeft();
+                  // window.location.replace(window.location.origin + '/mobile/home');
                 }
               });
           } else {

+ 21 - 253
src/views/week/doubleWeeklyApproval.vue

@@ -13,56 +13,14 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <van-collapse v-model="activeNames">
+        <van-collapse-item title="建店布机" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item name="16" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <van-row>
-            <!--            <van-col span="24" ><p>昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -107,40 +65,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -302,177 +227,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -589,9 +345,21 @@
 
 <script>
 import { double_week_type, updateReport, getDetailById, getReportInfo } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 
 export default {
   name: 'home',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       form: { rate: 0, message: '' },

+ 26 - 253
src/views/week/doubleWeeklyDetils.vue

@@ -14,56 +14,14 @@
     <!--        主体内容-->
     <div class="container linep">
       <van-collapse v-model="activeNames">
+        <van-collapse-item title="建店布机" name="2">
+          <createStoreBJ :reportTargetAll="reportTargetAll"></createStoreBJ>
+        </van-collapse-item>
+        <van-collapse-item name="16" title="专业时时丽分销店下单">
+          <ZYPlaceOrder :reportTargetAll="reportTargetAll"></ZYPlaceOrder>
+        </van-collapse-item>
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
-          <van-row>
-            <!--            <van-col span="24" ><p>昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -108,40 +66,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -303,177 +228,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -604,9 +360,21 @@
 <script>
 import history from '@/assets/Icon/history.png';
 import { userTodayPlanNum, loginLog, homeImge, getDetailById, double_week_type } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 
 export default {
   name: 'home',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       show: true,
@@ -648,6 +416,7 @@ export default {
       successContent: '',
       type: '-1',
       ptitle: '',
+      JZQuota: false,
       //
     };
   },
@@ -691,6 +460,10 @@ export default {
         forbidClick: true,
       });
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
+        this.JZQuota = false;
+        if (res.data.postType == 'JZ') {
+          this.JZQuota = true;
+        }
         loading1.clear();
         this.title = res.data.deptName + '  ' + res.data.nickName;
         this.reportTargetAll = res.data.reportTargetAll;

+ 28 - 254
src/views/week/weekly.vue

@@ -27,56 +27,14 @@
       <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">
-          <van-row>
-            <!--            <van-col span="24" ><p>昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -121,40 +79,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -316,177 +241,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -629,8 +385,20 @@
 </template>
 <script>
 import { updateReport, getReportInfo, getDetailById, tsContents } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 export default {
   name: 'home',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       activeNames: [
@@ -662,6 +430,7 @@ export default {
       reportContentsList3: [],
       temporaryShow: '',
       type: '-1',
+      JZQuota: false,
     };
   },
   created() {
@@ -696,6 +465,10 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         loading1.clear();
         if (res.code == 200) {
+          this.JZQuota = false;
+          if (res.data.postType == 'JZ') {
+            this.JZQuota = true;
+          }
           var dayTime = res.data.date;
           this.type = res.data.userType;
           this.timeList = this.parseTimeParagraph(
@@ -904,7 +677,8 @@ export default {
                 if (this.$route.query.reportId != undefined) {
                   window.location.replace(window.location.origin + '/mobile/myHistoricalDaily');
                 } else {
-                  window.location.replace(window.location.origin + '/mobile/home');
+                  this.onClickLeft();
+                  // window.location.replace(window.location.origin + '/mobile/home');
                 }
               });
           } else {

+ 26 - 253
src/views/week/weeklyApproval.vue

@@ -12,56 +12,14 @@
       <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">
-          <van-row>
-            <!--            <van-col span="24" ><p>昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -106,40 +64,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -301,177 +226,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -624,8 +380,20 @@
 
 <script>
 import { updateReport, getDetailById } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 export default {
   name: 'weeklyApproval',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       show: true,
@@ -664,6 +432,7 @@ export default {
       updateReport: {},
       reportTarget: {},
       type: '-1',
+      JZQuota: false,
     };
   },
   created() {
@@ -771,6 +540,10 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         loading1.clear();
         if (res.code == 200) {
+          this.JZQuota = false;
+          if (res.data.postType == 'JZ') {
+            this.JZQuota = true;
+          }
           var dayTime = res.data.date;
           this.type = res.data.userType;
           this.timeList = this.parseTimeParagraph(

+ 26 - 253
src/views/week/weeklyApprovalDetils.vue

@@ -12,56 +12,14 @@
       <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">
-          <van-row>
-            <!--            <van-col span="24" ><p>昨日新增:<span class="colorbalck">{{ Micrometer(reportTargetAll.sapNewYesterday) }}</span></p></van-col>-->
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -106,40 +64,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -301,177 +226,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p> </van-col
-            > -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -637,9 +393,21 @@
 <script>
 import history from '@/assets/Icon/history.png';
 import { userTodayPlanNum, loginLog, homeImge, getDetailById } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 
 export default {
   name: 'home',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       show: true,
@@ -681,6 +449,7 @@ export default {
       reportTarget: {},
       type: '-1',
       ptitle: '',
+      JZQuota: false,
     };
   },
   created() {
@@ -711,6 +480,10 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         loading1.clear();
         if (res.code == 200) {
+          this.JZQuota = false;
+          if (res.data.postType == 'JZ') {
+            this.JZQuota = true;
+          }
           var dayTime = res.data.date;
           this.type = res.data.userType;
           this.ptitle = res.data.pdeptName + '-' + res.data.ppostName + '-' + res.data.pnickName;

+ 26 - 252
src/views/week/weeklyHistoricalDetils.vue

@@ -13,55 +13,14 @@
       <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">
-          <van-row>
-            <van-col span="12"
-              ><span class="leftTitle">本月业绩</span
-              ><span v-if="JZQuota" class="leftTitle">本月实际</span></van-col
-            >
-            <van-col span="12"
-              ><span class="rightTitle">本季业绩</span
-              ><span v-if="JZQuota" class="rightTitle">本季实际</span></van-col
-            >
-            <van-col span="12">
-              <p>
-                本月实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapMonthAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>
-                本季实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.sapQuarterAct)
-                }}</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                本月达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapMonthSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.sapQuarterSuccessRate }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本月成长率:<span class="colorbalck">{{ reportTargetAll.sapMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                本季成长率:<span class="colorbalck">{{ reportTargetAll.sapQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
         <van-collapse-item name="27" title="乳胶漆中高端(千元)">
           <van-row>
@@ -106,40 +65,7 @@
           </van-row>
         </van-collapse-item>
         <van-collapse-item name="11" 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.czjMonthAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                实际:<span class="colorbalck">{{ Micrometer(reportTargetAll.czjQuarterAct) }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjMonthSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.czjQuarterSuccessRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjMonthGrowRate }}%</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.czjQuarterGrowRate }}%</span>
-              </p></van-col
-            >
-          </van-row>
+          <ZYSAP :reportTargetAll="reportTargetAll"></ZYSAP>
         </van-collapse-item>
         <van-collapse-item name="28" title="防水+背胶SAP(千元)">
           <van-row>
@@ -301,177 +227,8 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="建店布机" name="2">
-          <van-row>
-            <van-col span="12"
-              ><p><span class="leftTitle">今年实际</span></p></van-col
-            >
-            <van-col span="12"
-              ><p><span class="rightTitle">今年目标(达成率)</span></p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                金牌店布机:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.goldShopBjYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.goldShopBjYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12"
-              ><p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearAct)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12">
-              <p>
-                分销店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.allShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.allShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <!-- <van-col span="12"
-              ><p>调色机上传数:{{ Micrometer(reportTargetAll.tsjUploadYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                调色机上传数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tsjUploadYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tsjUploadYearRate }}%)</span>
-              </p>
-            </van-col> -->
-            <van-col span="12"
-              ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                涂料店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.tlShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.tlShopYearRate }}%)</span>
-              </p>
-            </van-col>
-            <van-col span="12">
-              <p>厨卫店点数:{{ Micrometer(reportTargetAll.cwShopYearAct) }}</p></van-col
-            >
-            <van-col span="12">
-              <p>
-                厨卫店点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.cwShopYearTarget)
-                }}</span
-                ><span class="colorbalck">({{ reportTargetAll.cwShopYearRate }}%)</span>
-              </p>
-            </van-col>
-          </van-row>
-        </van-collapse-item>
-        <van-collapse-item name="16" 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.professionalSslYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.professionalSslOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(桶):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.professionalSslOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
-        </van-collapse-item>
         <van-collapse-item name="17" 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.excellentPostYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单点数:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostMonth)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"><p></p></van-col>
-            <van-col span="12"
-              ><p>
-                下单率 :<span class="colorbalck"
-                  >{{ reportTargetAll.excellentPostOrderRateMonth }}%</span
-                >
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumYes)
-                }}</span>
-              </p></van-col
-            >
-            <van-col span="12"
-              ><p>
-                下单数量(包):<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.excellentPostOrderNumMonth)
-                }}</span>
-              </p></van-col
-            >
-          </van-row>
+          <veryGoodPlaceOrder :reportTargetAll="reportTargetAll"></veryGoodPlaceOrder>
         </van-collapse-item>
         <van-collapse-item title="客户开拓" name="6">
           <van-row>
@@ -642,8 +399,20 @@ import history from '@/assets/Icon/history.png';
 import { loginLog, insertRemark, getDetailById, updateReport } from '@/api/index';
 import envelopes from '@/assets/envelopes.png';
 import axios from 'axios';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
 export default {
   name: 'home',
+  components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+  },
   data() {
     return {
       envelopes: envelopes,
@@ -688,6 +457,7 @@ export default {
       managerRemarkContent: '',
       isDiy: false,
       type: '-1',
+      JZQuota: false,
     };
   },
   created() {
@@ -807,6 +577,10 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         loading1.clear();
         if (res.code == 200) {
+          this.JZQuota = false;
+          if (res.data.postType == 'JZ') {
+            this.JZQuota = true;
+          }
           var dayTime = res.data.date;
           this.type = res.data.userType;
           this.title =