Merge branch 'feature_20250623_拜访次数显示修改' into uat(dev)

# Conflicts:
#	src/views/deviceOutside/rangeStore.vue

src/views/deviceOutside/index.vue

@@ -78,7 +78,7 @@
                 联系人：{{ item.contactName }}
                 <div style="position: absolute; bottom: 0px; right: 0px">
                   <!-- 金牌店ABC -->
-                  <el-popover
+                  <!-- <el-popover
                     popper-class="zpover"
                     placement="bottom"
                     width="120"
@@ -92,7 +92,7 @@
                       <van-icon :name="require('@/assets/Icon/visitJPNum.png')" size="26" />
                       <div class="JPVisitNum">{{ item.visitNum }}/{{ item.needVisitNum }}</div>
                     </div>
-                  </el-popover>
+                  </el-popover> -->
                   <!-- 凤凰客户 -->
                   <el-popover
                     popper-class="zpover"
@@ -238,7 +238,7 @@
                     :disabled="!item.userVisitTimesMap"
                     trigger="click">
                     <div
-                      v-if="false && item.storeLabels.visitTimes && item.storeLabels.visitTimes > 0"
+                      v-if="item.storeLabels.visitTimes && item.storeLabels.visitTimes > 0"
                       class="visitStoreIco"
                       slot="reference"
                       style="background-color: #fff; position: relative">
@@ -254,8 +254,21 @@
                         ">
                         {{ item.storeLabels.visitTimes }}
                       </p>
-                      <van-icon :name="ordernum" size="26" />
+                      <!-- A级金牌店拜访次数少于2 -->
+                      <van-icon
+                        :name="require('@/assets/ordernumRed.png')"
+                        size="26"
+                        v-if="item.storeLabels.jpA && item.storeLabels.visitTimes < 2" />
+                      <van-icon :name="require('@/assets/ordernum.png')" size="26" v-else />
                     </div>
+                    <p style="text-align: center; background: #fff; color: #000; padding: 5px 0">
+                      本店本月己拜访过{{ item.storeLabels.visitTimes }}次
+                    </p>
+                    <p
+                      v-if="item.storeLabels.jpA"
+                      style="text-align: center; background: #fff; color: red; padding: 5px 0">
+                      A级金牌店拜访标准：1月2次
+                    </p>
                     <el-table :data="item.userVisitTimesMap" border max-height="180px">
                       <el-table-column label="业务员" prop="userName" />
                       <el-table-column label="拜访次数" prop="visitTimes" width="110px" />
@@ -570,7 +583,6 @@ import mpimg from '@/assets/mpimg.png';
 import axios from 'axios';
 import mapmarker from '@/components/mapMarkerDouble';
 import order from '@/assets/order.png';
-import ordernum from '@/assets/ordernum.png';
 import sbpmdh from '@/assets/sbpmdh.png';
 import request from '@/utils/request';
 import call from '@/assets/call.png';
