Просмотр исходного кода

Merge branch 'feature_20260204_金牌店等级S' into uat(dev)

# Conflicts:
#	src/views/home/hintTabPage/warningStore.vue
#	src/views/week/dailyDetails.vue
zhujindu 1 неделя назад
Родитель
Сommit
48bc9a66ae

BIN
src/assets/Icon/storeS.png


+ 11 - 3
src/views/deviceOutside/index.vue

@@ -58,6 +58,10 @@
                     class="JPABC"
                     :src="require('@/assets/Icon/storeE.png')"
                     v-if="item.storeLabels.storeE" />
+                  <img
+                    class="JPABC"
+                    :src="require('@/assets/Icon/storeS.png')"
+                    v-if="item.storeLabels.storeS" />
                 </template>
                 <span @click="goOtherSystem(item)" :style="setStroeNameStyle(item)">
                   <span>{{ item.storeName }}</span>
@@ -278,7 +282,7 @@
                         :name="require('@/assets/ordernumRed.png')"
                         size="26"
                         v-if="
-                          item.storeLabels.storeA &&
+                          (item.storeLabels.storeA || item.storeLabels.storeS) &&
                           item.needVisitNum &&
                           item.storeLabels.visitTimes < item.needVisitNum
                         " />
@@ -289,9 +293,13 @@
                       本店本月已拜访过{{ item.storeLabels.visitTimes }}次
                     </p>
                     <p
-                      v-if="item.storeLabels.storeA && item.needVisitNum"
+                      v-if="
+                        (item.storeLabels.storeA || item.storeLabels.storeS) && item.needVisitNum
+                      "
                       style="text-align: center; background: #fff; color: red; padding: 5px 0">
-                      A级金牌店拜访标准:1月{{ item.needVisitNum }}次
+                      <span v-if="item.storeLabels.storeA">A</span>
+                      <span v-if="item.storeLabels.storeS">S</span>
+                      级金牌店拜访标准:1月{{ item.needVisitNum }}次
                     </p>
                     <el-table :data="item.userVisitTimesMap" border max-height="180px">
                       <el-table-column label="业务员" prop="userName" />

+ 11 - 5
src/views/deviceOutside/rangeStore.vue

@@ -210,6 +210,10 @@
                   class="JPABC"
                   :src="require('@/assets/Icon/storeE.png')"
                   v-if="info.storeLabels.storeE" />
+                <img
+                  class="JPABC"
+                  :src="require('@/assets/Icon/storeS.png')"
+                  v-if="info.storeLabels.storeS" />
               </template>
               <span @click="goOtherSystem(info)" :style="setStroeNameStyle(info)">
                 <span>{{ info.storeName }}</span>
@@ -431,7 +435,7 @@
                       :name="require('@/assets/ordernumRed.png')"
                       size="26"
                       v-if="
-                        info.storeLabels.storeA &&
+                        (info.storeLabels.storeA || info.storeLabels.storeS) &&
                         info.needVisitNum &&
                         info.storeLabels.visitTimes < info.needVisitNum
                       " />
@@ -441,9 +445,11 @@
                     本店本月已拜访过{{ info.storeLabels.visitTimes }}次
                   </p>
                   <p
-                    v-if="info.storeLabels.storeA && info.needVisitNum"
+                    v-if="(info.storeLabels.storeA || info.storeLabels.storeS) && info.needVisitNum"
                     style="text-align: center; background: #fff; color: red; padding: 5px 0">
-                    A级金牌店拜访标准:1月{{ info.needVisitNum }}次
+                    <span v-if="info.storeLabels.storeA">A</span>
+                    <span v-if="info.storeLabels.storeS">S</span>
+                    级金牌店拜访标准:1月{{ info.needVisitNum }}次
                   </p>
                   <el-table :data="info.userVisitTimesMap" border max-height="180px">
                     <el-table-column label="业务员" prop="userName" />
