Merge branch '08/24teamQuest' into jenkins

src/views/resetTeaming/components/payInfoDetail.vue

@@ -802,7 +802,7 @@ export default {
           path: "/business/resetTeaming",
           query
         });
-      } else if (query.type == "teamDraft" || query.type == "feeAudit") {
+      } else if (query.type == "teamDraft" || query.type == "feeAudit" || query.type == "FEE_AUDIT_FAILED") {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",

src/views/resetTeaming/components/resetPayList.vue

@@ -211,6 +211,18 @@
                   >修改</el-button
                 >
               </auth>
+              <auth
+                auths="musicGroupPaymentCalender/update/4313"
+                v-if="
+                team_status == 'FEE_AUDIT_FAILED' &&
+                  (scope.row.status === 'REJECT' ||
+                    scope.row.status === 'DRAFT')
+                "
+              >
+                <el-button type="text" @click="resetPay(scope.row)"
+                  >修改</el-button
+                >
+              </auth>
               <!--                   scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST' &&-->
               <auth
                 auths="musicGroupPaymentCalender/revoke"
@@ -578,7 +590,7 @@
         >
       </div>
     </el-dialog>
-    <el-button type="primary" @click="submitAudit" v-if="team_status == 'DRAFT'"
+    <el-button type="primary" @click="submitAudit" v-if="team_status == 'DRAFT' || team_status == 'AUDIT_FAILED'"
       >提交审核</el-button
     >
     <el-button
@@ -758,7 +770,7 @@ export default {
     },
     teamStatus() {
       // let type = this.$route.query.type;
-      return this.team_status == "DRAFT" || this.team_status == "PROGRESS" ;
+      return this.team_status == "DRAFT" || this.team_status == "PROGRESS" || this.team_status == "AUDIT_FAILED";
     },
     team_status() {
       return this.$route.query.team_status;

src/views/resetTeaming/index.vue

@@ -313,6 +313,7 @@ export default {
         PRE_APPLY: require("./images/3.png"),
         DRAFT: require("./images/5.png"),
         FEE_AUDIT: require("./images/6.png"),
+        FEE_AUDIT_FAILED: require("./images/6.png"),
         APPLY: require("./images/4.png"),
         PAY: require("./images/12.png"),
         PREPARE: require("./images/11.png"),

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

@@ -258,13 +258,12 @@ export default {
     checkGroupPrice(rule, value, callback,music) {
       console.log(rule, value, this.dividend,music);
       if (!value) {
-        callback(new Error("请输入团购价格"));
+        callback(new Error("请输入分润金额"));
       } else if (value*1>this.dividend) {
-        console.log(rule, value, this.dividend,music,'团购金额不得大于');
-        callback(new Error(`团购金额不得大于${this.dividend}元`));
+        callback(new Error(`分润金额不得大于${this.dividend}元`));
       } else if (value*1 <0 ){
         console.log(rule, value, this.dividend,music,'团购金额不得小于0元');
-        callback(new Error(`团购金额不得小于${0}元`));
+        callback(new Error(`分润金额不得小于${0}元`));
       }else {
         callback();
       }

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

@@ -175,7 +175,8 @@ export default {
       this.teamStatus == "look" ||
       this.teamStatus == "teamAudit" ||
       this.teamStatus == "feeAudit" ||
-      this.teamStatus == "teamCanceled"
+      this.teamStatus == "teamCanceled" ||
+      this.teamStatus == 'FEE_AUDIT_FAILED'
     ) {
       this.basdisabled = true;
     } else {
@@ -206,7 +207,8 @@ export default {
         this.teamStatus == "look" ||
         this.teamStatus == "teamAudit" ||
         this.teamStatus == "feeAudit" ||
-        this.teamStatus == "teamCanceled"
+        this.teamStatus == "teamCanceled"||
+        this.teamStatus == 'FEE_AUDIT_FAILED'
       ) {
         this.basdisabled = true;
       } else {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -768,13 +768,14 @@ export default {
       this.$store.dispatch("draftIndex", 0);
     }
     this.teamStatus = this.$route.query.type;
-
+    console.log(this.$route.query.type,'teamStatus')
     if (
       this.teamStatus == "look" ||
       this.teamStatus == "teamAudit" ||
       this.teamStatus == "feeAudit" ||
       this.teamStatus == "APPLY" ||
-      this.teamStatus == "PAY"
+      this.teamStatus == "PAY" ||
+      this.teamStatus == 'FEE_AUDIT_FAILED'
     ) {
       this.basdisabled = true;
     } else {
@@ -897,7 +898,8 @@ export default {
         this.teamStatus == "look" ||
         this.teamStatus == "teamAudit" ||
         this.teamStatus == "feeAudit" ||
-        this.teamStatus == "teamCanceled"
+        this.teamStatus == "teamCanceled"||
+        this.teamStatus == 'FEE_AUDIT_FAILED'
       ) {
         this.basdisabled = true;
       } else {

src/views/teamDetail/teamList.vue

@@ -341,6 +341,15 @@
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button
                 >
+                <el-button
+                  type="text"
+                  v-if="
+                    scope.row.status == 'FEE_AUDIT_FAILED' &&
+                    permission('musicGroup/update')
+                  "
+                  @click="lookTeamDetail(scope.row)"
+                  >编辑</el-button
+                >
                 <!-- 报名中缴费中筹备中查看乐团 -->
                 <el-button
                   type="text"
@@ -879,6 +888,26 @@ export default {
           );
           break;
         }
+        case "FEE_AUDIT_FAILED": {
+          // 审核失败
+          this.$store.dispatch("draftIndex", 3);
+          this.$router.push(
+            {
+              path: "/business/resetTeaming",
+              query: {
+                type: "FEE_AUDIT_FAILED",
+                id: row.id,
+                clear: "true",
+                team_status: row.status,
+                tabrouter: 3,
+              },
+            },
+            (router) => {
+              router.meta.title = "费用审核失败";
+            }
+          );
+          break;
+        }
         case "PRE_APPLY": {
           // 预报名