1

1

src/router/notKeepAliveList.js

@@ -89,5 +89,6 @@ export default [
   '/business/teacherDetail',
   '/arrearage-students',
   '/business/strudentPayInfo',
-  '/timedTask/timedTask'
+  '/timedTask/timedTask',
+  '/business/teamDraft'
 ]

src/views/teamBuild/components/teamBaseInfo.vue

@@ -610,28 +610,6 @@ export default {
           }
         });
       } else {
-<<<<<<< Updated upstream
-        this.topFrom = {
-          type: "", // 收费类型
-          section: "", //所属分部
-          school: "", // 合作单位
-          teacher: "", // 乐团主管
-          name: "", //乐团名称
-          boss: "", // 运营主管
-          time: "", // 报名截止时间
-          startClass: [], // 招生年级起始
-          paymentValid: [], // 缴费有效期时间起始
-          address: "", // 教学地点
-          salary: "", // 收费模式
-          head: "",
-          paymentPattern: "", // 缴费方式
-          isClass: false, //是否为课堂课
-          startTime: "",
-          ownershipType: "OWN", // 合作机构类型
-          feeType: null,
-        };
-        this.$refs["topinfo"].resetFields();
-=======
         // this.topFrom = {
         //   type: "", // 收费类型
         //   section: "", //所属分部
@@ -653,7 +631,6 @@ export default {
         //   feeType: null,
         // };
         // this.$refs["topinfo"].resetFields();
->>>>>>> Stashed changes
       }
       // 1.获取各个选项卡的数据内容
       // getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {

src/views/teamBuild/index.vue

@@ -50,7 +50,7 @@
                         :getTeamList="getTeamList"
                         @getBaseInfo="getBaseInfo" />
         </div>
-        <div v-if="activeIndex == 1">
+        <div v-show="activeIndex == 1">
           <teamSoundMoney @chiosetab="chiosetab"
                           :getTeamList="getTeamList"
                           @getBaseInfo="getBaseInfo" />
@@ -89,7 +89,7 @@ export default {
     this.init();
   },
   activated () {
-    this.init();
+    // this.init();
   },
   methods: {
     init () {

src/views/teamDetail/teamList.vue

@@ -552,8 +552,7 @@ export default {
       });
     },
     createNewTeam() {
-      let search = JSON.stringify(this.topForm);
-      let rules = JSON.stringify(this.rules);
+        this.$store.dispatch('buildIndex',0)
       this.$router.push(
         { path: "/business/teamBuild", query: { type: "newTeam" } },
         (router) => {
@@ -567,10 +566,8 @@ export default {
         this.$message.error("请至少选择一个乐团进行调整");
         return;
       }
-      let search = JSON.stringify(this.topForm);
-      let rules = JSON.stringify(this.rules);
       this.$router.push({
-        path: "/business/teamBuild",
+        path: "/business/teamDraft",
         query: { type: "teamList", teamList: this.passed },
       });
     },
@@ -702,9 +699,10 @@ export default {
       switch (row.status) {
         case "DRAFT": {
           // 编辑中
+           this.$store.dispatch('buildIndex',0)
           this.$router.push(
             {
-              path: "/business/teamBuild",
+              path: "/business/teamDraft",
               query: { type: "teamDraft", id: row.id },
             },
             (router) => {
@@ -715,9 +713,10 @@ export default {
         }
         case "AUDIT": {
           // 审核中
+           this.$store.dispatch('buildIndex',0)
           this.$router.push(
             {
-              path: "/business/teamBuild",
+              path: "/business/teamDraft",
               query: { type: "teamAudit", id: row.id },
             },
             (router) => {
@@ -736,9 +735,10 @@ export default {
         }
         case "FEE_AUDIT": {
           // 费用审核中
+           this.$store.dispatch('buildIndex',0)
           this.$router.push(
             {
-              path: "/business/teamBuild",
+              path: "/business/teamDraft",
               query: { type: "feeAudit", id: row.id },
             },
             (router) => {
@@ -749,9 +749,10 @@ export default {
         }
         case "AUDIT_FAILED": {
           // 审核失败
+           this.$store.dispatch('buildIndex',0)
           this.$router.push(
             {
-              path: "/business/teamBuild",
+              path: "/business/teamDraft",
               query: { type: "teamDraft", id: row.id },
             },
             (router) => {

vue.config.js

@@ -21,7 +21,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+let target = '47.114.176.40:8000' // 测试服
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -62,7 +62,7 @@ module.exports = {
       // http://47.99.212.176:8000
       // http://192.168.3.28:8000
       '/api-auth': {
-        target: 'http://dev.dayaedu.com',
+        target: '47.114.176.40:8000',
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''