Merge branch '0609getMusicFee' into test

src/views/categroyManager/insideSetting/staffManager.vue

@@ -18,7 +18,7 @@
           <el-input type="text" clearable
                     v-model.trim="searchForm.search"
                     @keyup.enter.native='search'
-                    placeholder="姓名或手机号"></el-input>
+                    placeholder="姓名、编号、手机号"></el-input>
         </el-form-item>
         <el-form-item prop="jobNature">
           <el-select v-model.trim="searchForm.jobNature"

src/views/categroyManager/productSystem/memberSet.vue

@@ -106,7 +106,7 @@
           label="会员名称"
           prop="name"
           :label-width="formLabelWidth"
-          :rules="[{ required: true, message: '请输入会员名称' },]"
+          :rules="[{ required: true, message: '请输入会员名称' }]"
         >
           <el-input
             :disabled="addDisabled"
@@ -119,14 +119,13 @@
         </el-form-item>
         <el-form-item
           label="会员介绍"
-
           prop="intro"
           :label-width="formLabelWidth"
           :rules="[{ required: true, message: '请输入会员介绍' }]"
         >
           <el-input
-          maxlength="50"
-           show-word-limit
+            maxlength="50"
+            show-word-limit
             :disabled="addDisabled"
             v-model.trim="form.intro"
             autocomplete="off"
@@ -149,7 +148,9 @@
             :imageHeightM="200"
           ></upload>
           <img v-else :src="form.icon" alt="" width="120px" height="120px" />
-          <p style="color:red" v-if="!addDisabled">请上传200*200像素，大小2M以内，格式为jpg、png、gif图片</p>
+          <p style="color: red" v-if="!addDisabled">
+            请上传200*200像素，大小2M以内，格式为jpg、png、gif图片
+          </p>
         </el-form-item>
         <!-- <br />
         <el-form-item
@@ -337,6 +338,8 @@ export default {
       this.title = "新增会员等级";
       this.addDisabled = false;
       this.pageType = "create";
+      this.getNewTree()
+      this.slideCount = 0;
       this.treeData = this.setTableData(this.silderList, this.addDisabled);
       this.branchStatus = true;
     },
