Merge branch 'feature_20240913_调色机上传数，首页经销商下属指标' into uat

# Conflicts:
#	src/views/home/index.vue

src/views/home/index.vue

@@ -702,10 +702,17 @@
                 ><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.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" v-if="powerGrade == 1"
               ><p>涂料店点数:{{ Micrometer(reportTargetAll.tlShopYearAct) }}</p></van-col
             >
@@ -1081,6 +1088,82 @@
         </div>
       </van-collapse>
     </div>
+    <!-- 经销商负责人 查看下属 -->
+    <div v-if="tabVal == 1 && type == 4" class="container linep">
+      <van-collapse v-model="activeNames" v-if="reportInfoData.customerUserTargets">
+        <van-collapse-item
+          :name="index + ''"
+          :title="item.nickName"
+          v-for="(item, index) in reportInfoData.customerUserTargets"
+          :key="index">
+          <van-row>
+            <van-col span="24"
+              ><p class="indexTile" style="margin-top: -2px">
+                <van-icon :name="bfindex" class="indexicon"></van-icon>拜访
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="leftTitle">本日实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="rightTitle">本月实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                拜访点数:<span class="colorbalck">{{ Micrometer(item.dayVisitCount) }}</span>
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                拜访点数:<span class="colorbalck">{{ Micrometer(item.monthVisitCount) }}</span>
+              </p></van-col
+            >
+            <van-col span="24"
+              ><p class="indexTile">
+                <van-icon :name="storeindex" class="indexicon"></van-icon>建店
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="leftTitle">本日新增</span></p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="rightTitle">本月实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                分销店点数:<span class="colorbalck">{{ Micrometer(item.dayFxdAct) }}</span>
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                分销店点数:<span class="colorbalck">{{ Micrometer(item.monthFxdAct) }}</span>
+              </p></van-col
+            >
+            <van-col span="24"
+              ><p class="indexTile">
+                <van-icon :name="oderindex" class="indexicon"></van-icon>下单
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="leftTitle">昨日新增</span></p></van-col
+            >
+            <van-col span="12"
+              ><p><span class="rightTitle">本月实际</span></p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                下单点数:<span class="colorbalck">{{ Micrometer(item.yesOrderAct) }}</span>
+              </p></van-col
+            >
+            <van-col span="12"
+              ><p>
+                下单点数:<span class="colorbalck">{{ Micrometer(item.monthOrderAct) }}</span>
+              </p></van-col
+            >
+          </van-row>
+        </van-collapse-item>
+      </van-collapse>
+    </div>
     <div style="color: #999; font-size: 12px; margin: 0 10px">
       <!--      昨日新增的数据统一在上午9点更新.-->
       <span v-if="reportInfoData.newUser"
@@ -1190,9 +1273,9 @@
 </template>
 
 <script>
