修复经销商编辑营销区域显示bug

src/HManagement/clueManage/clue_import/modules/importClue.vue

@@ -44,6 +44,7 @@ export default {
       
       if (res.msg !== '成功') {
         this.errorurl = res.msg
+        window.open(res.msg,'_self')
       } else {
         this.errorurl = null
       }

src/HManagement/marketing/index.vue

@@ -22,8 +22,8 @@
         <areaInfo :areaInfo="areaInfo" class="normal-margin"></areaInfo>
         <div class="my-tabs" >
           <el-tabs v-model="activeName" type="card">
-            <el-tab-pane label="业务员信息" name="first"></el-tab-pane>
             <el-tab-pane label="经销商信息" name="second"></el-tab-pane>
+            <el-tab-pane label="业务员信息" name="first"></el-tab-pane>
           </el-tabs>
         </div>
         <!-- 业务员信息 -->
@@ -78,8 +78,10 @@ import delSaler from './saler/modules/del_saler.vue'
 import agent from './agent/list.vue'
 import delAgent from './agent/modules/del_agent.vue'
 import startAgent from './agent/modules/start_agent.vue'
+import { log } from '@antv/g2plot/lib/utils'
 
 export default {
+  name:'agentIndex',
   components:{
     areaTree,
     addArea,
@@ -96,7 +98,7 @@ export default {
   data () {
     return {
       areaInfo:{},
-      activeName:'first'
+      activeName:'second'
     }
   },
   methods:{
@@ -123,7 +125,7 @@ export default {
     },
     onAgentSuccess () {
       this.$refs.agent.query_agent(this.areaInfo.sa_saleareaid)
-    },
+    }
   }
 }
 
@@ -131,6 +133,9 @@ export default {
 <style>
 </style>
 <style scoped>
+*{
+  box-sizing: border-box;
+}
 .flex{
   display: flex;
 }

src/HManagement/roleManage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <add class="container normal-panel" style="margin-bottom:16px"></add>
+    <add class="container normal-panel" style="margin-bottom:16px" v-if="tool.checkAuth($route.name,'insert')"></add>
     <div class="container normal-panel">
       <list ref="list">
         <template v-slot:detail="scope">

src/SManagement/orderclue/components/list.vue

@@ -13,10 +13,7 @@
           <el-select size="small" v-model="param.content.where.status" @change="selectChange" clearable>
             <el-option value="待跟进">待跟进</el-option>
             <el-option value="跟进中">跟进中</el-option>
-            <el-option value="丢单">丢单</el-option>
-            <el-option value="已成交">成交</el-option>
-            <el-option value="无效">无效</el-option>
-            <el-option value="已过期">已过期</el-option>
+            <el-option value="已成交">已成交</el-option>
           </el-select>
         </div>
       </div>

src/components/import/importFile.vue

@@ -7,11 +7,11 @@
       <div slot="title"></div>
       <div style="background:#f1f2f3" class="my-tabs">
         <el-tabs v-model="activeName" type="card">
-          <!--标准模板-->
-          <el-tab-pane label="Excel标准模板" name="first">
+          <el-tab-pane label="Excel专用模板" name="first">
+          <!--专用模板-->
             <div style="padding:20px;background:#ffffff">
               <el-upload style="width:100%" ref="my-upload" class="upload-demo normal-margin" :accept="accept"
-                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange" drag multiple>
+                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange2" drag multiple>
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
               </el-upload>
@@ -35,7 +35,7 @@
                 </div>
               </div>
               <slot name="errorFile"></slot>
-              <p class="tips">• 请下载并使用<a :href="modelurl">《Excel标准模板》</a></p>
+              <p class="tips">• 请下载并使用快手与抖音模板<a :href="modelurl2">《Excel专用模板》</a></p>
               <p class="tips">• 文件中数据不能超过5000行</p>
               <div class="dialog-footer">
                 <el-button size="small" @click="dialogUploadVisible = false" class="normal-btn-width">取 消</el-button>
@@ -44,11 +44,11 @@
               </div>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="Excel专用模板" name="last">
-          <!--专用模板-->
+          <!--标准模板-->
+          <el-tab-pane label="Excel标准模板" name="last">
             <div style="padding:20px;background:#ffffff">
               <el-upload style="width:100%" ref="my-upload" class="upload-demo normal-margin" :accept="accept"
-                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange2" drag multiple>
+                action="#" :auto-upload="false" :show-file-list="false" :on-change="handleChange" drag multiple>
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
               </el-upload>
@@ -72,7 +72,7 @@
                 </div>
               </div>
               <slot name="errorFile"></slot>
-              <p class="tips">• 请下载并使用快手与抖音模板<a :href="modelurl2">《Excel专用模板》</a></p>
+              <p class="tips">• 请下载并使用<a :href="modelurl">《Excel标准模板》</a></p>
               <p class="tips">• 文件中数据不能超过5000行</p>
               <div class="dialog-footer">
                 <el-button size="small" @click="dialogUploadVisible = false" class="normal-btn-width">取 消</el-button>

src/components/layout/index.vue

@@ -36,7 +36,9 @@
         <el-aside v-if="ast_nav" width="180px"><myaside ref="aside"></myaside></el-aside>
         <el-container>
           <el-main>
-            <router-view></router-view>
+            <keep-alive include="agentIndex">
+              <router-view></router-view>
+            </keep-alive>
           </el-main>
           <!-- <el-footer class="flex-footer">
             <p>技术支持:XXXXXXX</p><br>
@@ -71,6 +73,8 @@ export default {
       act_id:null
     }
   },
+  mounted() {
+  },
   methods:{
     siteInfos () {
       this.$store.dispatch('querySiteInfo',{

src/router/HManagement.js

@@ -90,7 +90,8 @@ const HManagement = [
     name: 'salermag',
     meta: {
       title: '营销组织',
-      ast_nav: true
+      ast_nav: true,
+      keepAlive:true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/index.vue')
   }, {

yos/index.html

@@ -1,5 +1 @@
-<<<<<<< HEAD
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.90a202b8.js"></script><link href="css/app.83be7ebe.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.7e7e4609.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
-=======
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.af5fb13a.js"></script><link href="css/app.272a52a9.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.f1727b3b.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
->>>>>>> 04eebfcdeb020b03aba18be61ecf05cf315ee3c5
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.9c2ca1a9.js"></script><link href="css/app.e05006d8.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.c2e0a533.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>