@@ -402,6 +405,7 @@ export default {
     },
     setTableData(result, disabled) {
       let list = [];
+
       list = result.map((res) => {
         let tempList = {};
         tempList = {
@@ -422,40 +426,20 @@ export default {
       return list;
     },
     async resetMember(row, type) {
-      try {
-        const resTree = await getMemberPrivilegesItem();
-        this.silderList = resTree.data;
-        this.treeData = this.setTableData(resTree.data);
-        const res = await getmemberRankDetail({ memberRankSettingId: row.id });
-        this.form = { ...res.data };
-        this.checkAll =
-          res.data.memberPrivilegesItemIdList.length >= this.slideCount;
-        // 反写树的值
-        this.isIndeterminate =
-          res.data.memberPrivilegesItemIdList.length > 0 &&
-          res.data.memberPrivilegesItemIdList.length < this.slideCount;
-
-        this.checkList = res.data.memberPrivilegesItemIdList;
-        let tSplice = this.getParent(
-          res.data.memberPrivilegesItemIdList,
-          this.treeData
-        );
-        this.checkList = tSplice;
-      } catch (e) {
-        console.log(e);
-      }
+      this.resetTree(row);
       if (type) {
         this.title = "修改会员等级";
         this.pageType = "update";
         this.addDisabled = false;
+        this.slideCount = 0;
         this.treeData = this.setTableData(this.silderList, this.addDisabled);
       } else {
         this.addDisabled = true;
         this.title = "查看会员等级";
         this.pageType = "";
+        this.slideCount = 0;
         this.treeData = this.setTableData(this.silderList, this.addDisabled);
       }
-
       this.branchStatus = true;
     },
     //递归获取到所有的为子级的ID
@@ -483,6 +467,37 @@ export default {
         }
       });
     },
+    async resetTree(row) {
+      try {
+        this.getNewTree();
+        const res = await getmemberRankDetail({ memberRankSettingId: row.id });
+        this.form = { ...res.data };
+
+        this.checkAll =
+          res.data.memberPrivilegesItemIdList.length >= this.slideCount;
+        // 反写树的值
+        this.isIndeterminate =
+          res.data.memberPrivilegesItemIdList.length > 0 &&
+          res.data.memberPrivilegesItemIdList.length < this.slideCount;
+
+        this.checkList = res.data.memberPrivilegesItemIdList;
+        let tSplice = this.getParent(
+          res.data.memberPrivilegesItemIdList,
+          this.treeData
+        );
+        this.checkList = tSplice;
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    async getNewTree() {
+      try {
+        const resTree = await getMemberPrivilegesItem();
+        this.silderList = resTree.data;
+        this.slideCount = 0;
+        this.treeData = this.setTableData(resTree.data);
+      } catch {}
+    },
   },
 };
 </script>

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -270,7 +270,7 @@
           <el-table-column
             align="center"
             prop="expectAmount"
-            label="预计缴费金额"
+            label="缴费金额"
           ></el-table-column>
           <el-table-column align="center" label="缴费开始日期">
             <template slot-scope="scope">

src/views/resetTeaming/modals/review-detail.vue

@@ -163,20 +163,30 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="!musicGroupPaymentCalenderCourseSettingName"
+      v-if="memberRankSettingId"
     >
     </el-alert>
+    <div v-if="memberRankSettingId">
+      <descriptions
+        v-for="item in musicGroupPaymentCalenders"
+        :key="item.id + 'member'"
+        :column="2"
+      >
+        <descriptions-item label="会员等级：">{{
+          item.memberRankSettingName
+        }}</descriptions-item>
+        <descriptions-item label="会员有效期："
+          >{{ item.memberValidDate }}个月</descriptions-item
+        >
+        <descriptions-item label="现价">{{
+          numeral(item.memberPaymentAmount).format("0,0")
+        }}</descriptions-item>
+        <descriptions-item label="原价">{{
+          numeral(item.originalMemberPaymentAmount).format("0,0")
+        }}</descriptions-item>
+      </descriptions>
+    </div>
     <!-- 会员信息 -->
-    <descriptions
-      v-for="item in musicGroupPaymentCalenders"
-      :key="item.id+'member'"
-      :column="2"
-    >
-      <descriptions-item label="会员等级：">{{item.memberRankSettingName}}</descriptions-item>
-      <descriptions-item label="会员有效期：">{{item.memberValidDate}}个月</descriptions-item>
-      <descriptions-item label="现价">{{ numeral(item.memberPaymentAmount).format("0,0")}}</descriptions-item>
-      <descriptions-item label="原价">{{ numeral(item.originalMemberPaymentAmount).format("0,0")}}</descriptions-item>
-    </descriptions>
 
     <el-alert title="缴费周期" :closable="false" class="alert" type="info">
     </el-alert>
@@ -186,7 +196,7 @@
       :column="2"
     >
       <descriptions-item label="缴费金额：">{{
-        numeral(item.paymentAmount+item.memberPaymentAmount).format("0,0")
+        numeral(item.paymentAmount + item.memberPaymentAmount).format("0,0")
       }}</descriptions-item>
       <descriptions-item label="缴费方式：">{{
         item.paymentPattern | paymentPatternTypeFormat
@@ -196,7 +206,7 @@
         v-if="item.payUserType !== 'SCHOOL'"
         label="缴费日期："
         >{{ item.startPaymentDate | dayjsFormat }} -
-         {{ item.deadlinePaymentDate | dayjsFormat }}</descriptions-item
+        {{ item.deadlinePaymentDate | dayjsFormat }}</descriptions-item
       >
       <descriptions-item
         :span="3"
@@ -262,6 +272,13 @@ export default {
       }
       return "";
     },
+    memberRankSettingId() {
+      const active = this.musicGroupPaymentCalenders[0];
+      if (active) {
+        return active.memberRankSettingId;
+      }
+      return "";
+    },
   },
   mounted() {
     this.init();

src/views/resetTeaming/modals/user-baseinfo.vue

@@ -16,10 +16,11 @@
         <el-radio label="2">临时加课</el-radio>
       </el-radio-group>
     </el-form-item>
+    <!-- !this.rowDetail&& -->
     <el-form-item
       label="收费标准"
       prop="musicGroupOrganizationCourseSettingId"
-      v-if="isCommon && form.musicGroupOrganizationCourseSettingId != 0 && !this.rowDetail&&courseViewType != 1"
+      v-if="isCommon && form.musicGroupOrganizationCourseSettingId != 0 && courseViewType != 1"
       :rules="[{required: true, message: '请选择收费标准', trigger: 'change'}]"
     >
       <el-select style="width: 100%!important;" v-model="form.musicGroupOrganizationCourseSettingId" placeholder="请选择收费标准">
@@ -31,10 +32,11 @@
         </el-option>
       </el-select>
     </el-form-item>
+    <!-- && !rowDetail -->
     <el-alert
       :closable="false"
-      style="margin-left: 160px;width: auto;"
-      v-if="paymentType != 0 && isCommon && !rowDetail&&courseViewType != 1"
+      style="margin-left: 160px;width: auto; margin-bottom:20px;"
+      v-if="paymentType != 0 && isCommon &&courseViewType != 1"
       type="warning">
       <template #title>
         <p>该乐团为{{chargeTypeName}}模式，若需创建其他模式的收费标准，请先修改乐团基本信息中的乐团模式

src/views/resetTeaming/modals/user-pay-form.vue

@@ -388,7 +388,8 @@ export default {
       }
     },
     async "form.musicGroupOrganizationCourseSettingId"(val) {
-      if (val && !this.rowDetail) {
+      // && !this.rowDetail
+      if (val ) {
         try {
           const res = await queryByMusicGroupOrganizationCourseSettingsId({
             id: val,

src/views/teamBuild/components/teamBaseInfo.vue

@@ -59,14 +59,13 @@
           <el-select
             v-model.trim="topFrom.courseViewType"
             filterable
-            :disabled="basdisabled"
+            :disabled="basdisabled || (team_status !='newTeam'&&team_status !='DRAFT')"
             clearable
           >
             <el-option label="课程收费" :value="0"></el-option>
             <el-option label="会员收费" :value="1"></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item
           label="合作单位"
           prop="school"

src/views/teamDetail/components/memberClassList.vue

@@ -154,16 +154,17 @@
             <div>{{ scope.row.preTotalClassTimes }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="剩余可排课时长(分钟)">
+               <el-table-column align="center" label="已预排课时长(分钟)">
           <template slot-scope="scope">
-            <div>{{ scope.row.preSubMinutes }}</div>
+            <div>{{ scope.row.preMinutes  }}</div>
           </template>
         </el-table-column>
-        <!-- <el-table-column align="center" label="是否冻结">
+        <el-table-column align="center" label="剩余可排课时长(分钟)">
           <template slot-scope="scope">
-            <div>{{ scope.row.lockFlag | yesOrNo }}</div>
+            <div>{{ scope.row.preSubMinutes }}</div>
           </template>
-        </el-table-column> -->
+        </el-table-column>
+
         <el-table-column
           align="center"
           width="240px"