Merge branch '03/03SAVECHECK' into online

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -143,7 +143,7 @@ export default {
   },
   activated() {
 
-    if (this.teamid && (this.teamid != this.$route.query.id)) {
+    if (this.teamid && (this.teamid != this.$route.query.id)||(this.teamStatus !=this.$route.query.type)) {
 
       this.init();
     } else {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -389,62 +389,6 @@ export default {
         ownershipType: "OWN", // 合作机构类型
         repairUserId: null, // 维修技师
       },
-      checkList: {
-        soundInfo: {
-          // 声部
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        allInfo: {
-          // 合奏
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        baseInfo: {
-          // 基础
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        holidayInfo: {
-          // 假期
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        networkInfo: {
-          ischeck: false,
-          value: "",
-          checkBuy: false,
-          isNew: 0,
-          isStatus: false,
-        },
-        submit: {
-          ischeck: false,
-          value:
-            "年度安排个月共xxx课时,课时,原价xxx元,现价xxxx元/月(约 xxxx元/课时 )",
-        },
-      }, // 选中的集合
-      newStudentList: {
-        baseInfo: {
-          ischeck: false,
-          value: "",
-          checkBuy: true,
-          nowValue: "",
-          isNew: 1,
-          isStatus: false,
-        },
-      },
       baseInfo: {},
       money: 580,
       orderInfo: {
@@ -456,25 +400,6 @@ export default {
       cooperationList: [], // 教学点列表
       teacherList: [], // 获取老师列表
       addList: [], // 教学地点列表
-      payList: {
-        school: {
-          ischeck: false,
-          value: "",
-          price: "",
-          chiose: "",
-        },
-        company: {
-          ischeck: false,
-          value: "",
-          price: "",
-          chiose: "",
-        },
-        student: {
-          ischeck: true,
-          chiose: "loop",
-        },
-        chioseMonth: [], // 选中的月份
-      },
       activeTeam: [],
       teamid: "",
       teamStatus: "",
@@ -489,6 +414,7 @@ export default {
     if (this.$route.query.id) {
       this.teamid = this.$route.query.id;
     }
+    this.teamStatus =this.$route.query.type
     if (this.$route.query.type == "newTeam") {
       this.onReset();
     }
@@ -497,9 +423,8 @@ export default {
     // this.$forceUpdate();
   },
   activated() {
-     console.log(this.$route.query.type)
     // console.log('直接进编辑')
-    if (this.teamid && this.teamid != this.$route.query.id) {
+    if (this.teamid && this.teamid != this.$route.query.id||this.teamStatus !=this.$route.query.type) {
       this.init();
     }
     if (this.$route.query.clear == 'true') {

src/views/teamBuild/components/teamSoundSet.vue

@@ -121,8 +121,6 @@ export default {
       }
     this.teamid = this.$route.query.id;
     this.teamStatus = this.$route.query.type;
-
-    console.log("激活第二页");
   },
   methods: {
     handleClick(evt) {},

src/views/teamDetail/teamList.vue

@@ -318,7 +318,7 @@
                   type="text"
                   v-if="
                     scope.row.status == 'AUDIT' &&
-                    permission('teamDetail/audit/update')
+                    permission('/teamAudit')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >审核</el-button
@@ -332,7 +332,7 @@
                   type="text"
                   v-if="
                     scope.row.status == 'DRAFT' &&
-                    permission('teamDetail/draft/update')
+                    permission('/teamDraft')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button
@@ -355,7 +355,7 @@
                   type="text"
                   v-if="
                     scope.row.status == 'AUDIT_FAILED' &&
-                    permission('teamDetail/aduitFailed/update')
+                    permission('/auditFailed')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button