-import history from "@/assets/Icon/history.png";
-import tabBar from "@/components/tabBar";
-import times from "@/assets/Icon/times.png";
+import history from '@/assets/Icon/history.png';
+import tabBar from '@/components/tabBar';
+import times from '@/assets/Icon/times.png';
 import {
   userTodayPlanNum,
   loginLog,
@@ -1203,10 +1286,10 @@ import {
   mobileReposition,
   applyNumber,
   joinInPlan,
-} from "@/api/index";
-import axios from "axios";
+} from '@/api/index';
+import axios from 'axios';
 export default {
-  name: "home",
+  name: 'home',
   components: { tabBar },
   data() {
     return {
@@ -1216,55 +1299,55 @@ export default {
       timeimg: times,
       todayGoal: {},
       progressWidth: 0,
-      updataTime: "",
+      updataTime: '',
       customerClueButton: false,
-      saptitle: "业绩目标SAP(千元)",
+      saptitle: '业绩目标SAP(千元)',
       history: history,
       activeNames: [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "10",
-        "11",
-        "12",
-        "16",
-        "17",
-        "20",
-        "21",
-        "22",
-        "23",
-        "24",
-        "25",
-        "26",
-        "27",
-        "28",
-        "29",
-        "30",
-        "31",
-        "32",
-        "33",
-        "34",
-        "35",
-        "36",
-        "37",
-        "38",
-        "39",
-        "40",
-        "41",
-        "42",
-        "43",
+        '1',
+        '2',
+        '3',
+        '4',
+        '5',
+        '6',
+        '7',
+        '8',
+        '10',
+        '11',
+        '12',
+        '16',
+        '17',
+        '20',
+        '21',
+        '22',
+        '23',
+        '24',
+        '25',
+        '26',
+        '27',
+        '28',
+        '29',
+        '30',
+        '31',
+        '32',
+        '33',
+        '34',
+        '35',
+        '36',
+        '37',
+        '38',
+        '39',
+        '40',
+        '41',
+        '42',
+        '43',
       ],
       activeNameType: [],
       powerGradeShow: false,
       showButton: false,
       isCommit: null,
-      powerGrade: "2",
-      deptLevel: "",
+      powerGrade: '2',
+      deptLevel: '',
       // positionId：等级（1-销售员 2-销售部主管 3-大区主管 4-区域公司总经理 5-DIY公司）
       reportTargetAll: {},
       approvalPendingNum: 0,
@@ -1272,11 +1355,11 @@ export default {
       approvalButton: false,
       times: 5,
       timer: null,
-      type: "-1",
+      type: '-1',
       monthNoVisit: {},
       flag: true,
       reportInfoData: {},
-      applyNumber: "",
+      applyNumber: '',
       proccessPendingNum: 0,
       JZQuota: false,
       GZdata: false,
@@ -1290,8 +1373,8 @@ export default {
     this.timeFn();
     this.userTodayPlanNum();
     if (
-      localStorage.getItem("shows") == "false" ||
-      new Date("2023/05/04 23:59:59").getTime() < new Date().getTime()
+      localStorage.getItem('shows') == 'false' ||
+      new Date('2023/05/04 23:59:59').getTime() < new Date().getTime()
     ) {
       this.shows = false;
     } else {
@@ -1300,7 +1383,7 @@ export default {
   },
   watch: {
     $route(to, from) {
-      if (to.path == "/home") {
+      if (to.path == '/home') {
         this.num = 0;
         this.userTodayPlanNum();
         this.loginLogFn();
@@ -1312,7 +1395,7 @@ export default {
     storeJoinVisit(val) {
       joinInPlan({ storeId: val.storeId }).then((res) => {
         if (res.code == 200) {
-          this.$toast.success("加入成功");
+          this.$toast.success('加入成功');
         } else {
           this.$toast(res.msg);
         }
@@ -1325,7 +1408,7 @@ export default {
     },
     titleconfirm() {
       this.shows = false;
-      localStorage.setItem("shows", false);
+      localStorage.setItem('shows', false);
     },
     timeFn() {
       var t = 5;
@@ -1340,29 +1423,29 @@ export default {
       }, 1000);
     },
     dailyLinks() {
-      this.$router.push("/myHistoricalDaily");
+      this.$router.push('/myHistoricalDaily');
     },
     getReportInfo() {
       let loading1 = this.$toast.loading({
         duration: 0,
-        message: "加载中...",
+        message: '加载中...',
         forbidClick: true,
       });
       getReportInfo({ isContent: false }).then((res) => {
         if (res.code == 200) {
-          if (res.data.postType == "GZ") {
+          if (res.data.postType == 'GZ') {
             this.GZdata = true;
-            this.saptitle = "公裝业绩SAP(千元)";
+            this.saptitle = '公裝业绩SAP(千元)';
           } else {
-            this.saptitle = "业绩目标SAP(千元)";
+            this.saptitle = '业绩目标SAP(千元)';
             this.GZdata = 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('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);
           this.isDiy = res.data.diy;
           this.proccessPendingNum = res.data.proccessPendingNum;
           this.reportInfoData = res.data;
@@ -1370,61 +1453,64 @@ export default {
           this.powerGrade = res.data.positionId;
           this.showButton = res.data.showButton;
           this.deptLevel = res.data.deptLevel;
-          if (res.data.postType == "JZ") {
+          if (res.data.postType == 'JZ') {
             this.JZQuota = true;
           } else {
             this.JZQuota = false;
           }
-          localStorage.setItem("postType", res.data.postType);
+          localStorage.setItem('postType', res.data.postType);
           if (res.data.reportTargetAll != null) {
             this.reportTargetAll = res.data.reportTargetAll;
             this.updataTime = res.data.reportTargetAll.updateTime;
           }
           this.approvalPendingNum = res.data.approvalPendingNum;
           this.type = res.data.userType;
+          if (res.data.userType == 4) {
+            this.tabVal = '1';
+          }
         } else {
           this.$toast(res.msg);
         }
       });
     },
     dailyLink() {
-      this.$router.push("/daily");
+      this.$router.push('/daily');
     },
     weeklyLink() {
-      this.$router.push("/weekly");
+      this.$router.push('/weekly');
     },
     doubleWeeklyLink() {
-      this.$router.push("/doubleWeekly");
+      this.$router.push('/doubleWeekly');
     },
     login() {
       if (this.num > 4) {
-        this.$router.push("/login");
+        this.$router.push('/login');
       } else {
         this.num = this.num + 1;
       }
     },
     userTodayPlanNum() {
-      localStorage.setItem("outvstoreName", "");
-      localStorage.setItem("outvchainName", "");
-      localStorage.removeItem("outvstoreLabelTypes");
-      localStorage.removeItem("outvstoreCategoryList");
-      localStorage.setItem("outvchainCode", "");
-      localStorage.setItem("outvstoreName", "");
-      localStorage.setItem("deviveStoreName", "");
-      localStorage.setItem("outvsortType", "");
-      localStorage.setItem("outsortParam", "");
-      localStorage.setItem("lat", "");
-      localStorage.setItem("lon", "");
+      localStorage.setItem('outvstoreName', '');
+      localStorage.setItem('outvchainName', '');
+      localStorage.removeItem('outvstoreLabelTypes');
+      localStorage.removeItem('outvstoreCategoryList');
+      localStorage.setItem('outvchainCode', '');
+      localStorage.setItem('outvstoreName', '');
+      localStorage.setItem('deviveStoreName', '');
+      localStorage.setItem('outvsortType', '');
+      localStorage.setItem('outsortParam', '');
+      localStorage.setItem('lat', '');
+      localStorage.setItem('lon', '');
       userTodayPlanNum().then((res) => {
         if (res.code == 200) {
           this.todayGoal = res.data;
-          this.progressWidth = (this.todayGoal.finishNum / this.todayGoal.planNum) * 100 + "%";
-          localStorage.setItem("nickName", res.data.user.nickName);
-          localStorage.setItem("postName", res.data.user.postName);
-          localStorage.setItem("zipPhoto", res.data.zipPhoto);
-          localStorage.setItem("storeType", res.data.user.type);
-          localStorage.setItem("deptLevel", res.data.user.depts[0].deptLevel);
-          localStorage.setItem("userId", res.data.user.userId);
+          this.progressWidth = (this.todayGoal.finishNum / this.todayGoal.planNum) * 100 + '%';
+          localStorage.setItem('nickName', res.data.user.nickName);
+          localStorage.setItem('postName', res.data.user.postName);
+          localStorage.setItem('zipPhoto', res.data.zipPhoto);
+          localStorage.setItem('storeType', res.data.user.type);
+          localStorage.setItem('deptLevel', res.data.user.depts[0].deptLevel);
+          localStorage.setItem('userId', res.data.user.userId);
           this.monthNoVisit = res.data.monthNoVisit;
         } else {
           this.$toast(res.msg);
@@ -1433,21 +1519,21 @@ export default {
     },
     loginLogFn() {
       var appVersion = navigator.appVersion;
-      var Logapp = appVersion.split("(")[1].split(";");
-      var arrLog = "";
-      if (Logapp[0] == "Linux") {
+      var Logapp = appVersion.split('(')[1].split(';');
+      var arrLog = '';
+      if (Logapp[0] == 'Linux') {
         arrLog = {
           browser: navigator.appCodeName,
           os: Logapp[1],
-          phoneBrand: Logapp[2].split("/")[1],
-          phoneModel: Logapp[2].split("/")[0],
+          phoneBrand: Logapp[2].split('/')[1],
+          phoneModel: Logapp[2].split('/')[0],
         };
       } else {
         arrLog = {
           browser: navigator.appCodeName,
           os: Logapp[0],
-          phoneBrand: "",
-          phoneModel: "",
+          phoneBrand: '',
+          phoneModel: '',
         };
       }
       loginLog(arrLog);

src/views/week/daily.vue

@@ -100,10 +100,10 @@
             <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.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>-->

src/views/week/dailyApproval.vue

@@ -92,10 +92,10 @@
             <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.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>-->

src/views/week/dailyDetails.vue

@@ -137,10 +137,10 @@
             <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.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>-->