mo 2 tahun lalu
induk
melakukan
6dcbc12d72

+ 11 - 4
src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -605,7 +605,7 @@ export default {
         obj.musicGroupId = this.teamid;
         // 有type 到审核  没有 继续草稿
         if (type) {
-          obj.musicGroupStatus = "AUDIT";
+          obj.musicGroupStatus = "DRAFT";
         } else {
           obj.musicGroupStatus = "DRAFT";
         }
@@ -617,7 +617,7 @@ export default {
               noMusic.join(",") +
               "尚未设置乐器,学员报名该声部时将无乐器可购买,是否确认?";
           } else {
-            str = "是否提交审核";
+            str = "是否设置缴费信息";
           }
           this.$confirm(str, "提示", {
             confirmButtonText: "确定",
@@ -628,10 +628,17 @@ export default {
               updateSubjectInfo(obj).then((res) => {
                 if (res.code == 200) {
                   this.$message.success("提交成功");
-                  this.$store.dispatch("delVisitedViews", this.$route);
-                  this.$router.push({
+
+                  if(type== 3){
+
+                    this.$emit('chiosetab',type)
+                  }else{
+                    this.$store.dispatch("delVisitedViews", this.$route);
+                    this.$router.push({
                     path: "/teamList",
                   });
+                  }
+
                 }
               });
             })

+ 2 - 2
src/views/teamBuild/components/teamBaseInfo.vue

@@ -1151,9 +1151,9 @@ export default {
             //  修改  合并对象
             obj.musicGroup = {
               settlementType: this.topFrom.salary,
-              applyExpireDate: dayjs(this.topFrom.time).format(
+              applyExpireDate: this.topFrom.time?dayjs(this.topFrom.time).format(
                 "YYYY-MM-DD HH:mm:ss"
-              ),
+              ):null,
               chargeTypeId: this.topFrom.type,
               cooperationOrganId: this.topFrom.school,
               courseViewType: this.topFrom.courseViewType,

+ 4 - 3
src/views/teamBuild/components/teamSoundSet.vue

@@ -56,9 +56,9 @@
         type="primary"
         v-if="teamStatus == 'resetTeam' || teamStatus == 'teamDraft'"
         v-permission="'musicGroup/updateSubjectInfo'"
-        @click="submitInfo()"
+        @click="submitInfo(3)"
       >
-        保存
+        下一步
       </el-button>
       <!--  v-if="teamStatus != 'teamAudit'" -->
       <!--
@@ -134,7 +134,8 @@ export default {
       this.$emit("chiosetab", 3);
     },
     chiosetab(val) {
-      this.$emit("chiosetab", val);
+      console.log('调用chiosetab',val)
+      this.$emit("handleClick", { name: String(val) });
     },
     submitAudit(val) {
       this.$refs.soundSetCore.submitInfo(val);