Xiao_Mo 4 rokov pred
rodič
commit
198af06c25

+ 2 - 1
src/views/resetTeaming/components/resetPayList.vue

@@ -383,7 +383,8 @@ export default {
       this.userVisible = true
     },
     getList () {
-      musicGroupPaymentCalenderQueryPage({ page: this.rules.page, rows: this.rules.limit, musicGroupId: this.$route.query.id,payUserType:this.searchForm.payUserType }).then(res => {
+      let musicGroupId = this.$route.query.id ||  sessionStorage.getItem('newteamId')
+      musicGroupPaymentCalenderQueryPage({ page: this.rules.page, rows: this.rules.limit, musicGroupId,payUserType:this.searchForm.payUserType }).then(res => {
         if (res.code == 200) {
           this.rules.total = res.data.total
           this.tableList = res.data.rows;

+ 10 - 3
src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -275,7 +275,7 @@ export default {
     },
     lookMusic() {},
 
-    submitInfo() {
+    submitInfo(type) {
       // 计划招生人数
       // 可选乐器
       // 教辅
@@ -362,11 +362,18 @@ export default {
             if (res.code == 200) {
               // 成功 跳转到乐团报名详情
               this.$emit("chiosetab", 2);
+              sessionStorage.setItem('newteamId',res.data)
             }
           });
         } else {
           obj.musicGroupId = this.teamid;
-          obj.musicGroupStatus = "DRAFT";
+           sessionStorage.setItem('newteamId',this.teamid)
+           if(type){
+              obj.musicGroupStatus = "AUDIT";
+           }else{
+              obj.musicGroupStatus = "DRAFT";
+           }
+         
           updateSubjectInfo(obj).then((res) => {
             if (res.code == 200) {
               this.$message.success("提交成功");
@@ -424,7 +431,7 @@ export default {
         schoolId: this.topfor.address,
         expectStartGroupDate: this.topfor.startTime,
         isClassroomLessons: this.topfor.isClass,
-        status,
+        status:"DRAFT",
         ownershipType: this.topfor.ownershipType,
         repairUserId: this.topfor.repairUserId,
         feeType: this.topfor.feeType,

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

@@ -1052,14 +1052,14 @@ export default {
           check.push(this.checkList[i].ischeck);
         }
       }
-      let checkFlag = false;
-      check.forEach((item) => {
-        checkFlag = checkFlag || item;
-      });
-      if (!checkFlag) {
-        this.$message.error("请至少选择一种乐团课程类型");
-        return;
-      }
+      // let checkFlag = false;
+      // check.forEach((item) => {
+      //   checkFlag = checkFlag || item;
+      // });
+      // if (!checkFlag) {
+      //   this.$message.error("请至少选择一种乐团课程类型");
+      //   return;
+      // }
       this.$refs["topinfo"].validate((valid, object) => {
         if (!valid) {
           this.$message.error("请填写必要参数");

+ 31 - 15
src/views/teamBuild/components/teamPayInfo.vue

@@ -1,29 +1,45 @@
 <template>
   <div class="pay-container">
-   <resetPayList :isNewGropu='true'/>
+    <resetPayList :isNewGropu="true" />
+    <div class="btnWrap">
+      <div class="PrevBtn" @click="goback">上一步</div>
+      <!--  v-if="teamStatus != 'teamAudit'" -->
+      <div class="submitBtn">预览</div>
+  
+    </div>
   </div>
 </template>
-<script> 
+<script>
 // import { payOrderTypeList}  from "@/utils/searchArray";
-import resetPayList from '@/views/resetTeaming/components/resetPayList'
+import resetPayList from "@/views/resetTeaming/components/resetPayList";
 export default {
-    components:{resetPayList},
+  components: { resetPayList },
   data() {
     return {
-        searchForm:{
-            courseScheduleType:null
-        },
-
-    }
+      searchForm: {
+        courseScheduleType: null,
+      },
+    };
   },
-  created (){
-
+  created() {},
+  methods: {
+    goback() {},
+    submitAudit(){
+      let teamId =  sessionStorage.getItem('newteamId')
+    }
   },
-  methods:{
-      search(){},
-      onReSet(){}
-  }
 };
 </script>
 <style lang="scss" scoped>
+.btnWrap {
+  margin-top: 40px;
+  .PrevBtn {
+    background-color: #13817a;
+    width: 120px;
+  }
+  .submitBtn {
+    background-color: #13817a;
+    width: 120px;
+  }
+}
 </style>

+ 54 - 13
src/views/teamBuild/components/teamSoundSet.vue

@@ -4,7 +4,11 @@
       <p>当前选择声部数(个):{{ chioseSoundNum }}</p>
       <p style="margin-left: 30px">计划招生人数(个):{{ PlannedCount }}</p>
     </div>
-    <soundSetCore ref="soundSetCore" @chiosetab="chiosetab" @getNumber='getNumber'/>
+    <soundSetCore
+      ref="soundSetCore"
+      @chiosetab="chiosetab"
+      @getNumber="getNumber"
+    />
     <div class="btnWrap">
       <div class="PrevBtn" @click="goback">上一步</div>
       <!--  v-if="teamStatus != 'teamAudit'" -->
@@ -18,6 +22,16 @@
       >
         下一步
       </div>
+      <div
+        class="submitBtn"
+        @click="submitAudit(1)"
+        v-if="teamStatus != 'teamAudit'"
+      >
+        提交审核
+      </div>
+      <div class="submitBtn" @click="approval" v-if="teamStatus == 'teamAudit'">
+        审核通过
+      </div>
     </div>
   </div>
 </template>
@@ -48,12 +62,20 @@ export default {
       Fsearch: null,
       Frules: null,
       activeSoundList: [],
-      chioseSoundNum:0,
-      PlannedCount:0
+      chioseSoundNum: 0,
+      PlannedCount: 0,
+      teamStatus: null,
+      teamid:null
     };
   },
-  mounted() {},
-  activated() {},
+  mounted() {
+    this.teamid = this.$route.query.id;
+    this.teamStatus = this.$route.query.type;
+  },
+  activated() {
+    this.teamid = this.$route.query.id;
+    this.teamStatus = this.$route.query.type;
+  },
   methods: {
     goback() {
       this.$emit("chiosetab", 0);
@@ -64,16 +86,35 @@ export default {
     chiosetab(val) {
       this.$emit("chiosetab", val);
     },
-      getNumber(chioseSoundNum,PlannedCount){
-    this.chioseSoundNum = chioseSoundNum
-    this.PlannedCount = PlannedCount
-  },
+    submitAudit(val) {
+      this.$refs.soundSetCore.submitInfo(val);
+    },
+    getNumber(chioseSoundNum, PlannedCount) {
+      this.chioseSoundNum = chioseSoundNum;
+      this.PlannedCount = PlannedCount;
+    },
+    approval() {
+      this.$confirm(`是否审核通过?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          auditSuccess({ musicGroupId: this.teamid }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("审核通过");
+              this.$router.push({
+                path: "/business/teamDetail",
+                query: { search: this.Fsearch, rules: this.Frules },
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    },
   },
 
-
-  computed: {
-   
-  },
+  computed: {},
 };
 </script>
 <style lang="scss" scoped>