Browse Source

Merge branch 'feature_20250115_提示列拜访,建店,色卡表格,切换时报错bug修改' into uat(dev)

zhujindu 10 months ago
parent
commit
503bc5a6af

+ 3 - 0
src/views/deviceWithin/storeVisit.vue

@@ -442,6 +442,9 @@ export default {
               locationCity: '',
               locationRemark: addresses.recommend,
               locationAccuracy: that.urlParameter.PointSum,
+              province: address_component.province,
+              city: address_component.city,
+              district: address_component.district,
             };
             that.locationAccuracy = that.urlParameter.PointSum;
             that.city = '';

+ 6 - 5
src/views/home/hintTabPage/hintDetail.vue

@@ -278,11 +278,12 @@ export default {
   },
   methods: {
     rowKey(row) {
-      if (this.fromType == 'noVisit' || this.fromType == 'createStore') {
-        return row['onlyId'];
-      } else if (this.fromType == 'pantone') {
-        return row['warehouseCode'];
-      }
+      return row['onlyId'] || row['warehouseCode'];
+      // if (this.fromType == 'noVisit' || this.fromType == 'createStore') {
+      //   return row['onlyId'];
+      // } else if (this.fromType == 'pantone') {
+      //   return row['warehouseCode'];
+      // }
     },
     setTabsItem() {
       this.tabsItem = [