Merge branch '0609getMusicFee' into test

src/views/businessManager/shopManager/shopList.vue

@@ -1634,6 +1634,10 @@ export default {
           if (form.replacementShowOrganId) {
             form.replacementShowOrganId = form.replacementShowOrganId.join(",");
           }
+          if(!form.studentShowOrganId&&!form.educationShowOrganId&&!form.courseFeeShowOrganId&&!form.courseFeeShowOrganId&&!form.replacementShowOrganId){
+            this.$message.error('请至少选择一个可见分部')
+            return
+          }
           form.goodsList = null;
           if (this.addType == "create" || this.addType == "copy") {
             if (this.form.id) {

src/views/businessManager/shopManager/shopOperation.vue

@@ -644,11 +644,10 @@ export default {
             tempForm.replacementShowOrganId =
               tempForm.replacementShowOrganId.join(",");
           }
-          //      studentShowOrganId: null,
-          // educationShowOrganId: null,
-          // courseFeeShowOrganId: null,
-          // memberFeeShowOrganId: null,
-          // replacementShowOrganId: null,
+          if(!tempForm.studentShowOrganId&&!tempForm.educationShowOrganId&&!tempForm.courseFeeShowOrganId&&!tempForm.courseFeeShowOrganId&&!tempForm.replacementShowOrganId){
+            this.$message.error('请至少选择一个可见分部')
+            return
+          }
           if (this.pageType == "create" || this.pageType == "copy") {
             if (tempForm.id) {
               // 判断有没有Id，如果有则删除

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -152,7 +152,7 @@
                 v-if="
                   scope.row.auditStatus != 'REJECT' &&
                   scope.row.auditStatus != 'AUDITING' &&
-                    scope.row.auditStatus != 'DRAFT' &&
+                  scope.row.auditStatus != 'DRAFT' &&
                   teamStatus &&
                   scope.row.paymentType != 'MUSIC_APPLY' &&
                   scope.row.paymentType != 'ADD_STUDENT'
@@ -175,8 +175,11 @@
               </auth>
               <el-button
                 type="text"
-                v-if="teamStatus && (scope.row.auditStatus === 'REJECT' ||
-                      scope.row.auditStatus === 'DRAFT')"
+                v-if="
+                  teamStatus &&
+                  (scope.row.auditStatus === 'REJECT' ||
+                    scope.row.auditStatus === 'DRAFT')
+                "
                 v-permission="'musicGroupPaymentCalender/update/3883'"
                 @click="resetPay(scope.row)"
                 >修改</el-button
@@ -469,7 +472,7 @@ import {
   getMusicGroupStu,
   musicGroupPaymentCalenderDetailBatchAdd,
   musicGroupPaymentCalenderDelByBatchNo,
-  revokeMusicGroupPaymentCalender
+  revokeMusicGroupPaymentCalender,
 } from "../api";
 import setStudentFee from "./studentPayBase";
 import userPayForm from "../modals/user-pay-form";
@@ -600,12 +603,14 @@ export default {
       this.getList();
     },
     getTeamInfo() {
-      getTeamBaseInfo({ musicGroupId: this.$route.query.id }).then((res) => {
-        if (res.code == 200) {
-          this.baseInfo = res.data;
-          this.$emit("getBaseInfo", this.baseInfo);
-        }
-      });
+      if (this.$route.query.id) {
+        getTeamBaseInfo({ musicGroupId: this.$route.query.id }).then((res) => {
+          if (res.code == 200) {
+            this.baseInfo = res.data;
+            this.$emit("getBaseInfo", this.baseInfo);
+          }
+        });
+      }
     },
     newUserPay() {
       this.payFormType = "user";
@@ -618,8 +623,8 @@ export default {
         this.baseInfo?.musicGroup?.courseViewType == 2 &&
         this.team_status == "PRE_BUILD_FEE"
       ) {
-        this.$message.error('会员缴费乐团无法创建学校缴费')
-        return
+        this.$message.error("会员缴费乐团无法创建学校缴费");
+        return;
       } else {
         this.payFormType = "school";
         this.isNew = true;