Inicio Explorar Ayuda
Registro Iniciar sesión
zhangqi
/
yos_meida
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

2022-9-27 13:30

codeMan hace 2 años
padre
555834a461 4b004948d5
commit
82201a39f3
Se han modificado 6 ficheros con 20 adiciones y 11 borrados
Dividir vista Mostrar estadísticas de diff
  1. 2 2
      src/HManagement/marketing/agent/list.vue
  2. 8 3
      src/HManagement/marketing/index.vue
  3. 3 3
      src/HManagement/marketing/saler/list.vue
  4. 4 1
      src/components/layout/index.vue
  5. 2 1
      src/router/HManagement.js
  6. 1 1
      yos/index.html

+ 2 - 2
src/HManagement/marketing/agent/list.vue
Ver fichero 

@@ -77,12 +77,12 @@ export default {
 
     handleSizeChange(val) {
 
       // console.log(`每页 ${val} 条`);
 
       this.param.content.pageSize = val
 
-      this.query_agent(this.param.content.sa_saleareaid)
 
+      this.query_agent(this.param.content.sa_saleareaids[0])
 
     },
 
     handleCurrentChange(val) {
 
       // console.log(`当前页: ${val}`);
 
       this.param.content.pageNumber = val
 
-      this.query_agent(this.param.content.sa_saleareaid)
 
+      this.query_agent(this.param.content.sa_saleareaids[0])
 
     }
 
   },
 
   mounted () {

+ 8 - 3
src/HManagement/marketing/index.vue
Ver fichero 

@@ -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;
 
 }

+ 3 - 3
src/HManagement/marketing/saler/list.vue
Ver fichero 

@@ -56,7 +56,7 @@ export default {
 
   },
 
   methods:{
 
     async query_saler (sa_saleareaid) {
 
-      this.param.content.sa_saleareaid = sa_saleareaid
 
+      this.param.content.sa_saleareaids = [sa_saleareaid]
 
       const res = await this.$api.requested(this.param)
 
       this.list = res.data
 
       this.total = res.total
 
@@ -67,12 +67,12 @@ export default {
 
     handleSizeChange(val) {
 
       // console.log(`每页 ${val} 条`);
 
       this.param.content.pageSize = val
 
-      this.query_saler(this.param.content.sa_saleareaid)
 
+      this.query_saler(this.param.content.sa_saleareaids[0])
 
     },
 
     handleCurrentChange(val) {
 
       // console.log(`当前页: ${val}`);
 
       this.param.content.pageNumber = val
 
-      this.query_saler(this.param.content.sa_saleareaid)
 
+      this.query_saler(this.param.content.sa_saleareaids[0])
 
     }
 
   },
 
   mounted () {

+ 4 - 1
src/components/layout/index.vue
Ver fichero 

@@ -36,7 +36,10 @@
 
         <el-aside v-if="ast_nav" width="180px"><myaside ref="aside"></myaside></el-aside>
 
         <el-container>
 
           <el-main>
 
-            <router-view></router-view>
 
+            <keep-alive>
 
+             <router-view v-if="$route.meta.keepAlive"></router-view>
 
+             <router-view v-else></router-view>
 
+            </keep-alive>
 
           </el-main>
 
           <!-- <el-footer class="flex-footer">
 
             <p>技术支持:XXXXXXX</p><br>

+ 2 - 1
src/router/HManagement.js
Ver fichero 

@@ -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')
 
   }, {

+ 1 - 1
yos/index.html
Ver fichero 

@@ -1 +1 @@
 
-<!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.066adda1.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.bdabbfcc.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.823dd3fa.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.9702c35e.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>