Merge branch 'feature_20250116_提示类建店指标跳转页' into release

src/api/home.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+
+// 提示类建店未完工、未结案列表信息
+export function getStoreInfos(query) {
+  return request({
+    url: '/mobile/storeStatistics/getStoreInfos',
+    method: 'get',
+    params: query,
+  });
+}

src/layout/index.vue

@@ -1,8 +1,12 @@
 <template>
   <div class="container bgcolor">
-    <keep-alive>
+    <!-- <keep-alive>
       <router-view :key="$route.fullPath" />
+    </keep-alive> -->
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
     </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view>
   </div>
 </template>
 <script>

src/router/index.js

@@ -69,6 +69,16 @@ const router = new VueRouter({
           meta: { title: '提示类-业务员未领取色卡门店 ' },
           component: () => import('@/views/home/hintTabPage/pantoneNoGet.vue'),
         },
+        {
+          path: '/unCreateStore',
+          name: 'unCreateStore',
+          meta: { title: '提示类-业务员建店未完成页面' },
+          component: () => import('@/views/home/hintTabPage/unCreateStore.vue'),
+          meta: {
+            keepAlive: false,
+            title: '提示类-业务员建店未完成页面',
+          },
+        },
       ],
     },
     {

src/store/getters.js

@@ -2,5 +2,6 @@ const getters = {
   userInfo: (state) => state.user.userInfo,
   refreshClewPage: (state) => state.isRefreshPage.refreshClewPage,
   storeType: (state) => state.user.storeType,
+  activaCreateTypeStore: (state) => state.user.activaCreateTypeStore,
 };
 export default getters;

src/store/modules/user.js

@@ -3,7 +3,8 @@ import { getMobileUserInfo, getDictOption } from '@/api/index';
 const user = {
   state: {
     userInfo: null,
-    activaTypeStore: null,
+    activaTypeStore: null, //未拜访门店
+    activaCreateTypeStore: null, //建店未完工、未结案门店
     storeType: [],
   },
 
@@ -20,6 +21,9 @@ const user = {
     SET_STORE_TYPE: (state, value) => {
       state.storeType = value;
     },
+    SET_ACTIVA_CREATE_TYPE_STORE: (state, value) => {
+      state.activaCreateTypeStore = value;
+    },
   },
 
   actions: {
@@ -50,6 +54,10 @@ const user = {
     setActivaTypeStore({ commit }, value) {
       commit('SET_ACTIVA_TYPE_STORE', value);
     },
+    // 储存提示类-建店-从那个店铺类型进入未完工、未结案列表
+    activaCreateTypeStore({ commit }, value) {
+      commit('SET_ACTIVA_CREATE_TYPE_STORE', value);
+    },
   },
 };
 

src/utils/index.js

@@ -217,3 +217,41 @@ export function verifyStoreType(dictValue) {
   let remarkType = storeData ? JSON.parse(storeData.remark) : null;
   return remarkType;
 }
+
+export function getMonthCommon() {
+  let timeData = '';
+  // 获取当前日期
+  var currentDate = new Date();
+  // 获取当前月份
+  var currentMonth = currentDate.getMonth();
+  var previousMonthDate1 = new Date();
+  if (currentDate.getDate() == 1) {
+    previousMonthDate1.setMonth(currentMonth - 1);
+  }
+  var previousMonth1 = previousMonthDate1.getMonth();
+  var previousYear1 = previousMonthDate1.getFullYear();
+  // 计算前三个月的年份和月份
+  var previousMonthDate = new Date();
+  if (currentDate.getDate() == 1) {
+    previousMonthDate.setMonth(currentMonth - 3);
+  } else {
+    previousMonthDate.setMonth(currentMonth - 2);
+  }
+  var previousMonth = previousMonthDate.getMonth();
+  var previousYear = previousMonthDate.getFullYear();
+  //前三个月
+  if (previousYear1 == previousYear) {
+    var formattedPreviousMonth1 = previousYear1 + '-' + (previousMonth1 + 1);
+    // 格式化年份和月份
+    var formattedPreviousMonth = previousYear + '-' + (previousMonth + 1);
+    timeData =
+      formattedPreviousMonth.split('-')[1] + '-' + formattedPreviousMonth1.split('-')[1] + '月';
+  } else {
+    var formattedPreviousMonth1 = previousYear1 + '年' + (previousMonth1 + 1) + '月';
+    // .toString().padStart(2, '0');
+    // 格式化年份和月份
+    var formattedPreviousMonth = previousYear + '年' + (previousMonth + 1) + '月';
+    timeData = formattedPreviousMonth + '-' + formattedPreviousMonth1;
+  }
+  return timeData;
+}

src/views/home/hintTabPage/noVisit.vue

@@ -43,7 +43,7 @@
                 </div>
               </div>
             </template>
-            <template v-else><div style="text-align: center">暂无数据</div></template>
+            <van-empty description="暂无数据" v-else />
           </div>
         </van-collapse-item>
       </van-collapse>

src/views/home/hintTabPage/unCreateStore.vue

@@ -0,0 +1,478 @@
+<template>
+  <div class="unCreateStore">
+    <div class="header">
+      <van-nav-bar class="navBar" title="建店" left-arrow @click-left="onClickLeft" />
+    </div>
+    <div class="content">
+      <van-collapse v-model="activeName" accordion @change="collapseCange">
+        <van-collapse-item v-for="(val, key, ind) in list" :key="ind" :name="key">
+          <template #title>
+            <div class="title">{{ key | storeType }}</div>
+            <div class="num">{{ val ? val.length : 0 }}家</div>
+          </template>
+          <div class="itemContent">
+            <template v-if="val && val.length">
+              <div class="item" v-for="(item, index) in val" :key="index">
+                <van-cell>
+                  <div class="card">
+                    <div></div>
+                    <div class="title" style="padding-right: 74px">
+                      <span class="btn" :data-clipboard-text="item.storeCode">
+                        <span>{{ item.storeName }}</span>
+                        (<span style="color: #0057ba">{{ item.storeCode }}</span
+                        >)
+                        <van-icon
+                          :name="require('@/assets/paste.png')"
+                          color="#ee0a24"
+                          size="20"
+                          style="top: 6px; margin-left: 4px" />
+                      </span>
+                      <!-- validFlag: 0正常门店，1无效门店，2临时门店 -->
+                      <span
+                        v-if="item.validFlag == 2"
+                        style="
+                          display: inline-block;
+                          border-radius: 100px;
+                          width: 20px;
+                          text-align: center;
+                          color: orange;
+                          font-weight: normal;
+                        "
+                        >临</span
+                      >
+                      <!-- "approvalStatus": 1:已结案;0:未结案， -->
+                      <!-- "processApprovalStatus": 审批状态（0=未提交，1=已提交待审核，2=审批通过，3=审批拒绝） -->
+                      <template v-if="item.approvalStatus == 0 && item.validFlag == 0">
+                        <span class="statusIcon submit" v-if="item.processApprovalStatus == 1"
+                          >已提交</span
+                        >
+                        <span class="statusIcon noSubmit" v-if="item.processApprovalStatus == 0"
+                          >未提交</span
+                        >
+                      </template>
+                      <van-button
+                        type="info"
+                        size="small"
+                        plain
+                        class="centerBtn ctns"
+                        @click="storeDetailFn(item.storeId)">
+                        客户信息
+                        <van-icon name="arrow" />
+                      </van-button>
+                    </div>
+                    <div class="info" style="position: relative">
+                      联系人：{{ item.contactName }}
+                      <div
+                        style="position: absolute; bottom: 0px; right: 0px"
+                        v-if="item.storeLabels">
+                        <el-popover
+                          popper-class="zpover zpover6"
+                          placement="bottom"
+                          trigger="click">
+                          <div>
+                            <p>
+                              本店{{ timeData }}下单SKU数：<a
+                                @click="linkList(item)"
+                                style="text-decoration: underline"
+                                >点击查看详情</a
+                              >
+                            </p>
+                          </div>
+                          <div
+                            class="visitStoreIco"
+                            v-if="item.storeLabels.zysslNums"
+                            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="require('@/assets/ord.png')" size="26" />
+                          </div>
+                        </el-popover>
+                        <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(';')">
+                              {{ tt }}
+                            </p>
+                          </div>
+                          <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="200"
+                          trigger="click"
+                          content="同城店近60天未下单">
+                          <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"
+                          content="金牌店近30天未下单">
+                          <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"
+                          content="本店本月进过专业时时丽">
+                          <div
+                            v-if="item.storeLabels.zyssl"
+                            class="visitStoreIco"
+                            style="background-color: #ed5c68"
+                            slot="reference">
+                            专
+                          </div>
+                        </el-popover>
+                        <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"
+                            slot="reference">
+                            超
+                          </div>
+                        </el-popover>
+                        <el-popover
+                          placement="bottom"
+                          popper-class="zpover zpover1 zpover1sb"
+                          trigger="click"
+                          :content="'本店本月已拜访过' + item.storeLabels.visitTimes + '次'">
+                          <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>
+                            <van-icon :name="ordernum" size="26" />
+                          </div>
+                          <el-table :data="item.userVisitTimesMap" border max-height="180px">
+                            <el-table-column label="业务员" prop="userName" />
+                            <el-table-column label="拜访次数" prop="visitTimes" />
+                          </el-table>
+                        </el-popover>
+                      </div>
+                    </div>
+                    <div class="info">
+                      类型：{{ item.storeCategoryName }}&nbsp;
+                      <el-popover
+                        popper-class="zpover zpover6"
+                        placement="bottom-start"
+                        trigger="click">
+                        <div>
+                          <p>
+                            本店经营品项指导:
+                            <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">联系电话：{{ item.telephone }}</div>
+                    <div class="info">地址：{{ item.addressLine }}</div>
+                    <!-- 分销店 -->
+                    <template
+                      v-if="
+                        item.sfaStoreType &&
+                        item.sfaStoreType.type == 'fxd' &&
+                        item.sfaStoreChainsContactList
+                      ">
+                      <div class="info">
+                        经销商：
+                        <div
+                          class="TCFXListItem"
+                          v-for="(item, index) in item.sfaStoreChainsContactList">
+                          <el-popover
+                            popper-class="zpover zpoverStoreztype"
+                            placement="bottom-start"
+                            trigger="click">
+                            <div>
+                              <div>{{ item.chainCode }}</div>
+                              <div>{{ item.chainName }}</div>
+                            </div>
+                            <div slot="reference" :key="index">
+                              {{ item.categoryDescribe }}
+                            </div>
+                          </el-popover>
+                        </div>
+                      </div>
+                    </template>
+                    <template v-else>
+                      <div class="info">经销商：{{ item.chainName }}</div>
+                    </template>
+                  </div>
+                </van-cell>
+              </div>
+            </template>
+            <van-empty description="暂无数据" v-else />
+          </div>
+        </van-collapse-item>
+      </van-collapse>
+    </div>
+  </div>
+</template>
+<script>
+import { getStoreInfos } from '@/api/home';
+import { mapState } from 'vuex';
+import store from '@/store';
+import { getMonthCommon } from '@/utils';
+export default {
+  name: 'unCreateStore',
+  computed: {
+    ...mapState({
+      activaCreateTypeStore: (state) => state.user.activaCreateTypeStore,
+    }),
+  },
+  data() {
+    return {
+      activeName: '',
+      list: {},
+      TXPiont: {}, //腾讯定位数据
+      TXisBD: {}, // 腾讯定位数据转百度
+      activatStoreVal: {}, //当前点击门店数据
+      visitRoutePath: '', //拜访页面路径
+      clickIsFlage: true,
+      timeData: '',
+    };
+  },
+  filters: {
+    storeType(value) {
+      let type = '';
+      if (value == 'keKongAbnormalNum') {
+        type = '可控店45天未结案列表';
+      } else if (value == 'jinPaiUnfinishedNum') {
+        type = '金牌店7天未完工列表';
+      } else if (value == 'jinPaiAbnormalNum') {
+        type = '金牌店30天未结案列表';
+      } else if (value == 'TuLiaoAbnormalNum') {
+        type = '同城分销-涂料店7天未结案列表';
+      } else if (value == 'QiTaAbnormalNum') {
+        type = '同城分销-其他店7天未结案列表';
+      }
+      return type;
+    },
+  },
+  created() {
+    this.timeData = getMonthCommon();
+    this.getList();
+    this.activeName = this.activaCreateTypeStore || '';
+  },
+  methods: {
+    collapseCange(value) {
+      store.dispatch('activaCreateTypeStore', value);
+    },
+    getList() {
+      this.toastLoading(0, '加载中...', true);
+      getStoreInfos()
+        .then((res) => {
+          this.toastLoading().clear();
+          this.list = res.data;
+          console.log(this.list);
+        })
+        .catch(() => {
+          this.toastLoading().clear();
+        });
+    },
+    storeDetailFn(id) {
+      this.$router.push({
+        path: '/storeDetail',
+        query: { id: id },
+      });
+    },
+    onClickLeft() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/* Base container styles */
+.unCreateStore {
+  height: 100%;
+  width: 100%;
+
+  .content {
+    padding: 8px 10px;
+  }
+}
+
+/* Store item styles */
+.item {
+  padding: 8px 10px;
+  margin: 10px 0;
+  background: #fff;
+
+  .van-cell {
+    padding: 0;
+
+    &__right-icon {
+      height: 144px;
+      line-height: 144px;
+      margin-right: 10px;
+    }
+  }
+}
+
+/* Card styles */
+.card {
+  box-sizing: border-box;
+
+  .title {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+    line-height: 30px;
+  }
+
+  .info {
+    font-size: 14px;
+    color: #909090;
+    line-height: 26px;
+  }
+}
+
+/* Icon styles */
+.visitStoreIco {
+  float: left;
+  width: 26px;
+  text-align: center;
+  background-color: #ffba13;
+  color: #fff;
+  border-radius: 100%;
+  margin-left: 14px;
+  line-height: 26px;
+  height: 26px;
+}
+
+/* Button styles */
+.centerBtn {
+  display: block;
+  color: #0057ba;
+  border-radius: 5px;
+  padding: 0 6px;
+  height: 28px;
+
+  &.ctns {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 80px;
+  }
+}
+
+/* Status styles */
+.statusIcon {
+  padding: 3px;
+  font-size: 12px;
+  margin: 0 3px;
+  color: #fff;
+  display: inline-block;
+  height: 20px;
+  line-height: 16px;
+  vertical-align: -1px;
+
+  &.submit {
+    background: #ffba13;
+  }
+
+  &.noSubmit {
+    background: #f11818;
+  }
+}
+
+/* List item styles */
+.TCFXListItem {
+  display: inline-block;
+  border: 1px solid #ccc;
+  padding: 3px 5px;
+  margin: 0 5px;
+  border-radius: 6px;
+}
+
+/* Collapse styles */
+.van-collapse-item {
+  border-bottom: 1px solid #dcdcdc;
+}
+</style>
+<style lang="scss">
+.unCreateStore {
+  .van-cell__title {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+    display: flex;
+    justify-content: space-between;
+    .num {
+      color: #909090;
+      margin-right: 5px;
+    }
+  }
+  .van-collapse-item__wrapper {
+    border-top: 1px solid #dcdcdc;
+  }
+  .van-collapse-item__title--expanded {
+    position: sticky;
+    top: 0px;
+    z-index: 10;
+  }
+  .van-collapse-item__content {
+    background-color: unset;
+    padding: 0;
+  }
+}
+</style>

src/views/home/hintTabPage/visitPage.vue

@@ -97,9 +97,12 @@ export default {
         } else if (this.fromType == 'createStore') {
           // 进入我的-我的客户（storemanagementlist）
           // 1：未完工；2：未结案
-          let storeStatus = list.rightTable.indexOf('未完工') != -1 ? '1' : '2';
-          localStorage.setItem('storeStatus', storeStatus);
-          this.$router.push({ path: '/storemanagementlist', query: { storeStatus: storeStatus } });
+          // let storeStatus = list.rightTable.indexOf('未完工') != -1 ? '1' : '2';
+          // localStorage.setItem('storeStatus', storeStatus);
+          // this.$router.push({ path: '/storemanagementlist', query: { storeStatus: storeStatus } });
+          // 2025.01.16 销售员 建店进入新建页面 unCreateStore
+          store.dispatch('activaCreateTypeStore', list.rightProp);
+          this.$router.push({ path: '/unCreateStore' });
         }
       } else {
         // 销售部主管和大区负责人跳转统计页面

src/views/storeManagement/index.vue

@@ -400,6 +400,7 @@ export default {
         district: '',
         timeData: '',
       },
+      timeData: '',
       approvalStatus: '',
       processApprovalStatus: '',
       typeOption: [
@@ -521,7 +522,6 @@ export default {
       } else {
         previousMonthDate.setMonth(currentMonth - 2);
       }
-      1;
       var previousMonth = previousMonthDate.getMonth();
       var previousYear = previousMonthDate.getFullYear();
 

src/views/storeManagement/storeDetail.vue

@@ -41,7 +41,7 @@
       </van-nav-bar>
     </div>
     <!--主体内容-->
-    <div style="margin-top: 44px; padding-bottom: 50px" v-if="pageShow">
+    <div style="margin-top: 44px; padding-bottom: 50px" v-if="list">
       <van-dialog title="门店位置">
         <mapmarker :info="list"></mapmarker>
       </van-dialog>
@@ -575,7 +575,6 @@ export default {
       markers: undefined,
       markers1: undefined,
       marker: undefined,
-      pageShow: false,
       mapsearchlist: [],
       map: '',
       img: '',
@@ -1219,175 +1218,177 @@ export default {
       ImagePreview(val.split(','));
     },
     getStoreType() {
+      this.toastLoading(0, '加载中...', true);
       // 先授权
-      getTicketFun().then(() => {
-        if (localStorage.getItem('storeType') == '2') {
-          this.DIYshow = true;
-          getStoreyslTypeList({}).then((res) => {
-            this.storeTypeList = res.data;
-            this.getDetail();
-          });
-        } else {
-          this.DIYshow = false;
-          getStoreTypeList({}).then((res) => {
-            this.storeTypeList = res.data;
-            this.getDetail();
-          });
-        }
-      });
+      getTicketFun()
+        .then(() => {
+          if (localStorage.getItem('storeType') == '2') {
+            this.DIYshow = true;
+            getStoreyslTypeList({}).then((res) => {
+              this.storeTypeList = res.data;
+              this.getDetail();
+            });
+          } else {
+            this.DIYshow = false;
+            getStoreTypeList({}).then((res) => {
+              this.storeTypeList = res.data;
+              this.getDetail();
+            });
+          }
+        })
+        .catch(() => {
+          this.toastLoading().clear();
+        });
     },
     getDetail() {
-      this.pageShow = false;
       this.lat = '';
       this.lon = '';
-      let loading1 = this.$toast.loading({
-        duration: 0,
-        message: '加载中...',
-        forbidClick: true,
-      });
-      getById({ storeId: this.$route.query.id }).then((res) => {
-        loading1.clear();
-        localStorage.setItem('locationRemark', res.data.addressLine);
-        localStorage.setItem('orgName', res.data.orgName);
-        localStorage.setItem('chainName', res.data.storeName);
-        if (res.code == 200) {
-          if (res.data.lat != null) {
-            this.lat = res.data.lat;
-            this.lon = res.data.lon;
-          }
-          this.list = res.data;
-          if (this.list.imgSed && this.list.imgSed != '') {
-            this.displayImg = this.list.imgSed.split(',');
-          } else {
-            this.displayImg = [];
-          }
-          if (
-            this.verifyStoreType(this.list.storeCategory) &&
-            this.verifyStoreType(this.list.storeCategory).type == 'fxd'
-          ) {
-            this.cityABStore = true;
-          } else {
-            this.cityABStore = false;
-          }
-          if (
-            res.data.province != null &&
-            res.data.province != undefined &&
-            res.data.province != ''
-          ) {
-            this.getStreetQuery('1');
-          }
-          if (res.data.city != null && res.data.city != undefined && res.data.city != '') {
-            this.getStreetQuery('2');
-          }
-          if (
-            res.data.district != null &&
-            res.data.district != undefined &&
-            res.data.district != ''
-          ) {
-            this.getStreetQuery('3');
-          }
-          if (this.list.carShopImgList != null) {
-          } else {
-            this.list.carShopImgList = [];
-          }
-          if (
-            this.verifyStoreType(this.list.storeCategory) &&
-            this.verifyStoreType(this.list.storeCategory).type == 'fxd'
-          ) {
-            this.typeABshow = true;
-          } else {
-            this.typeABshow = false;
-          }
-          if (this.list.storeCategory == 'C917') {
-            this.GZAttributeFormShow = true;
-            this.dictTypeSJSFormShow = false;
-            this.dictTypeQGJZFormShow = false;
-            this.dictTypeFormShow = false;
-            this.dictTypeAFormShow = false;
-            this.typeABshow = false;
-            for (let k = 0; k < this.potentialCustomerTypeList.length; k++) {
-              if (this.potentialCustomerTypeList[k].dictCode == this.list.potentialCustomerType) {
-                this.list.potentialCustomerType = this.potentialCustomerTypeList[k].text;
+      getById({ storeId: this.$route.query.id })
+        .then((res) => {
+          localStorage.setItem('locationRemark', res.data.addressLine);
+          localStorage.setItem('orgName', res.data.orgName);
+          localStorage.setItem('chainName', res.data.storeName);
+          this.toastLoading().clear();
+          if (res.code == 200) {
+            if (res.data.lat != null) {
+              this.lat = res.data.lat;
+              this.lon = res.data.lon;
+            }
+            this.list = res.data;
+            if (this.list.imgSed && this.list.imgSed != '') {
+              this.displayImg = this.list.imgSed.split(',');
+            } else {
+              this.displayImg = [];
+            }
+            if (
+              this.verifyStoreType(this.list.storeCategory) &&
+              this.verifyStoreType(this.list.storeCategory).type == 'fxd'
+            ) {
+              this.cityABStore = true;
+            } else {
+              this.cityABStore = false;
+            }
+            if (
+              res.data.province != null &&
+              res.data.province != undefined &&
+              res.data.province != ''
+            ) {
+              this.getStreetQuery('1');
+            }
+            if (res.data.city != null && res.data.city != undefined && res.data.city != '') {
+              this.getStreetQuery('2');
+            }
+            if (
+              res.data.district != null &&
+              res.data.district != undefined &&
+              res.data.district != ''
+            ) {
+              this.getStreetQuery('3');
+            }
+            if (this.list.carShopImgList != null) {
+            } else {
+              this.list.carShopImgList = [];
+            }
+            if (
+              this.verifyStoreType(this.list.storeCategory) &&
+              this.verifyStoreType(this.list.storeCategory).type == 'fxd'
+            ) {
+              this.typeABshow = true;
+            } else {
+              this.typeABshow = false;
+            }
+            if (this.list.storeCategory == 'C917') {
+              this.GZAttributeFormShow = true;
+              this.dictTypeSJSFormShow = false;
+              this.dictTypeQGJZFormShow = false;
+              this.dictTypeFormShow = false;
+              this.dictTypeAFormShow = false;
+              this.typeABshow = false;
+              for (let k = 0; k < this.potentialCustomerTypeList.length; k++) {
+                if (this.potentialCustomerTypeList[k].dictCode == this.list.potentialCustomerType) {
+                  this.list.potentialCustomerType = this.potentialCustomerTypeList[k].text;
+                }
               }
+            } else {
+              this.GZAttributeFormShow = false;
             }
-          } else {
-            this.GZAttributeFormShow = false;
-          }
-          // if (this.list.storeCategory == '129081') {
-          //   this.dictTypeFormShow = true;
-          //   if (this.list.attribute3 != '0' && this.list.attribute3 != null) {
-          //     this.list.tcfxName = this.list.attribute3;
-          //   } else {
-          //     this.list.tcfxName = this.list.attribute5;
-          //   }
-          // }
-          if (
-            this.verifyStoreType(this.list.storeCategory) &&
-            this.verifyStoreType(this.list.storeCategory).type == 'fxd'
-          ) {
-            this.dictTypeFormShow = true;
-            for (var k = 0; k < this.TCFXList.length; k++) {
-              if (this.TCFXList[k].dictCode == this.list.tcfxName) {
-                this.list.tcfxName = this.TCFXList[k].text;
+            // if (this.list.storeCategory == '129081') {
+            //   this.dictTypeFormShow = true;
+            //   if (this.list.attribute3 != '0' && this.list.attribute3 != null) {
+            //     this.list.tcfxName = this.list.attribute3;
+            //   } else {
+            //     this.list.tcfxName = this.list.attribute5;
+            //   }
+            // }
+            if (
+              this.verifyStoreType(this.list.storeCategory) &&
+              this.verifyStoreType(this.list.storeCategory).type == 'fxd'
+            ) {
+              this.dictTypeFormShow = true;
+              for (var k = 0; k < this.TCFXList.length; k++) {
+                if (this.TCFXList[k].dictCode == this.list.tcfxName) {
+                  this.list.tcfxName = this.TCFXList[k].text;
+                }
               }
             }
-          }
 
-          if (this.list.storeCategory == 'sjs61') {
-            this.dictTypeFormShow = true;
-            for (var k = 0; k < this.SJSList.length; k++) {
-              if (this.SJSList[k].dictCode == this.list.tcfxName) {
-                this.list.tcfxName = this.SJSList[k].text;
+            if (this.list.storeCategory == 'sjs61') {
+              this.dictTypeFormShow = true;
+              for (var k = 0; k < this.SJSList.length; k++) {
+                if (this.SJSList[k].dictCode == this.list.tcfxName) {
+                  this.list.tcfxName = this.SJSList[k].text;
+                }
               }
             }
-          }
-          if (this.list.storeCategory == 'zyjz63') {
-            this.dictTypeFormShow = true;
-            for (var k = 0; k < this.QGJZist.length; k++) {
-              if (this.QGJZist[k].dictCode == this.list.tcfxName) {
-                this.list.tcfxName = this.QGJZist[k].text;
+            if (this.list.storeCategory == 'zyjz63') {
+              this.dictTypeFormShow = true;
+              for (var k = 0; k < this.QGJZist.length; k++) {
+                if (this.QGJZist[k].dictCode == this.list.tcfxName) {
+                  this.list.tcfxName = this.QGJZist[k].text;
+                }
               }
             }
-          }
-          if (this.list.storeCategory == 'C912') {
-            this.storeTypePOP = false;
-            this.storeName = '铭牌上项目名称';
-            this.address = '地址';
-          } else if (this.list.storeCategory == 'C917') {
-            this.storeTypePOP = false;
-            this.storeName = '名称';
-            this.address = '地址';
+            if (this.list.storeCategory == 'C912') {
+              this.storeTypePOP = false;
+              this.storeName = '铭牌上项目名称';
+              this.address = '地址';
+            } else if (this.list.storeCategory == 'C917') {
+              this.storeTypePOP = false;
+              this.storeName = '名称';
+              this.address = '地址';
+            } else {
+              this.storeTypePOP = true;
+              this.storeName = '名称';
+              this.address = '地址';
+            }
+            // 获取定位
+            getPosition()
+              .then((res) => {
+                let { TXisBD, resData } = res;
+                this.lat = TXisBD.lat;
+                this.lon = TXisBD.lon;
+                this.myLat = TXisBD.lat;
+                this.myLon = TXisBD.lon;
+                this.list.lon = TXisBD.lon;
+                this.list.lat = TXisBD.lat;
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+            // 同城店铺 未结案时获取
+            if (this.list.approvalStatus == 0 && this.cityABStore) {
+              // 获取门店订单
+              this.getStoreOrderList(this.list.storeCode);
+              // 获取审批历史
+              this.storeApprovaHistoryFun();
+            }
           } else {
-            this.storeTypePOP = true;
-            this.storeName = '名称';
-            this.address = '地址';
+            this.$toast.fail(res.msg);
           }
-          // 获取定位
-          getPosition()
-            .then((res) => {
-              let { TXisBD, resData } = res;
-              this.lat = TXisBD.lat;
-              this.lon = TXisBD.lon;
-              this.myLat = TXisBD.lat;
-              this.myLon = TXisBD.lon;
-              this.list.lon = TXisBD.lon;
-              this.list.lat = TXisBD.lat;
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-          // 同城店铺 未结案时获取
-          if (this.list.approvalStatus == 0 && this.cityABStore) {
-            // 获取门店订单
-            this.getStoreOrderList(this.list.storeCode);
-            // 获取审批历史
-            this.storeApprovaHistoryFun();
-          }
-          this.pageShow = true;
-        } else {
-          this.$toast.fail(res.msg);
-        }
-      });
+        })
+        .catch(() => {
+          this.toastLoading().clear();
+        });
     },
     // 获取门店订单
     getStoreOrderList(storeCode) {
@@ -1604,7 +1605,6 @@ export default {
       submitApproval({
         storeId: this.list.storeId, // 店铺id
       }).then((res) => {
-        this.toastLoading().clear();
         if (res.code == 200) {
           this.$toast.success('提交成功');
           this.getDetail();