@@ -600,7 +612,6 @@ export default {
       paste: paste,
       visitTimess: visitTimes,
       sbpmdh: sbpmdh,
-      ordernum: ordernum,
       typeShow: false,
       mpimg: mpimg,
       order: order,

src/views/deviceOutside/rangeStore.vue

@@ -208,6 +208,22 @@
             <div class="text" style="position: relative">
               联系人:{{ info.contactName }}
               <div style="position: absolute; bottom: 0px; right: 10px; display: inline-block">
+                <!-- 金牌店ABC -->
+                <!-- <el-popover
+                  popper-class="zpover"
+                  placement="bottom"
+                  width="120"
+                  trigger="click"
+                  :content="setJPABCContent(info)">
+                  <div
+                    v-if="setJPABCFlag(info)"
+                    class="visitStoreIco"
+                    style="background-color: #fff"
+                    slot="reference">
+                    <van-icon :name="require('@/assets/Icon/visitJPNum.png')" size="26" />
+                    <div class="JPVisitNum">{{ info.visitNum }}/{{ info.needVisitNum }}</div>
+                  </div>
+                </el-popover> -->
                 <el-popover
                   popper-class="zpover"
                   placement="bottom"
@@ -376,9 +392,21 @@
                       ">
                       {{ info.storeLabels.visitTimes }}
                     </p>
-                    <van-icon :name="ordernum" size="26" />
+                    <!-- A级金牌店拜访次数少于2 -->
+                    <van-icon
+                      :name="require('@/assets/ordernumRed.png')"
+                      size="26"
+                      v-if="info.storeLabels.jpA && info.storeLabels.visitTimes < 2" />
+                    <van-icon :name="require('@/assets/ordernum.png')" size="26" v-else />
                   </div>
-                  <!-- <div class="tipsTitle">本店本月已拜访过{{ item.storeLabels.visitTimes }}次</div> -->
+                  <p style="text-align: center; background: #fff; color: #000; padding: 5px 0">
+                    本店本月己拜访过{{ info.storeLabels.visitTimes }}次
+                  </p>
+                  <p
+                    v-if="info.storeLabels.jpA"
+                    style="text-align: center; background: #fff; color: red; padding: 5px 0">
+                    A级金牌店拜访标准：1月2次
+                  </p>
                   <el-table :data="info.userVisitTimesMap" border max-height="180px">
                     <el-table-column label="业务员" prop="userName" />
                     <el-table-column label="拜访次数" prop="visitTimes" width="90px" />
@@ -662,7 +690,6 @@ import {
   getDictOption,
 } from '@/api';
 import axios from 'axios';
-import ordernum from '@/assets/ordernum.png';
 import ord from '@/assets/ord.png';
 
 import check from './../../assets/check.svg';
@@ -696,7 +723,6 @@ export default {
       times: times,
       msg: '',
       msgshow: false,
-      ordernum: ordernum,
       mapmarker: mapmarker,
       paste: paste,
       visitTimess: visitTimes,

src/views/deviceOutside/topStore.vue

@@ -117,7 +117,7 @@
                   联系人：{{ item.contactName }}
                   <div style="position: absolute; bottom: 0px; right: 0px">
                     <!-- 金牌店ABC -->
-                    <el-popover
+                    <!-- <el-popover
                       popper-class="zpover"
                       placement="bottom"
                       width="120"
@@ -131,7 +131,7 @@
                         <van-icon :name="require('@/assets/Icon/visitJPNum.png')" size="26" />
                         <div class="JPVisitNum">{{ item.visitNum }}/{{ item.needVisitNum }}</div>
                       </div>
-                    </el-popover>
+                    </el-popover> -->
                     <el-popover
                       popper-class="zpover"
                       placement="bottom"
@@ -281,11 +281,21 @@
                           ">
                           {{ item.storeLabels.visitTimes }}
                         </p>
-                        <van-icon :name="ordernum" size="26" />
+                        <!-- A级金牌店拜访次数少于2 -->
+                        <van-icon
+                          :name="require('@/assets/ordernumRed.png')"
+                          size="26"
+                          v-if="item.storeLabels.jpA && item.storeLabels.visitTimes < 2" />
+                        <van-icon :name="require('@/assets/ordernum.png')" size="26" v-else />
                       </div>
-                      <!-- <div class="tipsTitle">
-                        本店本月已拜访过{{ item.storeLabels.visitTimes }}次
-                      </div> -->
+                      <p style="text-align: center; background: #fff; color: #000; padding: 5px 0">
+                        本店本月己拜访过{{ item.storeLabels.visitTimes }}次
+                      </p>
+                      <p
+                        v-if="item.storeLabels.jpA"
+                        style="text-align: center; background: #fff; color: red; padding: 5px 0">
+                        A级金牌店拜访标准：1月2次
+                      </p>
                       <el-table :data="item.userVisitTimesMap" border max-height="180px">
                         <el-table-column label="业务员" prop="userName" />
                         <el-table-column label="拜访次数" prop="visitTimes" width="110px" />
@@ -646,7 +656,6 @@ import times from '@/assets/Icon/times.png';
 import order60 from '@/assets/order60.png';
 import targetOne from '@/assets/targetOne.png';
 import Network from '@/assets/Network.png';
-import ordernum from '@/assets/ordernum.png';
 import ord from '@/assets/ord.png';
 import timeico from '@/assets/Icon/datatims.png';
 import location from '@/assets/location.png';
@@ -786,7 +795,6 @@ export default {
       storeIds: '',
       Jointype: 1,
       showAll: false,
-      ordernum: ordernum,
       ord: ord,
       customerVisits: true,
       otherfxdShow1: true,

src/views/deviceWithin/index.vue

@@ -106,7 +106,7 @@
               联系人：{{ item.contactName }}
               <div style="position: absolute; bottom: 0; right: 14px">
                 <!-- 金牌店ABC -->
-                <el-popover
+                <!-- <el-popover
                   popper-class="zpover"
                   placement="bottom"
                   width="120"
@@ -120,7 +120,7 @@
                     <van-icon :name="require('@/assets/Icon/visitJPNum.png')" size="26" />
                     <div class="JPVisitNum">{{ item.visitNum }}/{{ item.needVisitNum }}</div>
                   </div>
-                </el-popover>
+                </el-popover> -->
                 <el-popover
                   popper-class="zpover"
                   placement="bottom"
@@ -261,9 +261,21 @@
                       ">
                       {{ item.storeLabels.visitTimes }}
                     </p>
-                    <van-icon :name="ordernum" size="26" />
+                    <!-- A级金牌店拜访次数少于2 -->
+                    <van-icon
+                      :name="require('@/assets/ordernumRed.png')"
+                      size="26"
+                      v-if="item.storeLabels.jpA && item.storeLabels.visitTimes < 2" />
+                    <van-icon :name="require('@/assets/ordernum.png')" size="26" v-else />
                   </div>
-                  <!-- <div class="tipsTitle">本店本月已拜访过{{ item.storeLabels.visitTimes }}次</div> -->
+                  <p style="text-align: center; background: #fff; color: #000; padding: 5px 0">
+                    本店本月己拜访过{{ item.storeLabels.visitTimes }}次
+                  </p>
+                  <p
+                    v-if="item.storeLabels.jpA"
+                    style="text-align: center; background: #fff; color: red; padding: 5px 0">
+                    A级金牌店拜访标准：1月2次
+                  </p>
                   <el-table :data="item.userVisitTimesMap" border max-height="180px">
                     <el-table-column label="业务员" prop="userName" />
                     <el-table-column label="拜访次数" prop="visitTimes" width="110px" />
@@ -423,7 +435,6 @@ import {
 import axios from 'axios';
 import paste from '@/assets/paste.png';
 import order from '@/assets/order.png';
-import ordernum from '@/assets/ordernum.png';
 import call from '@/assets/call.png';
 import jiarujihua from '@/assets/jiarujihua.png';
 import kehuxinxi from '@/assets/kehuxinxi-2.png';
@@ -454,7 +465,6 @@ export default {
       ord: ord,
       timeData1: '',
       targetOne: targetOne,
-      ordernum: ordernum,
       paste: paste,
       visitTimess: visitTimes,
       show: false,

src/views/storeManagement/index.vue

@@ -124,7 +124,7 @@
                 联系人：{{ item.contactName }}
                 <div style="position: absolute; bottom: 0px; right: 0px" v-if="item.storeLabels">
                   <!-- 金牌店ABC -->
-                  <el-popover
+                  <!-- <el-popover
                     popper-class="zpover"
                     placement="bottom"
                     width="120"
@@ -138,7 +138,7 @@
                       <van-icon :name="require('@/assets/Icon/visitJPNum.png')" size="26" />
                       <div class="JPVisitNum">{{ item.visitNum }}/{{ item.needVisitNum }}</div>
                     </div>
-                  </el-popover>
+                  </el-popover> -->
                   <el-popover
                     popper-class="zpover"
                     placement="bottom"
@@ -289,8 +289,21 @@
                         ">
                         {{ item.storeLabels.visitTimes }}
                       </p>
-                      <van-icon :name="ordernum" size="26" />
+                      <!-- A级金牌店拜访次数少于2 -->
+                      <van-icon
+                        :name="require('@/assets/ordernumRed.png')"
+                        size="26"
+                        v-if="item.storeLabels.jpA && item.storeLabels.visitTimes < 2" />
+                      <van-icon :name="require('@/assets/ordernum.png')" size="26" v-else />
                     </div>
+                    <p style="text-align: center; background: #fff; color: #000; padding: 5px 0">
+                      本店本月己拜访过{{ item.storeLabels.visitTimes }}次
+                    </p>
+                    <p
+                      v-if="item.storeLabels.jpA"
+                      style="text-align: center; background: #fff; color: red; padding: 5px 0">
+                      A级金牌店拜访标准：1月2次
+                    </p>
                     <el-table :data="item.userVisitTimesMap" border max-height="180px">
                       <el-table-column label="业务员" prop="userName" />
                       <el-table-column label="拜访次数" prop="visitTimes" />
@@ -400,7 +413,6 @@ import axios from 'axios';
 import order60 from '@/assets/order60.png';
 import targetOne from '@/assets/targetOne.png';
 import visitTimes from '@/assets/visitTimes.png';
-import ordernum from '@/assets/ordernum.png';
 export default {
   data() {
     return {
@@ -408,7 +420,6 @@ export default {
       list: [],
       ord: ord,
       addShow: false,
-      ordernum: ordernum,
       mapShows: false,
       visitTimess: visitTimes,
       paste: paste,