Merge branch 'feature_20260327_门店筛选增加金牌店等级' into uat(dev)

# Conflicts:
#	src/components/filtrate.vue
#	src/views/deviceWithin/index.vue

src/components/filtrate.vue

@@ -46,7 +46,18 @@
         </p>
         <van-checkbox-group v-model="storeLabelTypes" direction="horizontal">
           <div v-if="otherbqShow" style="width: 100%">
-            <div class="checkbox" v-for="(item, index) in StoreLabels" :key="index">
+            <div class="checkbox" v-for="(item, index) in storeLabelsRegular" :key="index">
+              <van-checkbox :name="item.dictValue">{{ item.dictLabel }}</van-checkbox>
+            </div>
+            <div style="height: 2px; background-color: #f5f5f5; width: 100%; clear: both"></div>
+          </div>
+        </van-checkbox-group>
+        <p class="searchchecktitle" @click="otherjpdShow = !otherjpdShow">
+          &nbsp;金牌店等级<van-icon name="arrow-down" style="float: right" />
+        </p>
+        <van-checkbox-group v-model="jpdStoreLevelTypes" direction="horizontal">
+          <div v-if="otherjpdShow" style="width: 100%">
+            <div class="checkbox" v-for="(item, index) in jpdStoreLevels" :key="'jpd' + index">
               <van-checkbox :name="item.dictValue">{{ item.dictLabel }}</van-checkbox>
             </div>
             <div style="height: 2px; background-color: #f5f5f5; width: 100%; clear: both"></div>
@@ -167,6 +178,18 @@ export default {
         // this.CustomerName = '';
         if (val) {
           this.getStoreTypeList();
+          this.storeName = localStorage.getItem('outvstoreName') || '';
+          this.chainName = localStorage.getItem('outvchainName') || '';
+          this.chainCode = localStorage.getItem('outvchainCode') || '';
+          this.storeLabelTypes = (localStorage.getItem('outvstoreLabelTypes') || '')
+            .split(',')
+            .filter(Boolean);
+          this.jpdStoreLevelTypes = (localStorage.getItem('outvjpdStoreLevelTypes') || '')
+            .split(',')
+            .filter(Boolean);
+          this.result = (localStorage.getItem('outvstoreCategoryList') || '')
+            .split(',')
+            .filter(Boolean);
         }
       },
       deep: true,
@@ -185,6 +208,10 @@ export default {
       otherShow: false,
       otherbqShow: true,
       StoreLabels: [],
+      storeLabelsRegular: [],
+      jpdStoreLevels: [],
+      jpdStoreLevelTypes: [],
+      otherjpdShow: true,
       result: [],
       otherkkdShow: true,
       storeTypeLists: [],
@@ -203,7 +230,18 @@ export default {
       this.otherShow = false;
     }
   },
-  created() {},
+  created() {
+    this.storeName = localStorage.getItem('outvstoreName') || '';
+    this.chainName = localStorage.getItem('outvchainName') || '';
+    this.chainCode = localStorage.getItem('outvchainCode') || '';
+    this.storeLabelTypes = (localStorage.getItem('outvstoreLabelTypes') || '')
+      .split(',')
+      .filter(Boolean);
+    this.jpdStoreLevelTypes = (localStorage.getItem('outvjpdStoreLevelTypes') || '')
+      .split(',')
+      .filter(Boolean);
+    this.result = (localStorage.getItem('outvstoreCategoryList') || '').split(',').filter(Boolean);
+  },
   mounted() {
     this.getStoreLabels();
   },
