Browse Source

2022-7-18

codeMan 3 years ago
parent
commit
c61d5b5bca

+ 2 - 0
src/SManagement/archives/index.vue

@@ -94,6 +94,8 @@ export default {
     //获取文件数据
     getFileList () {
       this.$api.requested(this.params).then(res => {
+        console.log(res);
+        
         this.total = res.total;
         this.params.content.sort = res.sort
         this.allFileData = this.fileType.fileList(res.data)

+ 4 - 0
src/SManagement/archives_ad/components/delete.vue

@@ -27,6 +27,8 @@ export default {
   },
   methods: {
     remove () {
+      console.log(this.data.sat_sharematerialid);
+      
       let param = {
         "classname": "webmanage.saletool.sharematerial.sharematerial",
         "method": "delete",
@@ -35,6 +37,8 @@ export default {
         }
       }
       this.$api.requested(param).then(res => {
+        console.log(res);
+        
         if (res.code == 1) {
           this.$notify({
             title: "提示",

+ 4 - 1
src/SManagement/archives_ad/index.vue

@@ -33,6 +33,7 @@ import detail from '@/SManagement/archives_ad/components/detail'
 import Delete from '@/SManagement/archives_ad/components/delete'
 import Edit from '@/SManagement/archives_ad/components/Edit'
 import Pagination from '@/components/pagination/Pagination'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   name: 'index',
   data() {
@@ -43,6 +44,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 12,
+          "nocache":true,
           "where": {
             "condition": "",
             "sat_sharematerial_classid": null
@@ -51,7 +53,6 @@ export default {
       },
       //分类配置
       select: {
-        "accesstoken": "0b62a25619912a732160863854a9f19d",
         "classname": "saletool.sharematerial.sharematerial",
         "method": "select",
         "content": {
@@ -102,6 +103,8 @@ export default {
         res.data.forEach(v => (initID == v.sat_sharematerial_classid && v.title == '') ? deleteList.push(v.sat_sharematerialid) : '');
         if (deleteList.length != 0) this.handleDelete(deleteList);
         this.fileData = res.data
+        console.log(res.data);
+        
         this.params.content.sort = res.sort
       })
     },

+ 1 - 1
src/SManagement/archives_admag/index.vue

@@ -59,6 +59,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 12,
+          "nocache":true,
           "where": {
             "condition": "",
             "sat_sharematerial_classid": null
@@ -67,7 +68,6 @@ export default {
       },
       //分类配置
       select: {
-        "accesstoken": "0b62a25619912a732160863854a9f19d",
         "classname": "saletool.sharematerial.sharematerial",
         "method": "select",
         "content": {

+ 1 - 1
src/SManagement/archives_sc/archives_details/detail.vue

@@ -13,7 +13,7 @@
         {{currentSelectFile.notes}}
       </p>
     </div>
-    <div class="file1">
+    <div class="file1" v-if="currentSelectFile.length >= 1">
       <p class="title">课件</p>
       <div class="file-box">
         <file-item :itemStyle="itemStyle" 

+ 1 - 1
src/SManagement/archives_upload/components/Header.vue

@@ -37,7 +37,7 @@ export default {
     align-items: center;
     padding: 16px 16px;
     background: #ffffff;
-    margin-bottom: 10px;
+    margin-bottom: 16px;
   }
   .header .left {
     display: flex;

+ 2 - 2
src/SManagement/archives_upload/components/Set.vue

@@ -3,11 +3,11 @@
     <p class="title">素材设置</p>
     <el-form ref="form" :model="ruleForm" label-width="90px" label-position="left" :rules="rules">
       <el-form-item label="标题" prop="title">
-        <el-input style="width:270px" v-model="ruleForm.title" @input="titleChange"></el-input>
+        <el-input style="width:270px" v-model="ruleForm.title" @input="titleChange" size="small"></el-input>
       </el-form-item>
       <el-form-item label="素材分类" prop="category">
         <el-cascader :options="seleteList" :show-all-levels="false" v-model="ruleForm.category" :props="props"
-          @change="changeSelect">
+          @change="changeSelect" size="small">
         </el-cascader>
       </el-form-item>
     </el-form>

+ 0 - 1
src/SManagement/archives_upload/index.vue

@@ -4,7 +4,6 @@
     <Header>
       <save type="save" @click.native="save()"></save>
     </Header>
-
     <el-row>
       <el-col :span="14">
         <!--标题 分类-->

+ 8 - 19
src/SManagement/notice/index.vue

@@ -29,7 +29,7 @@ export default {
         "content": {
           "nocache": true,
           "pageNumber": 1,
-          "pageSize": 4,
+          "pageSize": 10,
           "where":{
               "condition":""
           }
@@ -44,7 +44,7 @@ export default {
   components: {
     Pagination,
     List,
-    search
+    search,
   },
   created() {
     this.getNoticeData()
@@ -74,7 +74,7 @@ export default {
     clearData() {
       this.param.content.where.condition = ''
       this.getNoticeData()
-    }
+    },
   }
 };
 </script>
@@ -83,28 +83,17 @@ export default {
   box-sizing: border-box;
 }
 .normal-card {
-  width: 1200px;
   min-height: 100%;
-  padding: 20px 0 0 30px;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
+  padding: 20px 0 50px 30px;
   font-family: PingFang SC-Regular;
-  box-sizing: border-box;
 }
 .normal-card .search {
   width: 320px;
   height: 36px;
 }
-.normal-card .content {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  min-height: calc(100vh - 130px);
-}
-.normal-card .content .page {
-  margin: 16px 30px;
-  display: flex;
-  flex-direction: row-reverse;
+.el-pagination {
+  position: absolute;
+  right: 16px;
+  bottom: 0;
 }
 </style>

+ 7 - 9
src/SManagement/notice/notice_detail/NoticeDetail.vue

@@ -113,17 +113,13 @@ export default {
     //解析富文本
     compileFWB () {
       // let con = weAtob(this.detailData.content);
-      document.getElementById('fwb').innerHTML = this.detailData.content;
+      document.getElementById('fwb').innerHTML = weAtob(this.detailData.content);
     },
     //获取详情数据
     getNoticeDetail () {
       this.param.content.sat_noticeid = this.$route.query.sat_noticeid
       this.$api.requested(this.param).then(res => {
-        console.log(res);
-        
         this.detailData = res.data
-        console.log(this.detailData);
-        
         this.detailData.attinfos = this.fileType.fileList(this.detailData.attinfos)
         this.compileFWB()
       })
@@ -189,6 +185,9 @@ export default {
 </script>
 
 <style scoped>
+*{
+  box-sizing: border-box;
+}
 .fwb-img {
   width: 50% !important;
 }
@@ -199,12 +198,9 @@ export default {
   color: #333333;
 }
 .normal-card {
-  width: 1200px;
   padding: 30px;
-  left: 50%;
   margin-top: 10px;
   font-family: PingFang SC-Regular;
-  box-sizing: border-box;
   margin: 0 auto;
 }
 .normal-card .title-box {
@@ -226,9 +222,10 @@ export default {
   line-height: 16px;
   margin-top: 10px;
   font-size: 12px;
+  display: flex;
+  align-items: center;
 }
 .normal-card .title-box .info .tag {
-  height: 16px;
   border: 1px solid #fa8c16;
   color: #fa8c16;
   margin-right: 10px;
@@ -266,6 +263,7 @@ export default {
 .normal-card .file-content .file-download .file-list {
   display: flex;
   flex-wrap: wrap;
+  padding-bottom: 8px;
 }
 .normal-card .comments {
   margin-top: 20px;

+ 15 - 5
src/SManagement/orderclue/components/add.vue

@@ -18,7 +18,8 @@
             class="width-240"
             v-model="param.content.province"
             :options="arealist"
-            @change="cascaderChange">
+            @change="cascaderChange"
+            ref="cascader">
           </el-cascader>
         </el-form-item>
         <el-form-item label="地址" prop="address">
@@ -50,6 +51,13 @@ export default {
         callback()
       }
     }
+    let checkLength = (rule,value,callback) => {
+      if(value && value.length > 25) {
+        callback(new Error('字符限制在25个之内'))
+      }else {
+        callback()
+      }
+    }
     return {
       param: {
         "classname": "saletool.orderclue.web.orderclue",
@@ -77,10 +85,11 @@ export default {
         ],
         cluesource:[
           {required:true,message:'内容不能为空',trigger:'blur'},
+          {validator:checkLength,trigger:'blur'}
         ],
       },
       arealist:[],
-      areaSelectResult:[]
+      areaSelectResult:''
     };
   },
   props:{
@@ -109,11 +118,11 @@ export default {
       this.dialogVisible = false
     },
     addOrdercule() {
-      if(this.areaSelectResult.length > 1) {
+      if(this.areaSelectResult && this.areaSelectResult.length > 1) {
         this.param.content.province = this.areaSelectResult[0]
         this.param.content.city = this.areaSelectResult[1]
         this.param.content.county = this.areaSelectResult[2]
-      } else {
+      } else if (this.areaSelectResult.length == 1) {
         this.param.content.province = this.areaSelectResult[0]
       }
       this.$refs.ruleForm.validate( val => {
@@ -126,9 +135,10 @@ export default {
             if(res.code == 1) {
               this.$refs.ruleForm.resetFields()
               this.dialogVisible = false  
+              this.areaSelectResult = []
               this.$emit('updataList')
+              this.tool.showMessage(res)
             }
-            this.tool.showMessage(res)
           })
       })
       

+ 9 - 0
src/SManagement/orderclue/components/edit.vue

@@ -57,6 +57,13 @@ export default {
         callback()
       }
     }
+    let checkLength = (rule,value,callback) => {
+      if(value && value.length > 25) {
+        callback(new Error('字符限制在25个之内'))
+      }else {
+        callback()
+      }
+    }
     return {
       param: {
         "classname": "saletool.orderclue.web.orderclue",
@@ -84,6 +91,7 @@ export default {
         ],
         cluesource:[
           {required:true,message:'内容不能为空',trigger:'blur'},
+          {validator:checkLength,trigger:'blur'}
         ],
       },
       arealist:[],
@@ -162,6 +170,7 @@ export default {
           this.tool.showMessage(res)
           this.$refs.ruleForm.resetFields()
           this.dialogVisible = false  
+          this.areaSelectResult = []
           this.$emit('updataList')
           this.$emit('getDetail')
         })

+ 117 - 109
src/SManagement/orderclue/components/list.vue

@@ -5,33 +5,35 @@
       <export-btn v-if="tool.checkAuth($route.name,'download')"></export-btn>
       <move type="more" :data="checkboxArr" @updataList="getList()" v-show="checkboxArr.length >= 1"></move>
     </Header>
-    <div class="select" v-if="tool.checkAuth($route.name,'read')">
-      <search @searchActive="searchActive" @clearData="clearData"></search>
-      <div class="status">
-        <span style="margin-right:10px">状态:</span>
-        <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-select>
+    <div class="content">
+      <div class="select" v-if="tool.checkAuth($route.name,'read')">
+        <search @searchActive="searchActive" @clearData="clearData"></search>
+        <div class="status">
+          <span style="margin-right:10px">状态:</span>
+          <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-select>
+        </div>
       </div>
-    </div>
-    <table1 :layout="tablecols" :custom="true" :checkbox="true" :data="list"
-        :height="tableHieght" @checkboxCallBack="checkboxCallBack" v-if="tool.checkAuth($route.name,'read')">
+      <table1 :layout="tablecols" :custom="true" :checkbox="true" :data="list" :height="tableHieght"
+        @checkboxCallBack="checkboxCallBack" v-if="tool.checkAuth($route.name,'read')">
         <template v-slot:customcol="scope">
-            <div v-if="scope.column.columnname == 'rowindex'" style="display:flex;align-items: center;">
-              <p>{{ scope.column.data[scope.column.columnname] }}</p>
-              <span :class="scope.column.data.isTeam == '总部' ? 'all-team' : 'team'">{{ scope.column.data.isTeam }}</span>
-            </div>
-            <div v-else-if="scope.column.columnname == 'city'">
-              <p>{{ scope.column.data.province }}、{{ scope.column.data.city }}、{{ scope.column.data.county }}</p>
-            </div>
-            <div v-else-if="scope.column.columnname == 'status'">
-              <p :style="{'color':statusStyle[scope.column.data[scope.column.columnname]]}">{{ scope.column.data[scope.column.columnname] }}</p>
-            </div>
-            <p v-else>{{ scope.column.data[scope.column.columnname] }}</p>
+          <div v-if="scope.column.columnname == 'rowindex'" style="display:flex;align-items: center;">
+            <p>{{ scope.column.data[scope.column.columnname] }}</p>
+            <span :class="scope.column.data.isTeam == '总部' ? 'all-team' : 'team'">{{ scope.column.data.isTeam }}</span>
+          </div>
+          <div v-else-if="scope.column.columnname == 'city'">
+            <p>{{ scope.column.data.province }}、{{ scope.column.data.city }}、{{ scope.column.data.county }}</p>
+          </div>
+          <div v-else-if="scope.column.columnname == 'status'">
+            <p :style="{'color':statusStyle[scope.column.data[scope.column.columnname]]}">
+              {{ scope.column.data[scope.column.columnname] }}</p>
+          </div>
+          <p v-else>{{ scope.column.data[scope.column.columnname] }}</p>
         </template>
         <template v-slot:opreation="scope">
           <div class="handle">
@@ -41,19 +43,14 @@
             <slot name="move" :data="scope"></slot>
           </div>
         </template>
-    </table1>
-    <div style="margin-top: 16px; text-align: right">
-      <el-pagination
-        background
-        small
-        @current-change="handleCurrentChange"
-        :current-page="param.content.pageNumber"
-        :page-size="param.content.pageSize"
-        layout="total, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination>
+      </table1>
+      <div style="margin-top: 16px; text-align: right">
+        <el-pagination background small @current-change="handleCurrentChange" :current-page="param.content.pageNumber"
+          :page-size="param.content.pageSize" layout="total, prev, pager, next, jumper" :total="total">
+        </el-pagination>
+      </div>
     </div>
+
   </div>
 </template>
 
@@ -68,118 +65,129 @@ import exportBtn from '@/SManagement/orderclue/components/export'
 
 export default {
   name: 'list',
-  data() {
+  data () {
     return {
       param: {
-          "classname": "saletool.orderclue.web.orderclue",
-          "method": "selectList",
-          "content": {
-              "isAll":false,
-              "pageNumber": 1,
-              "pageSize": 20,
-              "where": {
-                "condition": "",
-                "status": ""
-              }
+        "classname": "saletool.orderclue.web.orderclue",
+        "method": "selectList",
+        "content": {
+          "isAll": false,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": "",
+            "status": ""
           }
+        }
       },
       //表格配置数据
-      tablecols:[],
-      total:0,
-      list:[],
+      tablecols: [],
+      total: 0,
+      list: [],
       //table选中数据
-      checkboxArr:[],
+      checkboxArr: [],
       statusStyle: {
-        '待跟进':'#FA8C16',
-        '跟进中':'#52C41A',
-        '丢单':'#FF3B30',
-        '无效':'#999999',
-        '已成交':'#333333',
-        '已过期':'#999999'
+        '待跟进': '#FA8C16',
+        '跟进中': '#52C41A',
+        '丢单': '#FF3B30',
+        '无效': '#999999',
+        '已成交': '#333333',
+        '已过期': '#999999'
       }
     };
   },
-  components:{ search , Header , add , exportBtn , table1 , move },
-  computed:{
+  components: { search, Header, add, exportBtn, table1, move },
+  computed: {
   },
-  watch:{
+  watch: {
   },
-  created() {
+  created () {
     this.getList()
   },
   methods: {
-    getList() {
-     this.$api.requested(this.param).then( res => {
-       this.list = res.data
-       this.total = res.total
-       console.log(this.list);
-       
-     })
+    getList () {
+      this.$api.requested(this.param).then(res => {
+        this.list = res.data
+        this.total = res.total
+        console.log(this.list);
+
+      })
     },
-    searchActive(data) {
+    searchActive (data) {
       this.param.content.where.condition = data
       this.param.content.pageNumber = 1
       this.getList()
     },
-    clearData() {
+    clearData () {
       this.param.content.where.condition = ''
       this.param.content.pageNumber = 1
       this.getList()
     },
-    handleCurrentChange(n) {
+    handleCurrentChange (n) {
       this.param.content.pageNumber = n
       this.getList()
     },
-    selectChange() {
-      this.getList()      
+    selectChange () {
+      this.param.content.pageNumber = 1
+      this.getList()
     },
-    updataList() {
+    updataList () {
       this.param.content.pageNumber = 1
       this.getList()
     },
-    checkboxCallBack(data) {
+    checkboxCallBack (data) {
       this.checkboxArr = data.map(item => item.sat_orderclueid)
     }
   },
-  mounted() {
+  mounted () {
     this.tablecols = this.tool.tabelCol(this.$route.name).orderclueList.tablecols;
   }
 };
 </script>
 
 <style scoped>
-*{
+* {
   box-sizing: border-box;
 }
-  .select {
-    display: flex;
-    font-size: 14px;
-    margin-bottom: 16px;
-  }
-  .handle {
-    color: #4f7bfd;
-    display: flex;
-  }
-  /deep/.handle p {
-    cursor: pointer;
-    margin-right: 10px;
-  }
-  .all-team {
-    display: inline-block;
-    padding: 1px 6px;
-    border: 1px solid #3874F6;
-    color: #3874F6;
-    border-radius: 2px;
-    font-size: 12px;
-    margin-left: 5px;
-  }
-  .team {
-    display: inline-block;
-    padding: 1px 6px;
-    border: 1px solid #FA8C16;
-    color: #FA8C16;
-    border-radius: 2px;
-    font-size: 12px;
-    margin-left: 5px;
-  }
+.normal-card {
+  background: #F5F5F5;
+  padding: 0;
+  height: 100%;
+}
+.select {
+  display: flex;
+  font-size: 14px;
+  background: #ffffff;
+  padding:16px;
+}
+.content {
+  background: #ffffff;
+  min-height: calc(100% - 80px);
+}
+.handle {
+  color: #4f7bfd;
+  display: flex;
+}
+/deep/.handle p {
+  cursor: pointer;
+  margin-right: 10px;
+}
+.all-team {
+  display: inline-block;
+  padding: 1px 6px;
+  border: 1px solid #3874f6;
+  color: #3874f6;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-left: 5px;
+}
+.team {
+  display: inline-block;
+  padding: 1px 6px;
+  border: 1px solid #fa8c16;
+  color: #fa8c16;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-left: 5px;
+}
 </style>

+ 3 - 1
src/SManagement/orderclue/index.vue

@@ -65,5 +65,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .orderclue {
+    height: 100%;
+  }
 </style>

+ 6 - 2
src/SManagement/orderclue_detail/components/followDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="normal-card" v-if="follow.length >= 1">
-    <p class="title">跟进记录</p>
+    <p class="title">跟进记录<i class="el-icon-sort" @click="sortFun"></i></p>
     <div class="select">
       <span class="demonstration">日期范围:</span>
       <time-select @clearSelect="clearSelect" @timeChange="timeChange"></time-select>
@@ -41,7 +41,7 @@ export default {
         "method": "getFollowList",
         "content": {
             "sat_orderclueid": this.$route.query.id,
-            "isdesc": 0,
+            "isdesc": 1,
             "where": {
                 "start": "",
                 "end": ""
@@ -87,6 +87,10 @@ export default {
       this.param.content.where.start = result[0]      
       this.param.content.where.end = result[1]    
       this.getFollowDetail()  
+    },
+    sortFun() {
+      this.param.content.isdesc = this.param.content.isdesc == 1 ? this.param.content.isdesc = 0 : this.param.content.isdesc = 1
+      this.getFollowDetail()
     }
   },
 };

+ 2 - 1
src/SManagement/orderclue_detail/index.vue

@@ -6,7 +6,7 @@
     </Header>
     <div class="normal-card">
       <el-descriptions :column="5" title="线索信息">
-        <el-descriptions-item label="序号">{{detail.sat_orderclueid}}</el-descriptions-item>
+        <el-descriptions-item label="序号">{{detail.rowindex}}</el-descriptions-item>
         <el-descriptions-item label="手机号">{{detail.phonenumber}}</el-descriptions-item>
         <el-descriptions-item label="地址">{{detail.addres}}</el-descriptions-item>
         <el-descriptions-item label="来源">{{detail.cluesource}}</el-descriptions-item>
@@ -91,6 +91,7 @@ export default {
 }
   .normal-card {
     margin-bottom: 10px;
+    padding: 16px;
   }
   .normal-card .title {
     font-size: 16px;

+ 5 - 1
src/SManagement/submitedit_details/components/SubmiteditItemInfo.vue

@@ -97,7 +97,8 @@ export default {
   height: 100%;
 }
 .normal-card {
-  height: 100%;
+  min-height: calc(100vh - 310px);
+  position: relative;
 }
 /deep/.el-drawer__header {
   color: #000000;
@@ -231,5 +232,8 @@ export default {
 }
 .pagin .el-pagination {
   margin-bottom: 0 !important;
+  position: absolute;
+  right: 16px;
+  bottom: 16px;
 }
 </style>

+ 1 - 0
src/SManagement/user/team-manage/TeamManage.vue

@@ -58,6 +58,7 @@ export default {
   methods: {
     addUser() {
       this.$refs.addUser.dialogVisible = true
+      this.editTarget = ''
       this.$refs.addUser.param.content.sa_agent_hrid = '0'
       this.$nextTick(() => {
         this.$refs.addUser.$refs.formInfo.resetFields()

+ 4 - 3
src/SManagement/user/team-manage/components/AddUser.vue

@@ -75,6 +75,9 @@ export default {
           { required: true, message: '请输入手机号', trigger: 'blur' },
           { validator: checkPhone , trigger: 'blur' }
         ],
+        roleids: [
+          { required: true, message: '请选择你的权限', trigger: 'blur' }
+        ]
       },
       checkList: []
     };
@@ -87,6 +90,7 @@ export default {
   watch: {
     editTarget: {
       handler(val) {
+        this.$refs.formInfo.clearValidate()
         this.param.content.name = val.name
         this.param.content.position = val.position
         this.param.content.phonenumber = val.phonenumber
@@ -116,10 +120,7 @@ export default {
     },
     //提交
     submitTeam() {
-      
       this.$refs.formInfo.validate((val) => {
-        console.log(val);
-        
         if(val) {
           console.log(this.param);
           this.$api.requested(this.param).then( res => {

+ 13 - 6
src/SManagement/user/user-info/components/PhoneEdit.vue

@@ -58,12 +58,19 @@ export default {
   },
   methods: {
     countDown() {
-      this.getPhoneCode()
-      this.count = 5
-      let timer = setInterval(() => {
-        this.count--
-        if(this.count == 0) clearInterval(timer)
-      }, 1000);
+      this.$refs.form.validate( val => {
+        if(!val) return this.$notify({
+          title:'提示',
+          message:'请填写手机号',
+          type:'warning'
+        })
+        this.getPhoneCode()
+        this.count = 5
+        let timer = setInterval(() => {
+          this.count--
+          if(this.count == 0) clearInterval(timer)
+        }, 1000);
+      })
     },
     //获取手机验证码
     getPhoneCode() {

+ 186 - 188
src/router/HManagement.js

@@ -15,17 +15,15 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_ad/dataAnalysis/index.vue')
+  }, {
+    path: '/archives_adclass',
+    name: 'archives_adclass',
+    meta: {
+      title: '素材分类',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_ad/archives_adclass/index.vue')
   },
-  // }, {
-  //   path: '/archives_adclass',
-  //   name: 'archives_adclass',
-  //   meta: {
-  //     title: '素材分类',
-  //     ast_nav: true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_ad/archives_adclass/index.vue')
-  // },
-
   {
     path: '/role_manage',
     name: 'roles',
@@ -40,17 +38,17 @@ const HManagement = [
     meta: {
       title: '角色详情',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/roleManage/modules/role_details.vue')
-  }, 
+  },
   {
     path: '/roleEdit',
     name: 'roles',
     meta: {
       title: '编辑角色',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/roleManage/modules/edit_role.vue')
   }, {
@@ -67,7 +65,7 @@ const HManagement = [
     meta: {
       title: '账号详情',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: resolve => require(['@/HManagement/accountManage/modules/account_detail'], resolve)
   }, {
@@ -84,7 +82,7 @@ const HManagement = [
     meta: {
       title: '员工详情',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/department/staff/detail/index.vue')
   }, {
@@ -109,179 +107,179 @@ const HManagement = [
     meta: {
       title: '业务员详情',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/saler/modules/saler_detail.vue')
+  }, {
+    path: '/add_agent',
+    name: 'salermag',
+    meta: {
+      title: '新建经销商',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/add_agent.vue')
+  }, {
+    path: '/edit_agent',
+    name: 'salermag',
+    meta: {
+      title: '编辑经销商',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/edit_agent.vue')
+  }, {
+    path: '/agent_detail',
+    name: 'salermag',
+    meta: {
+      title: '经销商详情',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/agent_detail.vue')
+  }, {
+    path: '/notice_mag_list',
+    name: 'noticemag',
+    meta: {
+      title: '通告管理',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/index.vue')
+  }, {
+    path: '/notice_add',
+    name: 'noticemag',
+    meta: {
+      title: '编辑通告',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/add_notice.vue')
+  }, {
+    path: '/notice_edit',
+    name: 'noticemag',
+    meta: {
+      title: '编辑通告',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/edit_notice.vue')
+  }, {
+    path: '/noticeclass',
+    name: 'noticeclass',
+    meta: {
+      title: '通告板块',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/pate/index.vue')
+  }, {
+    path: '/notice_analysis',
+    name: 'noticemag',
+    meta: {
+      title: '数据分析',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/dataAnalysis/index.vue')
+  }, {
+    path: '/submit_mag',
+    name: 'submit_mag',
+    meta: {
+      title: '提报管理',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/index.vue')
+  }, {
+    path: '/submit_add',
+    name: 'submit_mag',
+    meta: {
+      title: '提报管理',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_add.vue')
+  }, {
+    path: '/submit_edit',
+    name: 'submit_mag',
+    meta: {
+      title: '提报管理',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_edit.vue')
+  }, {
+    path: '/submit_detail',
+    name: 'submit_mag',
+    meta: {
+      title: '提报明细',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/content.vue')
+  }, {
+    path: '/submit_statistics',
+    name: 'submit_mag',
+    meta: {
+      title: '数据分析',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/dataAnalysis/index.vue')
+  }, {
+    path: '/archvies_mag',
+    name: 'archvies_mag',
+    meta: {
+      title: ' 营销物料',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archvies_mag/index.vue')
+  }, {
+    path: '/archives_scmag',
+    name: 'archives_scmag',
+    meta: {
+      title: '商学院管理',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/index.vue')
+  }, {
+    path: '/archives_scadd',
+    name: 'archives_scmag',
+    meta: {
+      title: '编辑课程',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/add.vue')
+  }, {
+    path: '/archives_scedit',
+    name: 'archives_scmag',
+    meta: {
+      title: '编辑课程',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/edit.vue')
+  }, {
+    path: '/archives_scdetails',
+    name: 'archives_scmag',
+    meta: {
+      title: '课程详情',
+      ast_nav: true,
+      keeproute: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/details.vue')
+  }, {
+    path: '/archives_scclass',
+    name: 'archives_scclass',
+    meta: {
+      title: '课程分类',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/archives_scclass/index.vue')
   },
-  // }, {
-  //   path: '/add_agent',
-  //   name: 'salermag',
-  //   meta: {
-  //     title: '新建经销商',
-  //     ast_nav: true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/add_agent.vue')
-  // }, {
-  //   path: '/edit_agent',
-  //   name: 'salermag',
-  //   meta: {
-  //     title: '编辑经销商',
-  //     ast_nav: true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/edit_agent.vue')
-  // }, {
-  //   path: '/agent_detail',
-  //   name: 'salermag',
-  //   meta: {
-  //     title: '经销商详情',
-  //     ast_nav: true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/marketing/agent/modules/agent_detail.vue')
-  // }, {
-  //   path: '/notice_mag_list',
-  //   name: 'noticemag',
-  //   meta: {
-  //     title: '通告管理',
-  //     ast_nav: true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/index.vue')
-  // },{
-  //   path: '/notice_add',
-  //   name: 'noticemag',
-  //   meta: {
-  //     title: '编辑通告',
-  //     ast_nav:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/add_notice.vue')
-  // },{
-  //   path: '/notice_edit',
-  //   name: 'noticemag',
-  //   meta: {
-  //     title: '编辑通告',
-  //     ast_nav:true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/list/modules/edit_notice.vue')
-  // },{
-  //   path: '/noticeclass',
-  //   name: 'noticeclass',
-  //   meta: {
-  //     title: '通告板块',
-  //     ast_nav:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/pate/index.vue')
-  // },{
-  //   path: '/notice_analysis',
-  //   name: 'noticemag',
-  //   meta: {
-  //     title: '数据分析',
-  //     ast_nav:true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/notice/dataAnalysis/index.vue')
-  // },{
-  //   path: '/submit_mag',
-  //   name: 'submit_mag',
-  //   meta: {
-  //     title: '提报管理',
-  //     ast_nav:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/index.vue')
-  // },{
-  //   path: '/submit_add',
-  //   name: 'submit_mag',
-  //   meta: {
-  //     title: '提报管理',
-  //     ast_nav:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_add.vue')
-  // },{
-  //   path: '/submit_edit',
-  //   name: 'submit_mag',
-  //   meta: {
-  //     title: '提报管理',
-  //     ast_nav:true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_edit.vue')
-  // },{
-  //   path: '/submit_detail',
-  //   name: 'submit_mag',
-  //   meta: {
-  //     title: '提报明细',
-  //     ast_nav:true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/content.vue')
-  // },{
-  //   path: '/submit_statistics',
-  //   name: 'submit_mag',
-  //   meta: {
-  //     title: '数据分析',
-  //     ast_nav:true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/dataAnalysis/index.vue')
-  // },{
-  //   path: '/archvies_mag',
-  //   name: 'archvies_mag',
-  //   meta: {
-  //     title: ' 营销物料',
-  //     ast_nav: true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archvies_mag/index.vue')
-  // },{
-  //   path: '/archives_scmag',
-  //   name: 'archives_scmag',
-  //   meta: {
-  //     title: '商学院管理',
-  //     ast_nav: true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/index.vue')
-  // }, {
-  //   path: '/archives_scadd',
-  //   name: 'archives_scmag',
-  //   meta: {
-  //     title: '编辑课程',
-  //     ast_nav: true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/add.vue')
-  // }, {
-  //   path: '/archives_scedit',
-  //   name: 'archives_scmag',
-  //   meta: {
-  //     title: '编辑课程',
-  //     ast_nav: true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/edit.vue')
-  // },{
-  //   path: '/archives_scdetails',
-  //   name: 'archives_scmag',
-  //   meta: {
-  //     title: '课程详情',
-  //     ast_nav:true,
-  //     keeproute:true
-  //   },
-  //   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/list/modules/details.vue')
-  // },{
-  //   path: '/archives_scclass',
-  //   name: 'archives_scclass',
-  //   meta: {
-  //     title: '课程分类',
-  //     ast_nav:true
-  //   },
-    // component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/archives_scclass/index.vue')
   {
     path: '/archives_sc_analysis',
     name: 'archives_scmag',
     meta: {
       title: '数据分析',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/dataAnalysis/index.vue')
   }, {
@@ -292,7 +290,7 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/siteManage/securityConfig/index.vue')
-  } ,{
+  }, {
     path: '/advertisement_mag',
     name: 'advertisement_mag',
     meta: {
@@ -300,7 +298,7 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/siteManage/advertisement_mag/index.vue')
-  },{
+  }, {
     path: '/coderule',
     name: 'coderule',
     meta: {
@@ -308,7 +306,7 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/siteManage/coderule/index.vue')
-  },{
+  }, {
     path: '/clue_import',
     name: 'orderclueupload',
     meta: {
@@ -316,7 +314,7 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_import/index.vue')
-  },{
+  }, {
     path: '/clue_public',
     name: 'orderclue_public',
     meta: {
@@ -324,16 +322,16 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_public/index.vue')
-  },{
+  }, {
     path: '/clueDetail',
     name: 'orderclue_public',
     meta: {
       title: '线索详情-公海',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_public/modules/detail.vue')
-  },{
+  }, {
     path: '/clue_private',
     name: 'orderclue_private',
     meta: {
@@ -341,13 +339,13 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_private/index.vue')
-  },{
+  }, {
     path: '/clueDetail_private',
     name: 'orderclue_private',
     meta: {
       title: '线索详情-私域',
       ast_nav: true,
-      keeproute:true
+      keeproute: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_private/modules/detail.vue')
   }

+ 3 - 2
src/router/SManagement.js

@@ -3,7 +3,7 @@ const SManagement = [{
   name: 'noticemag',
   meta: {
     title: '通报',
-    ast_nav: false
+    ast_nav: true
   },
   component: () => import(/* webpackChunkName: "about" */ '@/SManagement/notice/index.vue')
 }, {
@@ -11,7 +11,8 @@ const SManagement = [{
   name: 'noticemag',
   meta: {
     title: '通告详情',
-    ast_nav: false
+    ast_nav: true,
+    keeproute: true
   },
   component: () => import(/* webpackChunkName: "about" */ '@/SManagement/notice/notice_detail/NoticeDetail')
 }, {