@@ -1977,7 +1983,7 @@ export default {
                                         res,
                                         val,
                                         location,
-                                        PointSumval
+                                        PointSumval,
                                       );
                                     });
                                 } else if (response.data.updateAddress == 1) {
@@ -2180,7 +2186,7 @@ export default {
                     if (res.err_msg == 'launchMiniprogram:ok') {
                     } else {
                     }
-                  }
+                  },
                 );
               },
               fail: function (res) {

+ 11 - 3
src/views/deviceOutside/topStore.vue

@@ -99,6 +99,10 @@
                       class="JPABC"
                       :src="require('@/assets/Icon/storeE.png')"
                       v-if="item.storeLabels.storeE" />
+                    <img
+                      class="JPABC"
+                      :src="require('@/assets/Icon/storeS.png')"
+                      v-if="item.storeLabels.storeS" />
                   </template>
                   <span class="btn" :data-clipboard-text="item.storeCode">
                     <span>{{ item.storeName }}</span>
@@ -283,7 +287,7 @@
                           :name="require('@/assets/ordernumRed.png')"
                           size="26"
                           v-if="
-                            item.storeLabels.storeA &&
+                            (item.storeLabels.storeA || item.storeLabels.storeS) &&
                             item.needVisitNum &&
                             item.storeLabels.visitTimes < item.needVisitNum
                           " />
@@ -293,9 +297,13 @@
                         本店本月已拜访过{{ item.storeLabels.visitTimes }}次
                       </p>
                       <p
-                        v-if="item.storeLabels.storeA && item.needVisitNum"
+                        v-if="
+                          (item.storeLabels.storeA || item.storeLabels.storeS) && item.needVisitNum
+                        "
                         style="text-align: center; background: #fff; color: red; padding: 5px 0">
-                        A级金牌店拜访标准:1月{{ item.needVisitNum }}次
+                        <span v-if="item.storeLabels.storeA">A</span>
+                        <span v-if="item.storeLabels.storeS">S</span>
+                        级金牌店拜访标准:1月{{ item.needVisitNum }}次
                       </p>
                       <el-table :data="item.userVisitTimesMap" border max-height="180px">
                         <el-table-column label="业务员" prop="userName" />

+ 9 - 3
src/views/deviceWithin/index.vue

@@ -77,6 +77,10 @@
                   class="JPABC"
                   :src="require('@/assets/Icon/storeE.png')"
                   v-if="item.storeLabels.storeE" />
+                <img
+                  class="JPABC"
+                  :src="require('@/assets/Icon/storeS.png')"
+                  v-if="item.storeLabels.storeS" />
               </template>
               <span @click="goOtherSystem(item)" :style="setStroeNameStyle(item)">
                 <span>{{ item.storeName }}</span>
@@ -288,7 +292,7 @@
                       :name="require('@/assets/ordernumRed.png')"
                       size="26"
                       v-if="
-                        item.storeLabels.storeA &&
+                        (item.storeLabels.storeA || item.storeLabels.storeS) &&
                         item.needVisitNum &&
                         item.storeLabels.visitTimes < item.needVisitNum
                       " />
@@ -298,9 +302,11 @@
                     本店本月已拜访过{{ item.storeLabels.visitTimes }}次
                   </p>
                   <p
-                    v-if="item.storeLabels.storeA && item.needVisitNum"
+                    v-if="(item.storeLabels.storeA || item.storeLabels.storeS) && item.needVisitNum"
                     style="text-align: center; background: #fff; color: red; padding: 5px 0">
-                    A级金牌店拜访标准:1月{{ item.needVisitNum }}次
+                    <span v-if="item.storeLabels.storeA">A</span>
+                    <span v-if="item.storeLabels.storeS">S</span>
+                    级金牌店拜访标准:1月{{ item.needVisitNum }}次
                   </p>
                   <el-table :data="item.userVisitTimesMap" border max-height="180px">
                     <el-table-column label="业务员" prop="userName" />

+ 228 - 91
src/views/home/hintTabPage/warningStore.vue

@@ -18,146 +18,269 @@
                     <div class="title titlero">
                       <template v-if="item.storeLabels">
                         <!-- 金牌店ABC -->
-                        <img class="JPABC" :src="require('@/assets/Icon/storeA.png')" v-if="item.storeLabels.storeA" />
-                        <img class="JPABC" :src="require('@/assets/Icon/storeB.png')" v-if="item.storeLabels.storeB" />
-                        <img class="JPABC" :src="require('@/assets/Icon/storeC.png')" v-if="item.storeLabels.storeC" />
-                        <img class="JPABC" :src="require('@/assets/Icon/storeD.png')" v-if="item.storeLabels.storeD" />
-                        <img class="JPABC" :src="require('@/assets/Icon/storeE.png')" v-if="item.storeLabels.storeE" />
+                        <img
+                          class="JPABC"
+                          :src="require('@/assets/Icon/storeA.png')"
+                          v-if="item.storeLabels.storeA" />
+                        <img
+                          class="JPABC"
+                          :src="require('@/assets/Icon/storeB.png')"
+                          v-if="item.storeLabels.storeB" />
+                        <img
+                          class="JPABC"
+                          :src="require('@/assets/Icon/storeC.png')"
+                          v-if="item.storeLabels.storeC" />
+                        <img
+                          class="JPABC"
+                          :src="require('@/assets/Icon/storeD.png')"
+                          v-if="item.storeLabels.storeD" />
+                        <img
+                          class="JPABC"
+                          :src="require('@/assets/Icon/storeE.png')"
+                          v-if="item.storeLabels.storeE" />
+                        <img
+                          class="JPABC"
+                          :src="require('@/assets/Icon/storeS.png')"
+                          v-if="item.storeLabels.storeS" />
                       </template>
                       <span @click="goOtherSystem(item)" :style="setStroeNameStyle(item)">
                         <span>{{ item.storeName }}</span>
-                        (<span>{{ item.storeCode }}</span>)
+                        (<span>{{ item.storeCode }}</span
+                        >)
                       </span>
                       <span class="btn" :data-clipboard-text="item.storeCode">
-                        <van-icon :name="paste" color="#ee0a24" size="20" style="top: 6px; margin-left: 4px" />
+                        <van-icon
+                          :name="paste"
+                          color="#ee0a24"
+                          size="20"
+                          style="top: 6px; margin-left: 4px" />
                       </span>
                       <!-- "approvalStatus": 1:已结案;0:未结案, -->
                       <!-- "processApprovalStatus": 审批状态(0=未提交,1=已提交待审核,2=审批通过,3=审批拒绝) -->
                       <template v-if="item.approvalStatus == 0">
-                        <span class="statusIcon submit" v-if="item.processApprovalStatus == 1">已提交</span>
-                        <span class="statusIcon noSubmit" v-if="item.processApprovalStatus == 0">未提交</span>
+                        <span class="statusIcon submit" v-if="item.processApprovalStatus == 1"
+                          >已提交</span
+                        >
+                        <span class="statusIcon noSubmit" v-if="item.processApprovalStatus == 0"
+                          >未提交</span
+                        >
                       </template>
                     </div>
                     <div class="info" style="position: relative">
                       联系人:{{ item.contactName }}
                       <div style="position: absolute; bottom: 0px; right: 0px">
                         <!-- 凤凰客户 -->
-                        <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click"
+                        <el-popover
+                          popper-class="zpover"
+                          placement="bottom"
+                          width="120"
+                          trigger="click"
                           content="该客户为凤凰客户">
-                          <div v-if="item.storeLabels.fhCustomer" class="visitStoreIco" style="background-color: #fff"
+                          <div
+                            v-if="item.storeLabels.fhCustomer"
+                            class="visitStoreIco"
+                            style="background-color: #fff"
                             slot="reference">
-                            <van-icon :name="require('@/assets/Icon/fenghuangjihua.png')" size="26" />
+                            <van-icon
+                              :name="require('@/assets/Icon/fenghuangjihua.png')"
+                              size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover zpover6" placement="bottom-start" trigger="click">
+                        <el-popover
+                          popper-class="zpover zpover6"
+                          placement="bottom-start"
+                          trigger="click">
                           <div>
                             <p>
-                              本店{{ timeData }}下单SKU数:<a @click="linkList(item)"
-                                style="text-decoration: underline">点击查看详情</a>
+                              本店{{ timeData }}下单SKU数:<a
+                                @click="linkList(item)"
+                                style="text-decoration: underline"
+                                >点击查看详情</a
+                              >
                             </p>
                           </div>
-                          <div class="visitStoreIco" v-if="item.storeLabels.zysslNums !== false"
-                            style="background-color: #fff; position: relative" slot="reference">
-                            <p style="
-                          width: 100%;
-                          position: absolute;
-                          z-index: 1;
-                          top: 0.2px;
-                          width: 22px;
-                          margin: 0;
-                          margin-left: 3.6px;
-                          text-align: center;
-                          font-size: 12px;
-                        ">
+                          <div
+                            class="visitStoreIco"
+                            v-if="item.storeLabels.zysslNums !== false"
+                            style="background-color: #fff; position: relative"
+                            slot="reference">
+                            <p
+                              style="
+                                width: 100%;
+                                position: absolute;
+                                z-index: 1;
+                                top: 0.2px;
+                                width: 22px;
+                                margin: 0;
+                                margin-left: 3.6px;
+                                text-align: center;
+                                font-size: 12px;
+                              ">
                               {{ item.storeLabels.zysslNums }}
                             </p>
                             <van-icon :name="ord" size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover zpover5" placement="bottom" width="200" trigger="click">
+                        <el-popover
+                          popper-class="zpover zpover5"
+                          placement="bottom"
+                          width="200"
+                          trigger="click">
                           <div v-if="item.storeLabels">
                             <p>已参加:</p>
                             <p v-for="tt in (item.storeLabels.targetOne + '').split(';')" :key="tt">
                               {{ tt }}
                             </p>
                           </div>
-                          <div class="visitStoreIco" v-if="item.storeLabels.targetOne" style="background-color: #fff"
+                          <div
+                            class="visitStoreIco"
+                            v-if="item.storeLabels.targetOne"
+                            style="background-color: #fff"
                             slot="reference">
                             <van-icon :name="targetOne" size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click"
+                        <el-popover
+                          popper-class="zpover"
+                          placement="bottom"
+                          width="120"
+                          trigger="click"
                           content="调色机7天未调色">
-                          <div v-if="item.storeLabels.stopColorMixerSeven" class="visitStoreIco" style="background-color: #fff"
+                          <div
+                            v-if="item.storeLabels.stopColorMixerSeven"
+                            class="visitStoreIco"
+                            style="background-color: #fff"
                             slot="reference">
                             <van-icon :name="Network" size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover" placement="bottom" width="120" trigger="click"
+                        <el-popover
+                          popper-class="zpover"
+                          placement="bottom"
+                          width="120"
+                          trigger="click"
                           content="调色机当月未调色">
-                          <div v-if="item.storeLabels.stopColorMixerMonth" class="visitStoreIco"
-                            style="background-color: #fff" slot="reference">
+                          <div
+                            v-if="item.storeLabels.stopColorMixerMonth"
+                            class="visitStoreIco"
+                            style="background-color: #fff"
+                            slot="reference">
                             <van-icon :name="WiFi" size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover" placement="bottom" width="200" trigger="click"
+                        <el-popover
+                          popper-class="zpover"
+                          placement="bottom"
+                          width="200"
+                          trigger="click"
                           content="同城店近60天未下单">
-                          <div v-if="item.storeLabels.fxNoOrder" class="visitStoreIco" style="background-color: #fff"
+                          <div
+                            v-if="item.storeLabels.fxNoOrder"
+                            class="visitStoreIco"
+                            style="background-color: #fff"
                             slot="reference">
                             <van-icon :name="order60" size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover" placement="bottom" width="200" trigger="click"
+                        <el-popover
+                          popper-class="zpover"
+                          placement="bottom"
+                          width="200"
+                          trigger="click"
                           content="金牌店近30天未下单">
-                          <div v-if="item.storeLabels.noOrder" class="visitStoreIco" style="background-color: #fff"
+                          <div
+                            v-if="item.storeLabels.noOrder"
+                            class="visitStoreIco"
+                            style="background-color: #fff"
                             slot="reference">
                             <van-icon :name="order" size="26" />
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover" placement="bottom" width="200" trigger="click"
+                        <el-popover
+                          popper-class="zpover"
+                          placement="bottom"
+                          width="200"
+                          trigger="click"
                           content="本店本月进过专业时时丽">
-                          <div class="visitStoreIco" v-if="item.storeLabels.zyssl" style="background-color: #ed5c68"
+                          <div
+                            class="visitStoreIco"
+                            v-if="item.storeLabels.zyssl"
+                            style="background-color: #ed5c68"
                             slot="reference">
                           </div>
                         </el-popover>
-                        <el-popover popper-class="zpover zpover1" placement="bottom" width="200" trigger="click"
+                        <el-popover
+                          popper-class="zpover zpover1"
+                          placement="bottom"
+                          width="200"
+                          trigger="click"
                           content="本店本月进过超好贴">
-                          <div v-if="item.storeLabels.chtczj" class="visitStoreIco" style="background-color: #0057ba"
+                          <div
+                            v-if="item.storeLabels.chtczj"
+                            class="visitStoreIco"
+                            style="background-color: #0057ba"
                             slot="reference">
                           </div>
                         </el-popover>
-                        <el-popover placement="bottom" popper-class="zpover zpover1 zpover1sb"
-                          :disabled="!item.userVisitTimesMap" trigger="click">
-                          <div v-if="item.storeLabels.visitTimes && item.storeLabels.visitTimes > 0"
-                            class="visitStoreIco" slot="reference" style="background-color: #fff; position: relative">
-                            <p style="
-                          width: 100%;
-                          position: absolute;
-                          z-index: 10;
-                          top: -2px;
-                          margin: 0;
-                          text-align: center;
-                          font-size: 12px;
-                        ">
+                        <el-popover
+                          placement="bottom"
+                          popper-class="zpover zpover1 zpover1sb"
+                          :disabled="!item.userVisitTimesMap"
+                          trigger="click">
+                          <div
+                            v-if="item.storeLabels.visitTimes && item.storeLabels.visitTimes > 0"
+                            class="visitStoreIco"
+                            slot="reference"
+                            style="background-color: #fff; position: relative">
+                            <p
+                              style="
+                                width: 100%;
+                                position: absolute;
+                                z-index: 10;
+                                top: -2px;
+                                margin: 0;
+                                text-align: center;
+                                font-size: 12px;
+                              ">
                               {{ item.storeLabels.visitTimes }}
                             </p>
                             <!-- A级金牌店拜访次数少于needVisitNum 需要拜访的次数 -->
-                            <van-icon :name="require('@/assets/ordernumRed.png')" size="26" v-if="
-                              item.storeLabels.storeA &&
-                              item.needVisitNum &&
-                              item.storeLabels.visitTimes < item.needVisitNum
-                            " />
+                            <van-icon
+                              :name="require('@/assets/ordernumRed.png')"
+                              size="26"
+                              v-if="
+                                (item.storeLabels.storeA || item.storeLabels.storeS) &&
+                                item.needVisitNum &&
+                                item.storeLabels.visitTimes < item.needVisitNum
+                              " />
                             <!-- 其他门店拜访 -->
                             <van-icon :name="require('@/assets/ordernum.png')" size="26" v-else />
                           </div>
-                          <p style="text-align: center; background: #fff; color: #000; padding: 5px 0">
+                          <p
+                            style="
+                              text-align: center;
+                              background: #fff;
+                              color: #000;
+                              padding: 5px 0;
+                            ">
                             本店本月已拜访过{{ item.storeLabels.visitTimes }}次
                           </p>
-                          <p v-if="item.storeLabels.storeA && item.needVisitNum"
-                            style="text-align: center; background: #fff; color: red; padding: 5px 0">
-                            A级金牌店拜访标准:1月{{ item.needVisitNum }}次
+                          <p
+                            v-if="
+                              (item.storeLabels.storeA || item.storeLabels.storeS) &&
+                              item.needVisitNum
+                            "
+                            style="
+                              text-align: center;
+                              background: #fff;
+                              color: red;
+                              padding: 5px 0;
+                            ">
+                            <span v-if="item.storeLabels.storeA">A</span>
+                            <span v-if="item.storeLabels.storeS">S</span>
+                            级金牌店拜访标准:1月{{ item.needVisitNum }}次
                           </p>
                           <el-table :data="item.userVisitTimesMap" border max-height="180px">
                             <el-table-column label="业务员" prop="userName" />
@@ -168,38 +291,55 @@
                     </div>
                     <div class="info">
                       类型:{{ item.storeCategory }}&nbsp;
-                      <el-popover popper-class="zpover zpover6" placement="bottom-start" trigger="click">
+                      <el-popover
+                        popper-class="zpover zpover6"
+                        placement="bottom-start"
+                        trigger="click">
                         <div>
                           <p>
                             本店经营品项指导:
-                            <a @click="linkimg(item)" style="text-decoration: underline">点击查看</a>
+                            <a @click="linkimg(item)" style="text-decoration: underline"
+                              >点击查看</a
+                            >
                           </p>
                         </div>
                         <van-icon name="question-o" size="18" slot="reference" />
                       </el-popover>
                     </div>
                     <div class="info" v-if="item.telephone" @click="buryingPointFn(item)">
-                      联系电话:<a style="color: #0057ba; font-weight: bold; text-decoration: underline"
-                        :href="'tel:' + item.telephone">{{
-                        item.telephone }}<van-icon name="phone" /></a>
+                      联系电话:<a
+                        style="color: #0057ba; font-weight: bold; text-decoration: underline"
+                        :href="'tel:' + item.telephone"
+                        >{{ item.telephone }}<van-icon name="phone"
+                      /></a>
                     </div>
                     <div class="info">
                       地址:{{ item.addressLine }}
-                      <img v-if="item.storeLonExist" style="width: 36px" :src="sbpmdh" @click="linkapp(item)" />
+                      <img
+                        v-if="item.storeLonExist"
+                        style="width: 36px"
+                        :src="sbpmdh"
+                        @click="linkapp(item)" />
                     </div>
                     <!-- 潜在店不显示经销商 -->
                     <template v-if="item.sfaStoreType.type != 'qzd'">
                       <!-- 分销店 -->
-                      <template v-if="
-                        item.sfaStoreType &&
-                        item.sfaStoreType.type == 'fxd' &&
-                        item.sfaStoreChainsContactList
-                      ">
+                      <template
+                        v-if="
+                          item.sfaStoreType &&
+                          item.sfaStoreType.type == 'fxd' &&
+                          item.sfaStoreChainsContactList
+                        ">
                         <div class="info" v-if="typeShow">
                           经销商:
-                          <div class="TCFXListItem" v-for="(item, index) in item.sfaStoreChainsContactList"
+                          <div
+                            class="TCFXListItem"
+                            v-for="(item, index) in item.sfaStoreChainsContactList"
                             :key="index">
-                            <el-popover popper-class="zpover zpoverStoreztype" placement="bottom-start" trigger="click">
+                            <el-popover
+                              popper-class="zpover zpoverStoreztype"
+                              placement="bottom-start"
+                              trigger="click">
                               <div>
                                 <div>{{ item.chainCode }}</div>
                                 <div>{{ item.chainName }}</div>
@@ -340,19 +480,16 @@ export default {
               signature: qiyeData.signature, // 必填,签名,见附录-JS-SDK使用权限签名算法
               jsApiList: ['launchMiniprogram'], //必填,传入需要使用的接口名称
               success: function () {
-                wx.invoke(
-                  'launchMiniprogram',
-                  {
-                    appid: 'wx238bbb5f6d958414',
-                    path:
-                      'pages/relayStation/relayStation?latitude=' +
-                      poind.lat +
-                      '&longitude=' +
-                      poind.lon +
-                      '&name=' +
-                      val.addressLine,
-                  },
-                );
+                wx.invoke('launchMiniprogram', {
+                  appid: 'wx238bbb5f6d958414',
+                  path:
+                    'pages/relayStation/relayStation?latitude=' +
+                    poind.lat +
+                    '&longitude=' +
+                    poind.lon +
+                    '&name=' +
+                    val.addressLine,
+                });
               },
               fail: function (res) {
                 if (res.errMsg.indexOf('function not exist') > -1) {

+ 11 - 3
src/views/storeManagement/index.vue

@@ -85,6 +85,10 @@
                     class="JPABC"
                     :src="require('@/assets/Icon/storeE.png')"
                     v-if="item.storeLabels.storeE" />
+                  <img
+                    class="JPABC"
+                    :src="require('@/assets/Icon/storeS.png')"
+                    v-if="item.storeLabels.storeS" />
                 </template>
                 <span class="btn" :data-clipboard-text="item.storeCode">
                   <span>{{ item.storeName }}</span>
@@ -286,7 +290,7 @@
                         :name="require('@/assets/ordernumRed.png')"
                         size="26"
                         v-if="
-                          item.storeLabels.storeA &&
+                          (item.storeLabels.storeA || item.storeLabels.storeS) &&
                           item.needVisitNum &&
                           item.storeLabels.visitTimes < item.needVisitNum
                         " />
@@ -296,9 +300,13 @@
                       本店本月已拜访过{{ item.storeLabels.visitTimes }}次
                     </p>
                     <p
-                      v-if="item.storeLabels.storeA && item.needVisitNum"
+                      v-if="
+                        (item.storeLabels.storeA || item.storeLabels.storeS) && item.needVisitNum
+                      "
                       style="text-align: center; background: #fff; color: red; padding: 5px 0">
-                      A级金牌店拜访标准:1月{{ item.needVisitNum }}次
+                      <span v-if="item.storeLabels.storeA">A</span>
+                      <span v-if="item.storeLabels.storeS">S</span>
+                      级金牌店拜访标准:1月{{ item.needVisitNum }}次
                     </p>
                     <el-table :data="item.userVisitTimesMap" border max-height="180px">
                       <el-table-column label="业务员" prop="userName" />

+ 2 - 2
src/views/week/dailyDetails.vue

@@ -870,7 +870,7 @@ export default {
     formatter(value) {
       return value.replace(
         /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/gi,
-        ''
+        '',
       );
     },
     getDetailById() {
@@ -920,7 +920,7 @@ export default {
                 for (let y = 0; y < sfaReportCustomCollections.length; y++) {
                   let custom = this.shareReportConfig.filter(
                     (val) =>
-                      val.dictValue == sfaReportCustomCollections[y].reportCustomCollectionName
+                      val.dictValue == sfaReportCustomCollections[y].reportCustomCollectionName,
                   );
                   if (custom.length) {
                     custom[0].content = sfaReportCustomCollections[y].answerValue;