@@ -212,9 +250,10 @@ export default {
       // flag 是否筛选列表
       let params = {};
       if (flag) {
+        var storeLabelTypes = this.storeLabelTypes.concat(this.jpdStoreLevelTypes);
         params = {
           chainCode: this.chainCode ? this.chainCode : '',
-          storeLabelTypes: this.storeLabelTypes.join(','),
+          storeLabelTypes: storeLabelTypes.join(','),
           storeCategoryList: this.storeCategoryList,
         };
       }
@@ -224,8 +263,17 @@ export default {
       e._isScroller = true;
     },
     onsets() {
+      localStorage.setItem('outvstoreName', '');
+      localStorage.setItem('outvchainName', '');
+      localStorage.removeItem('outvstoreLabelTypes');
+      localStorage.removeItem('outvjpdStoreLevelTypes');
+      localStorage.removeItem('outvstoreCategoryList');
+      localStorage.setItem('outvchainCode', '');
+      localStorage.setItem('lat', '');
+      localStorage.setItem('lon', '');
       this.result = [];
       this.storeLabelTypes = [];
+      this.jpdStoreLevelTypes = [];
       this.storeCategoryList = this.result.join(',');
       this.chainName = '';
       this.chainCode = '';
@@ -249,9 +297,17 @@ export default {
     onSearchm() {
       var StoreLabelsArr = [];
       for (var k = 0; k < this.storeLabelTypes.length; k++) {
-        for (var k1 = 0; k1 < this.StoreLabels.length; k1++) {
-          if (this.StoreLabels[k1].dictValue == this.storeLabelTypes[k]) {
-            StoreLabelsArr.push(this.StoreLabels[k1].dictLabel);
+        for (var k1 = 0; k1 < this.storeLabelsRegular.length; k1++) {
+          if (this.storeLabelsRegular[k1].dictValue == this.storeLabelTypes[k]) {
+            StoreLabelsArr.push(this.storeLabelsRegular[k1].dictLabel);
+          }
+        }
+      }
+      var jpdStoreLabelsArr = [];
+      for (var k = 0; k < this.jpdStoreLevelTypes.length; k++) {
+        for (var k1 = 0; k1 < this.jpdStoreLevels.length; k1++) {
+          if (this.jpdStoreLevels[k1].dictValue == this.jpdStoreLevelTypes[k]) {
+            jpdStoreLabelsArr.push(this.jpdStoreLevels[k1].dictLabel);
           }
         }
       }
@@ -263,6 +319,24 @@ export default {
           }
         }
       }
+      if (StoreLabelsArr.length > 0) {
+        buryingPoint({
+          systemModel: '计划内',
+          buryingPointType: 1,
+          buryingPointValue: StoreLabelsArr.join(','),
+          buryingPointName: '标签',
+          buryingPointPosition: '计划内',
+        });
+      }
+      if (jpdStoreLabelsArr.length > 0) {
+        buryingPoint({
+          systemModel: '计划内',
+          buryingPointType: 1,
+          buryingPointValue: jpdStoreLabelsArr.join(','),
+          buryingPointName: '金牌店等级',
+          buryingPointPosition: '计划内',
+        });
+      }
       if (this.chainName != '' && this.chainName != 'null') {
         buryingPoint({
           systemModel: '计划内',
@@ -275,6 +349,7 @@ export default {
       localStorage.setItem('outvstoreName', this.storeName);
       localStorage.setItem('outvchainName', this.chainName);
       localStorage.setItem('outvstoreLabelTypes', this.storeLabelTypes);
+      localStorage.setItem('outvjpdStoreLevelTypes', this.jpdStoreLevelTypes);
       localStorage.setItem('outvstoreCategoryList', this.result);
       localStorage.setItem('outvchainCode', this.chainCode);
       this.closePopup(true);
@@ -289,7 +364,9 @@ export default {
     },
     getStoreLabels() {
       getStoreLabels().then((res) => {
-        this.StoreLabels = res.data;
+        this.StoreLabels = res.data || [];
+        this.storeLabelsRegular = this.StoreLabels.filter((item) => item.ifJpdStoreLevel != '1');
+        this.jpdStoreLevels = this.StoreLabels.filter((item) => item.ifJpdStoreLevel == '1');
       });
     },
     getStoreTypeList() {

src/views/deviceOutside/index.vue

@@ -584,7 +584,18 @@
         </p>
         <van-checkbox-group v-model="storeLabelTypes" direction="horizontal">
           <div v-if="otherbqShow" style="width: 100%">
-            <div class="checkbox" v-for="(item, index) in StoreLabels" :key="index">
+            <div class="checkbox" v-for="(item, index) in storeLabelsRegular" :key="index">
+              <van-checkbox :name="item.dictValue">{{ item.dictLabel }}</van-checkbox>
+            </div>
+            <div style="height: 2px; background-color: #f5f5f5; width: 100%; clear: both"></div>
+          </div>
+        </van-checkbox-group>
+        <p class="searchchecktitle" @click="otherjpdShow = !otherjpdShow">
+          &nbsp;金牌店等级<van-icon name="arrow-down" style="float: right" />
+        </p>
+        <van-checkbox-group v-model="jpdStoreLevelTypes" direction="horizontal">
+          <div v-if="otherjpdShow" style="width: 100%">
+            <div class="checkbox" v-for="(item, index) in jpdStoreLevels" :key="'jpd' + index">
               <van-checkbox :name="item.dictValue">{{ item.dictLabel }}</van-checkbox>
             </div>
             <div style="height: 2px; background-color: #f5f5f5; width: 100%; clear: both"></div>
@@ -818,6 +829,10 @@ export default {
       storeCategoryList: '',
       result: [],
       StoreLabels: [],
+      storeLabelsRegular: [],
+      jpdStoreLevels: [],
+      jpdStoreLevelTypes: [],
+      otherjpdShow: true,
       CustomerName: '',
       lat: '',
       lon: '',
@@ -829,12 +844,26 @@ export default {
   },
   watch: {
     $route(to, from) {
+      if (from.path == '/deviceWithin/index') {
+        localStorage.setItem('outvstoreName', '');
+        localStorage.setItem('outvchainName', '');
+        localStorage.removeItem('outvstoreLabelTypes');
+        localStorage.removeItem('outvjpdStoreLevelTypes');
+        localStorage.removeItem('outvstoreCategoryList');
+        localStorage.setItem('outvchainCode', '');
+        localStorage.setItem('outvsortType', '');
+        localStorage.setItem('outsortParam', '');
+        localStorage.setItem('lat', '');
+        localStorage.setItem('lon', '');
+      }
       this.storeName = localStorage.getItem('outvstoreName');
       if (
         localStorage.getItem('outvchainName') &&
         localStorage.getItem('outvchainName') != 'null'
       ) {
         this.chainName = localStorage.getItem('outvchainName');
+      } else {
+        this.chainName = '';
       }
       if (localStorage.getItem('lat') != null) {
         this.lat = localStorage.getItem('lat');
@@ -843,12 +872,26 @@ export default {
         this.lat = '';
         this.lon = '';
       }
-      if (localStorage.getItem('outvstoreLabelTypes') != null) {
-        this.storeLabelTypes = localStorage.getItem('outvstoreLabelTypes').split(',');
+      const storedStoreLabels = localStorage.getItem('outvstoreLabelTypes');
+      if (storedStoreLabels != null && storedStoreLabels !== '') {
+        this.storeLabelTypes = storedStoreLabels
+          .split(',')
+          .map((it) => it.trim())
+          .filter((it) => it);
       } else {
         this.storeLabelTypes = [];
       }
 
+      const storedJpdStoreLevels = localStorage.getItem('outvjpdStoreLevelTypes');
+      if (storedJpdStoreLevels != null && storedJpdStoreLevels !== '') {
+        this.jpdStoreLevelTypes = storedJpdStoreLevels
+          .split(',')
+          .map((it) => it.trim())
+          .filter((it) => it);
+      } else {
+        this.jpdStoreLevelTypes = [];
+      }
+
       if (localStorage.getItem('outvstoreCategoryList') != null) {
         this.result = localStorage.getItem('outvstoreCategoryList').split(',');
         this.storeCategoryList = this.result.join(',');
@@ -903,11 +946,25 @@ export default {
     if (localStorage.getItem('outvchainName') && localStorage.getItem('outvchainName') != 'null') {
       this.chainName = localStorage.getItem('outvchainName');
     }
-    if (localStorage.getItem('outvstoreLabelTypes') != null) {
-      this.storeLabelTypes = localStorage.getItem('outvstoreLabelTypes').split(',');
+    const storedStoreLabels = localStorage.getItem('outvstoreLabelTypes');
+    if (storedStoreLabels != null && storedStoreLabels !== '') {
+      this.storeLabelTypes = storedStoreLabels
+        .split(',')
+        .map((it) => it.trim())
+        .filter((it) => it);
     } else {
       this.storeLabelTypes = [];
     }
+
+    const storedJpdStoreLevels = localStorage.getItem('outvjpdStoreLevelTypes');
+    if (storedJpdStoreLevels != null && storedJpdStoreLevels !== '') {
+      this.jpdStoreLevelTypes = storedJpdStoreLevels
+        .split(',')
+        .map((it) => it.trim())
+        .filter((it) => it);
+    } else {
+      this.jpdStoreLevelTypes = [];
+    }
     if (localStorage.getItem('outvstoreCategoryList') != null) {
       this.result = localStorage.getItem('outvstoreCategoryList').split(',');
       this.storeCategoryList = this.result.join(',');
@@ -1167,7 +1224,9 @@ export default {
     },
     getStoreLabels() {
       getStoreLabels().then((res) => {
-        this.StoreLabels = res.data;
+        this.StoreLabels = res.data || [];
+        this.storeLabelsRegular = this.StoreLabels.filter((item) => item.ifJpdStoreLevel != '1');
+        this.jpdStoreLevels = this.StoreLabels.filter((item) => item.ifJpdStoreLevel == '1');
       });
     },
     searchType(val) {
@@ -1200,6 +1259,7 @@ export default {
       this.noOrder = [];
       this.fxNoOrder = [];
       this.storeLabelTypes = [];
+      this.jpdStoreLevelTypes = [];
       this.storeCategoryList = this.result.join(',');
       this.chainName = '';
       this.chainCode = '';
@@ -1291,7 +1351,9 @@ export default {
         lat: that.lat,
         lon: that.lon,
         chainCode: this.chainCode ? this.chainCode : '',
-        storeLabelTypes: this.storeLabelTypes.join(','),
+        storeLabelTypes: [
+          ...new Set([...(this.storeLabelTypes || []), ...(this.jpdStoreLevelTypes || [])]),
+        ].join(','),
         pageNum: this.pageNum,
         storeCategoryList: this.storeCategoryList,
         pageSize: this.pageSize,
@@ -1370,7 +1432,9 @@ export default {
         lat: that.lat,
         lon: that.lon,
         chainCode: this.chainCode ? this.chainCode : '',
-        storeLabelTypes: this.storeLabelTypes.join(','),
+        storeLabelTypes: [
+          ...new Set([...(this.storeLabelTypes || []), ...(this.jpdStoreLevelTypes || [])]),
+        ].join(','),
         pageNum: this.pageNum,
         storeCategoryList: this.storeCategoryList,
         pageSize: this.pageSize,
@@ -2292,9 +2356,17 @@ export default {
       }
       var StoreLabelsArr = [];
       for (var k = 0; k < this.storeLabelTypes.length; k++) {
-        for (var k1 = 0; k1 < this.StoreLabels.length; k1++) {
-          if (this.StoreLabels[k1].dictValue == this.storeLabelTypes[k]) {
-            StoreLabelsArr.push(this.StoreLabels[k1].dictLabel);
+        for (var k1 = 0; k1 < this.storeLabelsRegular.length; k1++) {
+          if (this.storeLabelsRegular[k1].dictValue == this.storeLabelTypes[k]) {
+            StoreLabelsArr.push(this.storeLabelsRegular[k1].dictLabel);
+          }
+        }
+      }
+      var jpdStoreLabelsArr = [];
+      for (var k = 0; k < this.jpdStoreLevelTypes.length; k++) {
+        for (var k1 = 0; k1 < this.jpdStoreLevels.length; k1++) {
+          if (this.jpdStoreLevels[k1].dictValue == this.jpdStoreLevelTypes[k]) {
+            jpdStoreLabelsArr.push(this.jpdStoreLevels[k1].dictLabel);
           }
         }
       }
@@ -2316,6 +2388,15 @@ export default {
             buryingPointPosition: '我的筛选',
           });
         }
+        if (jpdStoreLabelsArr.length > 0) {
+          this.buryingPoint({
+            systemModel: '计划外',
+            buryingPointType: 1,
+            buryingPointValue: jpdStoreLabelsArr.join(','),
+            buryingPointName: '金牌店等级',
+            buryingPointPosition: '我的筛选',
+          });
+        }
         if (this.storeCategoryList.length > 0) {
           this.buryingPoint({
             systemModel: '计划外',
@@ -2353,6 +2434,15 @@ export default {
             buryingPointPosition: '销售部的门店筛选',
           });
         }
+        if (jpdStoreLabelsArr.length > 0) {
+          this.buryingPoint({
+            systemModel: '计划外',
+            buryingPointType: 1,
+            buryingPointValue: jpdStoreLabelsArr.join(','),
+            buryingPointName: '金牌店等级',
+            buryingPointPosition: '销售部的门店筛选',
+          });
+        }
         if (this.storeCategoryList != '') {
           this.buryingPoint({
             systemModel: '计划外',
@@ -2384,6 +2474,7 @@ export default {
       localStorage.setItem('outvstoreName', this.storeName);
       localStorage.setItem('outvchainName', this.chainName);
       localStorage.setItem('outvstoreLabelTypes', this.storeLabelTypes);
+      localStorage.setItem('outvjpdStoreLevelTypes', this.jpdStoreLevelTypes);
       localStorage.setItem('outvstoreCategoryList', this.result);
       localStorage.setItem('outvchainCode', this.chainCode == 'null' ? '' : this.chainCode);
       this.onSearch();

src/views/deviceWithin/index.vue

@@ -549,6 +549,7 @@
       :showFilter="showFilter"
       @closePopup="closePopup"
       :entry="0"></filtrate>
+      ref="filtrate"></filtrate>
     <tab-bar tabBarActive="deviceWithin"></tab-bar>
   </div>
 </template>
@@ -662,6 +663,22 @@ export default {
       if (from.path == '/deviceWithin/index' && to.path == '/storeVisitpage') {
         localStorage.setItem('startTime', new Date());
       }
+      if (from.path == '/outsidelist/index') {
+        localStorage.setItem('outvstoreName', '');
+        localStorage.setItem('outvchainName', '');
+        localStorage.removeItem('outvstoreLabelTypes');
+        localStorage.removeItem('outvjpdStoreLevelTypes');
+        localStorage.removeItem('outvstoreCategoryList');
+        localStorage.setItem('outvchainCode', '');
+        localStorage.setItem('outvsortType', '');
+        localStorage.setItem('outsortParam', '');
+        localStorage.setItem('lat', '');
+        localStorage.setItem('lon', '');
+        this.filterParams = {};
+        if (this.$refs.filtrate) {
+          this.$refs.filtrate.onsets();
+        }
+      }
     },
   },
   activated() {
@@ -888,16 +905,6 @@ export default {
       });
     },
     getUserInPlanList() {
-      localStorage.setItem('outvstoreName', '');
-      localStorage.setItem('outvchainName', '');
-      localStorage.removeItem('outvstoreLabelTypes');
-      localStorage.removeItem('outvstoreCategoryList');
-      localStorage.setItem('outvchainCode', '');
-      localStorage.setItem('outvstoreName', '');
-      localStorage.setItem('outvsortType', '');
-      localStorage.setItem('outsortParam', '');
-      localStorage.setItem('lat', '');
-      localStorage.setItem('lon', '');
       this.list = [];
       var postType = localStorage.getItem('postType');
       this.customerVisits = localStorage.getItem('customerVisits');

src/views/home/ABtarget.vue

@@ -731,6 +731,7 @@ export default {
       localStorage.setItem('outvstoreName', '');
       localStorage.setItem('outvchainName', '');
       localStorage.removeItem('outvstoreLabelTypes');
+      localStorage.removeItem('outvjpdStoreLevelTypes');
       localStorage.removeItem('outvstoreCategoryList');
       localStorage.setItem('outvchainCode', '');
       localStorage.setItem('outvstoreName', '');

src/views/home/HomeTarget.vue

@@ -271,6 +271,7 @@ export default {
       localStorage.setItem('outvstoreName', '');
       localStorage.setItem('outvchainName', '');
       localStorage.removeItem('outvstoreLabelTypes');
+      localStorage.removeItem('outvjpdStoreLevelTypes');
       localStorage.removeItem('outvstoreCategoryList');
       localStorage.setItem('outvchainCode', '');
       localStorage.setItem('outvstoreName', '');