提交管乐迷小需求

src/views/auditList/memberModel.vue

@@ -1,84 +1,105 @@
 <template>
   <div>
-    <descriptions :column="2" style="margin-bottom: 20px;">
-      <descriptions-item label="云教练单位">{{ detail.period | memberEnumType }}</descriptions-item>
+    <descriptions :column="2" style="margin-bottom: 20px">
+      <descriptions-item label="云教练单位">{{
+        detail.period | memberEnumType
+      }}</descriptions-item>
       <descriptions-item label="周期数">{{ detail.memberNum }}</descriptions-item>
-      <descriptions-item label="缴费金额(元)">{{ detail.actualAmount | moneyFormat(true) }}</descriptions-item>
-      <descriptions-item label="已缴费人数/总人数">{{ detail.paymentUserNum }}/{{ detail.userNum }}</descriptions-item>
+      <descriptions-item label="缴费金额(元)">{{
+        detail.actualAmount | moneyFormat(true)
+      }}</descriptions-item>
+      <descriptions-item label="已缴费人数/总人数"
+        >{{ detail.paymentUserNum }}/{{ detail.userNum }}</descriptions-item
+      >
       <descriptions-item label="创建人">{{ detail.operatorName }}</descriptions-item>
       <descriptions-item label="创建时间">{{ detail.createTime }}</descriptions-item>
-      <descriptions-item label="备注">{{ detail.remark }}</descriptions-item>
+      <descriptions-item :span="2" label="学员姓名">{{
+        detail.userNames
+      }}</descriptions-item>
+      <descriptions-item :span="2" label="备注">{{ detail.remark }}</descriptions-item>
     </descriptions>
 
     <template v-if="detail.status === 'AUDITING'">
-      <el-alert style="margin: 20px 0;"
-                title="审核意见"
-                :closable="false"
-                class="alert"
-                type="info">
+      <el-alert
+        style="margin: 20px 0"
+        title="审核意见"
+        :closable="false"
+        class="alert"
+        type="info"
+      >
       </el-alert>
       <el-form :model="form" ref="form">
-        <el-form-item prop="memo" :rules="[{ required: true, message: '请输入审核意见', trigger: 'blur' }]">
-          <el-input type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4 }"
-                placeholder="请输入审核意见"
-                v-model="form.memo">
-      </el-input>
+        <el-form-item
+          prop="memo"
+          :rules="[{ required: true, message: '请输入审核意见', trigger: 'blur' }]"
+        >
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+            placeholder="请输入审核意见"
+            v-model="form.memo"
+          >
+          </el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer"
-          class="dialog-footer">
-        <el-button type="primary"
-                  @click="submit(1)"
-                  v-if="permission('musicGroupPaymentCalender/auditPass/batchAuditing')">审核通过</el-button>
-        <el-button type="danger"
-                  @click="submit(0)"
-                  v-if="permission('musicGroupPaymentCalender/auditRefuse/batchAuditing')">驳回</el-button>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="submit(1)"
+          v-if="permission('musicGroupPaymentCalender/auditPass/batchAuditing')"
+          >审核通过</el-button
+        >
+        <el-button
+          type="danger"
+          @click="submit(0)"
+          v-if="permission('musicGroupPaymentCalender/auditRefuse/batchAuditing')"
+          >驳回</el-button
+        >
         <el-button @click="$emit('close')">关 闭</el-button>
       </div>
     </template>
   </div>
 </template>
 <script>
-import { permission } from '@/utils/directivePage'
-import { cloudCoachPaymentProgramAudit } from './api'
+import { permission } from "@/utils/directivePage";
+import { cloudCoachPaymentProgramAudit } from "./api";
 export default {
   props: ["detail"],
-  data () {
+  data() {
     return {
       form: {
         memo: "",
-      }
+      },
     };
   },
-  mounted () {
+  mounted() {
     console.log(this.detail, "detail");
   },
   methods: {
-    async submit (val) {
-      this.$refs.form.validate(async(_) => {
-        if(_) {
+    async submit(val) {
+      this.$refs.form.validate(async (_) => {
+        if (_) {
           try {
-            const detail = this.detail
-            const str = val ? '通过' : '驳回'
-            await this.$confirm(`是否确认审核${str}`, '提示', {
-              type: 'warning'
-            })
+            const detail = this.detail;
+            const str = val ? "通过" : "驳回";
+            await this.$confirm(`是否确认审核${str}`, "提示", {
+              type: "warning",
+            });
             await cloudCoachPaymentProgramAudit({
               id: detail.id,
               memo: this.form.memo,
-              status: val ? 'OPEN' : 'REJECT',
+              status: val ? "OPEN" : "REJECT",
             });
-            this.$message.success(`${str}成功`)
-            this.$emit('close')
-            this.$emit('getList')
-          } catch(error) {}
+            this.$message.success(`${str}成功`);
+            this.$emit("close");
+            this.$emit("getList");
+          } catch (error) {}
         }
-      })
+      });
+    },
+    permission(str) {
+      return permission(str);
     },
-    permission (str) {
-      return permission(str)
-    }
   },
 };
 </script>

src/views/categroyManager/modals/baseInfo.vue

@@ -1,11 +1,6 @@
 <template>
   <div>
-    <el-alert
-      title="基础信息"
-      type="info"
-      :closable="false"
-      class="baseMsg"
-    ></el-alert>
+    <el-alert title="基础信息" type="info" :closable="false" class="baseMsg"></el-alert>
 
     <div class="m-core">
       <el-form
@@ -32,7 +27,7 @@
             filterable
             @change="onOrganChange"
             clearable
-            :disabled="isDisabled || status != 'DRAFT'"
+            :disabled="isDisabled"
           >
             <el-option
               v-for="(item, index) in selects.branchs"
@@ -95,7 +90,7 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
             :picker-options="{
-              firstDayOfWeek: 1
+              firstDayOfWeek: 1,
             }"
             end-placeholder="结束日期"
           ></el-date-picker>
@@ -154,9 +149,7 @@
                 </select-all>
               </el-col>
               <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">
-                  可通过该方案购买课程的学员群体，不填则不限制
-                </div>
+                <div slot="content">可通过该方案购买课程的学员群体，不填则不限制</div>
                 <i
                   class="el-icon-question micon el-tooltip"
                   style="font-size: 18px; color: #f56c6c; margin-left: 3px"
@@ -171,14 +164,10 @@
               v-model.trim="baseForm.studentMaxUsedTimes"
               :disabled="isDisabled"
             >
-              <template slot="append"
-                >次</template
-              >
+              <template slot="append">次</template>
             </el-input>
             <el-tooltip placement="top" popper-class="mTooltip">
-              <div slot="content">
-                学员可以购买该活动方案的次数限制，不填则不限制
-              </div>
+              <div slot="content">学员可以购买该活动方案的次数限制，不填则不限制</div>
               <i
                 class="el-icon-question micon el-tooltip"
                 style="font-size: 18px; color: #f56c6c"
@@ -216,12 +205,12 @@
             {
               required: true,
               message: '请选输入活动售价',
-              trigger: 'blur'
+              trigger: 'blur',
             },
             {
               pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-              message: '请输入正确的金额'
-            }
+              message: '请输入正确的金额',
+            },
           ]"
         >
           <el-input
@@ -230,9 +219,7 @@
             v-model.trim="baseForm.marketPrice"
             :disabled="isDisabled || status != 'DRAFT'"
           >
-            <template slot="append"
-              >元</template
-            >
+            <template slot="append">元</template>
           </el-input>
           <el-tooltip placement="top" popper-class="mTooltip">
             <div slot="content">
@@ -251,8 +238,8 @@
             { required: true, message: '请选输入活动原价', trigger: 'blur' },
             {
               pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-              message: '请输入正确的金额'
-            }
+              message: '请输入正确的金额',
+            },
           ]"
         >
           <el-input
@@ -261,9 +248,7 @@
             v-model.trim="baseForm.originalPrice"
             :disabled="isDisabled || status != 'DRAFT'"
           >
-            <template slot="append"
-              >元</template
-            >
+            <template slot="append">元</template>
           </el-input>
         </el-form-item>
       </el-form>
@@ -288,8 +273,8 @@ export default {
             min: 1,
             max: 25,
             message: "长度在 1 到 25 个字符",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
         desc: [
           { required: true, message: "请输入文字描述", trigger: "blur" },
@@ -297,41 +282,31 @@ export default {
             min: 1,
             max: 200,
             message: "长度在 1 到 200 个字符",
-            trigger: "blur"
-          }
-        ],
-        activityType: [
-          { required: true, message: "请选择活动类型", trigger: "change" }
+            trigger: "blur",
+          },
         ],
+        activityType: [{ required: true, message: "请选择活动类型", trigger: "change" }],
         activityChannel: [
-          { required: true, message: "请选择活动渠道", trigger: "change" }
-        ],
-        courseTime: [
-          { required: false, message: "请选择课程时间", trigger: "change" }
+          { required: true, message: "请选择活动渠道", trigger: "change" },
         ],
+        courseTime: [{ required: false, message: "请选择课程时间", trigger: "change" }],
         studentMaxUsedTimes: [
           { required: false, message: "请输入购买次数", trigger: "blur" },
-          { pattern: /^\+?[1-9]\d*$/, message: "请输入大于0的正整数" }
-        ],
-        organ: [
-          { required: true, message: "请选择适用分部", trigger: "change" }
-        ],
-        stauts: [
-          { required: true, message: "请选择活动形式", trigger: "change" }
-        ],
-        applyToStudentType: [
-          { required: false, message: "请选择是否新生专享" }
+          { pattern: /^\+?[1-9]\d*$/, message: "请输入大于0的正整数" },
         ],
+        organ: [{ required: true, message: "请选择适用分部", trigger: "change" }],
+        stauts: [{ required: true, message: "请选择活动形式", trigger: "change" }],
+        applyToStudentType: [{ required: false, message: "请选择是否新生专享" }],
         isPayToBalance: [
           {
             required: true,
             message: "请选择是否支付到余额",
-            trigger: "change"
-          }
+            trigger: "change",
+          },
         ],
         allowOnlineToOffline: [
-          { required: true, message: "请选择课程调整方式", trigger: "change" }
-        ]
+          { required: true, message: "请选择课程调整方式", trigger: "change" },
+        ],
       },
       courseStatusList: [], // 获取所有课程形式
       activeType: "",
@@ -348,7 +323,7 @@ export default {
       courseNumForm: {
         minCourseNum: "",
         maxCourseNum: "",
-        studentMaxUsedTimes: ""
+        studentMaxUsedTimes: "",
       },
       giveClassPaySalaryFlag: true,
       organList: [],
@@ -358,14 +333,14 @@ export default {
         minCourseNum: [
           { required: true, message: "请输入最小课时数", trigger: "blur" },
           { validator: this.validateCom, trigger: "blur" },
-          { validator: this.validateMin, trigger: "blur" }
+          { validator: this.validateMin, trigger: "blur" },
         ],
         maxCourseNum: [
           { required: true, message: "请输入最大课时数", trigger: "blur" },
           { validator: this.validateCom, trigger: "blur" },
-          { validator: this.validateMax, trigger: "blur" }
-        ]
-      }
+          { validator: this.validateMax, trigger: "blur" },
+        ],
+      },
     };
   },
 
@@ -450,26 +425,20 @@ export default {
       this.$emit("resetBaseChannel", val);
     },
     submitFrom() {
-      this.$refs.form.validate(isok => {
+      this.$refs.form.validate((isok) => {
         if (isok) {
-          this.$refs["vipform"].validate(valid => {
+          this.$refs["vipform"].validate((valid) => {
             if (valid) {
               // 验证通过
               let coursesStartTime = null,
                 coursesEndTime = null,
                 startTime = null,
                 endTime = null;
-              if (
-                this.vipform.courseTime &&
-                this.vipform.courseTime.length > 0
-              ) {
+              if (this.vipform.courseTime && this.vipform.courseTime.length > 0) {
                 coursesStartTime = this.vipform.courseTime[0];
                 coursesEndTime = this.vipform.courseTime[1];
               }
-              if (
-                this.vipform.activeTime &&
-                this.vipform.activeTime.length > 0
-              ) {
+              if (this.vipform.activeTime && this.vipform.activeTime.length > 0) {
                 startTime = this.vipform.activeTime[0];
                 endTime = this.vipform.activeTime[1];
               }
@@ -513,7 +482,7 @@ export default {
                 }
                 onlineSalarySettlement = {
                   salarySettlementType: this.onlineSalary,
-                  settlementValue: this.onlineprice
+                  settlementValue: this.onlineprice,
                 };
               } else {
                 onlineSalarySettlement = null;
@@ -530,7 +499,7 @@ export default {
                 }
                 offlineSalarySettlement = {
                   salarySettlementType: this.unonlineSalary,
-                  settlementValue: this.unonlineprice
+                  settlementValue: this.unonlineprice,
                 };
               } else {
                 offlineSalarySettlement = null;
@@ -540,7 +509,7 @@ export default {
               // let giveClassPaySalaryFlag = this.giveClassPaySalaryFlag * 1;
               let vipGroupSalarySettlement = {
                 onlineSalarySettlement,
-                offlineSalarySettlement
+                offlineSalarySettlement,
               };
               if (type == "BASE_ACTIVITY") {
                 this.courseNumForm.studentMaxUsedTimes = -1;
@@ -577,16 +546,15 @@ export default {
                     : -1,
                   offlineClassJoinGradientRewards:
                     this.offlineClassJoinGradientRewards * 1,
-                  onlineClassJoinGradientRewards:
-                    this.onlineClassJoinGradientRewards * 1
+                  onlineClassJoinGradientRewards: this.onlineClassJoinGradientRewards * 1,
                 })
-              ).then(res => {
+              ).then((res) => {
                 if (res.code == 200) {
                   this.$message.success("恭喜你,活动创建成功");
                   // this.onReSet();
                   this.$store.dispatch("delVisitedViews", this.$route);
                   this.$router.push({
-                    path: "/vipActiveManager/vipActiveList"
+                    path: "/vipActiveManager/vipActiveList",
                   });
                 }
               });
@@ -595,7 +563,7 @@ export default {
                 let isError = document.getElementsByClassName("is-error");
                 isError[0].scrollIntoView({
                   block: "center",
-                  behavior: "smooth"
+                  behavior: "smooth",
                 });
               });
               // this.$message.error("请填写必要参数");
@@ -620,7 +588,7 @@ export default {
       // 选择所有分部
       let vipform = this.vipform;
       vipform.organ = [];
-      this.selects.branchs.forEach(item => {
+      this.selects.branchs.forEach((item) => {
         vipform.organ.push(item.id);
       });
       this.$refs.vipform.validateField("organ");
@@ -632,7 +600,7 @@ export default {
         name: "",
         desc: "",
         activeTime: [],
-        courseTime: []
+        courseTime: [],
       };
       this.activeType = "";
       this.online = true;
@@ -649,7 +617,7 @@ export default {
       this.courseNumForm.maxCourseNum = "";
       this.courseNumForm.minCourseNum = "";
       // this.$refs.vipform.resetFields();
-    }
+    },
   },
   computed: {
     balanceDis() {
@@ -659,8 +627,8 @@ export default {
       } else {
         return false;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/categroyManager/vipActiveList.vue

@@ -7,10 +7,7 @@
 
     <div class="m-core">
       <div class="btnList" style="margin-bottom: 20px">
-        <el-button
-          type="primary"
-          v-permission="'/vipNewActive'"
-          @click="gotoNewActive"
+        <el-button type="primary" v-permission="'/vipNewActive'" @click="gotoNewActive"
           >新建</el-button
         >
         <!-- <el-button
@@ -140,30 +137,35 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
-          <el-table-column align="center" prop="id" label="活动编号">
+          <el-table-column align="left" prop="name" label="活动名称">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.id }}</copy-text>
+              <copy-text>{{ scope.row.name }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="name" label="活动名称">
+          <el-table-column align="left" prop="id" label="适用分部">
             <template slot-scope="scope">
-              <copy-text>{{ scope.row.name }}</copy-text>
+              <copy-text>{{ scope.row.organName }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="activityType" label="活动渠道">
+          <!-- <el-table-column align="center" prop="activityType" label="活动渠道">
             <template slot-scope="scope">
               <div>
-                <!-- {{ scope.row.activityChannel == 1 ? "乐团小课" : "常规小课" }} -->
                 {{ scope.row.activityChannel == 1 ? "乐团小课" : "" }}
                 {{ scope.row.activityChannel == 2 ? "常规小课" : "" }}
                 {{ scope.row.activityChannel == 3 ? "学生购买" : "" }}
               </div>
             </template>
-          </el-table-column>
-          <el-table-column align="center" prop="activityType" label="活动类型">
+          </el-table-column> -->
+          <el-table-column align="left" prop="activityType" label="活动类型">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.activityType ? "会员活动" : "课程活动" }}
+                <div>
+                  {{ scope.row.activityChannel == 1 ? "活动渠道：乐团小课" : "" }}
+                  {{ scope.row.activityChannel == 2 ? "活动渠道：常规小课" : "" }}
+                  {{ scope.row.activityChannel == 3 ? "活动渠道：学生购买" : "" }}
+                </div>
+                <p>活动类型：{{ scope.row.activityType ? "会员活动" : "课程活动" }}</p>
               </div>
             </template>
           </el-table-column>
@@ -175,6 +177,15 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" prop="name" label="课程形式">
+            <template slot-scope="scope">
+              <div>
+                {{
+                  scope.row.vipGroupCategoryNames ? scope.row.vipGroupCategoryNames : "--"
+                }}
+              </div>
+            </template>
+          </el-table-column>
           <!-- <el-table-column
             align="center"
             prop="type"
@@ -272,11 +283,11 @@
                 <el-button
                   v-if="
                     scope.row.status == 'PROGRESS' &&
-                      scope.row.maxCourseNum &&
-                      scope.row.minCourseNum &&
-                      scope.row.maxCourseNum > 0 &&
-                      scope.row.minCourseNum > 0 &&
-                      scope.row.minCourseNum == scope.row.maxCourseNum
+                    scope.row.maxCourseNum &&
+                    scope.row.minCourseNum &&
+                    scope.row.maxCourseNum > 0 &&
+                    scope.row.minCourseNum > 0 &&
+                    scope.row.minCourseNum == scope.row.maxCourseNum
                   "
                   type="text"
                   v-permission="'/activeSenior'"
@@ -322,9 +333,7 @@
                       @click="scope._self.$refs[scope.$index].doClose()"
                       >取消</el-button
                     >
-                    <el-button type="primary" @click="remove(scope)"
-                      >确定</el-button
-                    >
+                    <el-button type="primary" @click="remove(scope)">确定</el-button>
                   </div>
                   <el-button type="text" slot="reference">删除</el-button>
                 </el-popover>
@@ -352,7 +361,7 @@ import pagination from "@/components/Pagination/index";
 import {
   vipGroupActivity,
   removeVipActive,
-  enableVipGroupActivity
+  enableVipGroupActivity,
 } from "@/api/vipSeting";
 import ExportChiose from "@/components/Export-chiose";
 import qs from "qs";
@@ -372,7 +381,7 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       searchForm: {
         organId: null,
@@ -381,9 +390,9 @@ export default {
         applyToStudentType: null,
         allowOnlineToOffline: null,
         status: null,
-        activityChannel: null
+        activityChannel: null,
       },
-      dialogVisible: false
+      dialogVisible: false,
     };
   },
   // created() {
@@ -454,9 +463,7 @@ export default {
         switch (obj.onlineSalarySettlement.salarySettlementType) {
           case "RATIO_DISCOUNT": {
             if (obj.onlineSalarySettlement.settlementValue) {
-              return `线上:比例结算${
-                obj.onlineSalarySettlement.settlementValue
-              }%`;
+              return `线上:比例结算${obj.onlineSalarySettlement.settlementValue}%`;
             } else {
               return "线上:比例结算";
             }
@@ -468,9 +475,7 @@ export default {
           }
           case "FIXED_SALARY": {
             if (obj.onlineSalarySettlement.settlementValue) {
-              return `线上:固定课酬${
-                obj.onlineSalarySettlement.settlementValue
-              }/次`;
+              return `线上:固定课酬${obj.onlineSalarySettlement.settlementValue}/次`;
             } else {
               return "线上:固定课酬";
             }
@@ -490,9 +495,7 @@ export default {
         switch (obj.offlineSalarySettlement.salarySettlementType) {
           case "RATIO_DISCOUNT": {
             if (obj.offlineSalarySettlement.settlementValue) {
-              return `线下:比例结算${
-                obj.offlineSalarySettlement.settlementValue
-              }%`;
+              return `线下:比例结算${obj.offlineSalarySettlement.settlementValue}%`;
             } else {
               return "线下:比例结算";
             }
@@ -504,9 +507,7 @@ export default {
           }
           case "FIXED_SALARY": {
             if (obj.offlineSalarySettlement.settlementValue) {
-              return `线下:固定课酬${
-                obj.offlineSalarySettlement.settlementValue
-              }/次`;
+              return `线下:固定课酬${obj.offlineSalarySettlement.settlementValue}/次`;
             } else {
               return "线下:固定课酬";
             }
@@ -514,7 +515,7 @@ export default {
           }
         }
       }
-    }
+    },
   },
   methods: {
     async init() {
@@ -531,7 +532,7 @@ export default {
       let obj = {
         ...rest,
         page: this.rules.page,
-        rows: this.rules.limit
+        rows: this.rules.limit,
       };
       await Export(
         this,
@@ -539,7 +540,7 @@ export default {
           url: "/api-web/export/vipGroupActivity",
           fileName: "活动列表.xls",
           method: "post",
-          params: qs.stringify(cleanDeep(obj))
+          params: qs.stringify(cleanDeep(obj)),
         },
         "您确定活动列表?"
       );
@@ -559,7 +560,7 @@ export default {
     onCheckAllBranch() {
       // 适用所有分部
       this.resetForm.organ = [];
-      this.organList.forEach(item => {
+      this.organList.forEach((item) => {
         this.resetForm.organ.push(item.id);
       });
     },
@@ -588,8 +589,8 @@ export default {
         status: this.searchForm.status,
         activityChannel: this.searchForm.activityChannel,
         enable,
-        search
-      }).then(res => {
+        search,
+      }).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;
@@ -693,9 +694,9 @@ export default {
       this.$router.push(
         {
           path: "/operateManager/vipNewActive?type=reset",
-          query: { id: row.id }
+          query: { id: row.id },
         },
-        router => {
+        (router) => {
           router.meta.title = "修改活动方案";
         }
       );
@@ -703,20 +704,20 @@ export default {
     look(row) {
       this.$router.push({
         path: "/operateManager/vipNewActive?type=look",
-        query: { id: row.id }
+        query: { id: row.id },
       });
     },
     // 活动资格管理
     activeManager(row) {
       this.$router.push({
         path: "/operateManager/activeSenior",
-        query: { id: row.id }
+        query: { id: row.id },
       });
     },
     // 点击确认按钮发送修改请求
     remove(scope) {
       let id = scope.row.id;
-      removeVipActive({ id }).then(res => {
+      removeVipActive({ id }).then((res) => {
         if (res.code == 200) {
           this.$message.success("恭喜您删除成功");
           this.getList();
@@ -730,10 +731,10 @@ export default {
       // let searchForm = JSON.stringify(this.searchForm);
       this.$router.push(
         {
-          path: "/operateManager/vipNewActive?type=create"
+          path: "/operateManager/vipNewActive?type=create",
           // query: { rules, searchForm },
         },
-        router => {
+        (router) => {
           router.meta.title = "新建活动方案";
         }
       );
@@ -784,10 +785,10 @@ export default {
       this.$confirm(`是否${tempString}该活动?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          enableVipGroupActivity({ id: row.id }).then(res => {
+          enableVipGroupActivity({ id: row.id }).then((res) => {
             if (res.code == 200) {
               this.$message.success("操作成功");
               this.getList();
@@ -795,8 +796,8 @@ export default {
           });
         })
         .catch(() => {});
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/studentManager/api.js

@@ -33,4 +33,13 @@ export const cloudQueryPage = (data) => request2({
   url: '/api-web/studentCloudCoachPaymentDetails/queryPage',
   method: 'get',
   params: data
-})
+})
+
+// 设置云教练会员时长
+export const setStudentMembe = (data) => request2({
+  url: '/api-web/studentManage/updateStudentMember',
+  method: 'post',
+  data: data,
+  requestType: 'form'
+
+})

src/views/studentManager/modals/setMemberDate.vue

@@ -35,7 +35,7 @@
   </div>
 </template>
 <script>
-import { add, update } from "../api";
+import { setStudentMembe } from "../api";
 import { getmemberRankOrganizationFeeMapper } from "@/views/categroyManager/productSystem/api";
 import { sysConfigList } from "@/api/generalSettings"; // 平台的修改和查
 export default {
@@ -74,7 +74,8 @@ export default {
         console.log(res, this.type, "res");
         if (res) {
           try {
-            console.log(this.memberForm, "memberForm");
+            const res = await setStudentMembe({ ...this.memberForm });
+            this.$message.success("修改成功");
             this.$emit("close");
             this.$emit("submited");
           } catch (e) {

src/views/studentManager/studentList.vue

@@ -622,10 +622,12 @@
                     </el-dropdown-item>
                     <el-dropdown-item
                       style="width: 180px"
-                      v-if="$helpers.permission('studentManage/studentUpdate/setStudent')"
+                      v-if="$helpers.permission('studentManage/updateStudentMember')"
                       @click.native="setClound(scope.row)"
                     >
-                      <el-button type="text" style="padding-left: 10px">云教练</el-button>
+                      <el-button type="text" style="padding-left: 10px"
+                        >云教练时长调整</el-button
+                      >
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -1099,7 +1101,7 @@
         v-if="cloundDateVisible"
         :row="activatedRow"
         ref="submitDateReset"
-        @close="memberVisible = false"
+        @close="cloundDateVisible = false"
         @submited="getList"
       ></setMemberDate>
       <div slot="footer" class="dialog-footer">

src/views/teamDetail/teamList.vue

@@ -32,7 +32,7 @@
             v-model.trim="topForm.search"
             clearable
             @keyup.enter.native="
-              e => {
+              (e) => {
                 e.target.blur();
                 $refs.topForm.save();
                 search();
@@ -93,7 +93,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
+        <el-form-item prop="educationalTeacherId">
+          <remote-search
+            :commit="'setEducations'"
+            v-model="topForm.educationalTeacherId"
+          />
+        </el-form-item>
         <el-form-item prop="isStartedCourse">
           <el-select
             v-model.trim="topForm.isStartedCourse"
@@ -130,7 +135,7 @@
             start-placeholder="申请开始日期"
             end-placeholder="申请结束日期"
             :picker-options="{
-              firstDayOfWeek: 1
+              firstDayOfWeek: 1,
             }"
           ></el-date-picker>
         </el-form-item>
@@ -144,7 +149,7 @@
             start-placeholder="成团开始日期"
             end-placeholder="成团结束日期"
             :picker-options="{
-              firstDayOfWeek: 1
+              firstDayOfWeek: 1,
             }"
           ></el-date-picker>
         </el-form-item>
@@ -155,10 +160,7 @@
           <el-button type="primary" native-type="reset">重置</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            v-permission="'export/musicGroup'"
-            @click="onExport"
+          <el-button type="primary" v-permission="'export/musicGroup'" @click="onExport"
             >导出</el-button
           >
         </el-form-item>
@@ -179,24 +181,14 @@
             align="center"
             label="所属分部"
           ></el-table-column>
-          <el-table-column
-            prop="id"
-            width="100"
-            align="center"
-            label="乐团编号"
-          >
+          <el-table-column prop="id" width="100" align="center" label="乐团编号">
             <template slot-scope="scope">
               <copy-text>
                 {{ scope.row.id }}
               </copy-text>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="name"
-            width="200px"
-            align="center"
-            label="乐团名称"
-          >
+          <el-table-column prop="name" width="200px" align="center" label="乐团名称">
             <template slot-scope="scope">
               <p>
                 {{ scope.row.name }}
@@ -225,18 +217,10 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="educationalTeacherName"
-            align="center"
-            label="乐团主管"
-          >
+          <el-table-column prop="educationalTeacherName" align="center" label="乐团主管">
           </el-table-column>
 
-          <el-table-column
-            prop="groupMemberNum"
-            align="center"
-            label="成团人数"
-          >
+          <el-table-column prop="groupMemberNum" align="center" label="成团人数">
           </el-table-column>
           <el-table-column prop="payNum" align="center" label="在读人数">
           </el-table-column>
@@ -280,30 +264,21 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            width="220px"
-            fixed="right"
-            label="操作"
-          >
+          <el-table-column align="center" width="220px" fixed="right" label="操作">
             <template slot-scope="scope">
               <div>
                 <!-- 审核中 编辑 -->
                 <el-button
                   type="text"
                   v-if="
-                    scope.row.status == 'AUDIT' &&
-                      permission('musicGroup/auditSuccess')
+                    scope.row.status == 'AUDIT' && permission('musicGroup/auditSuccess')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >审核</el-button
                 >
                 <el-button
                   type="text"
-                  v-if="
-                    scope.row.status == 'DRAFT' &&
-                      permission('musicGroup/update')
-                  "
+                  v-if="scope.row.status == 'DRAFT' && permission('musicGroup/update')"
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button
                 >
@@ -311,8 +286,7 @@
                 <el-button
                   type="text"
                   v-if="
-                    scope.row.status == 'AUDIT_FAILED' &&
-                      permission('musicGroup/update')
+                    scope.row.status == 'AUDIT_FAILED' && permission('musicGroup/update')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button
@@ -321,7 +295,7 @@
                   type="text"
                   v-if="
                     scope.row.status == 'FEE_AUDIT_FAILED' &&
-                      permission('musicGroup/update')
+                    permission('musicGroup/update')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >编辑</el-button
@@ -339,7 +313,7 @@
                       scope.row.status == 'PREPARE' ||
                       scope.row.status == 'CLOSE' ||
                       scope.row.status == 'FEE_AUDIT') &&
-                      permission('/resetTeaming')
+                    permission('/resetTeaming')
                   "
                   @click="lookTeamDetail(scope.row)"
                   >详情</el-button
@@ -355,7 +329,7 @@
                   type="text"
                   v-if="
                     scope.row.status == 'PROGRESS' &&
-                      permission('musicGroup/closeMusicGroup')
+                    permission('musicGroup/closeMusicGroup')
                   "
                   @click="closeTeamDetail(scope.row)"
                   >关闭</el-button
@@ -380,17 +354,14 @@
                       scope.row.status == 'PAY' ||
                       scope.row.status == 'PRE_APPLY' ||
                       scope.row.status == 'DRAFT') &&
-                      permission('musicGroup/cancelMusicGroup')
+                    permission('musicGroup/cancelMusicGroup')
                   "
                   @click="stopTeam(scope.row)"
                   >取消乐团</el-button
                 >
 
                 <el-button
-                  v-if="
-                    scope.row.status == 'PREPARE' &&
-                      permission('musicGroup/action')
-                  "
+                  v-if="scope.row.status == 'PREPARE' && permission('musicGroup/action')"
                   @click="startTeam(scope.row)"
                   type="text"
                   >确认成团</el-button
@@ -400,9 +371,8 @@
                            @click="stopTeam(scope.row)">取消乐团</el-button> -->
                 <el-button
                   v-if="
-                    (scope.row.status == 'PAUSE' ||
-                      scope.row.status == 'CLOSE') &&
-                      permission('musicGroup/resumeMusicGroup')
+                    (scope.row.status == 'PAUSE' || scope.row.status == 'CLOSE') &&
+                    permission('musicGroup/resumeMusicGroup')
                   "
                   @click="onTeamOpeation('start', scope.row)"
                   type="text"
@@ -411,7 +381,7 @@
                 <el-button
                   v-if="
                     scope.row.status == 'PROGRESS' &&
-                      permission('musicGroup/pauseMusicGroup')
+                    permission('musicGroup/pauseMusicGroup')
                   "
                   @click="onTeamOpeation('pause', scope.row)"
                   type="text"
@@ -421,7 +391,7 @@
                 <el-button
                   v-if="
                     scope.row.status == 'CANCELED' &&
-                      permission('musicGroup/deleteMusicGroup')
+                    permission('musicGroup/deleteMusicGroup')
                   "
                   @click="deteleTeaming(scope.row)"
                   type="text"
@@ -471,7 +441,7 @@ import {
   getEmployeeOrgan,
   pauseMusicGroup,
   resumeMusicGroup,
-  deleteMusicGroup
+  deleteMusicGroup,
 } from "@/api/buildTeam";
 import { musicGroupStatus, courseViewTypeList } from "@/utils/searchArray";
 import { isObject } from "util";
@@ -498,7 +468,8 @@ export default {
         billTimer: [],
         createTimer: [],
         cooperationOrganId: null,
-        isStartedCourse: null
+        isStartedCourse: null,
+        educationalTeacherId: null,
       },
       organList: [],
       nowStatus: musicGroupStatus,
@@ -509,19 +480,19 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       passed: [], // 传递的参数
       showSteam: false,
       activeId: null,
-      cooperationList: []
+      cooperationList: [],
     };
   },
   components: {
     pagination,
     teamSteam,
     closeStudens,
-    Tooltip
+    Tooltip,
   },
   mounted() {
     const { query } = this.$route;
@@ -550,7 +521,7 @@ export default {
     init() {
       localStorage.setItem("resetCode", "1");
 
-      getEmployeeOrgan().then(res => {
+      getEmployeeOrgan().then((res) => {
         if (res.code == 200) {
           this.organList = res.data;
         }
@@ -584,13 +555,10 @@ export default {
         cooperationOrganId: this.topForm.cooperationOrganId || null,
         searchType: this.$route.query.searchType,
         isStartedCourse: this.topForm.isStartedCourse,
-        ...getTimes(
-          createTimer,
-          ["createStartDate", "createEndDate"],
-          "YYYY-MM-DD"
-        ),
-        ...getTimes(billTimer, ["billStartDate", "billEndDate"], "YYYY-MM-DD")
-      }).then(res => {
+        educationalTeacherId: this.topForm.educationalTeacherId || null,
+        ...getTimes(createTimer, ["createStartDate", "createEndDate"], "YYYY-MM-DD"),
+        ...getTimes(billTimer, ["billStartDate", "billEndDate"], "YYYY-MM-DD"),
+      }).then((res) => {
         if (res.code == 200) {
           this.tableData = res.data.rows;
           this.rules.total = res.data.total;
@@ -604,9 +572,9 @@ export default {
       this.$router.push(
         {
           path: "/business/resetTeaming",
-          query: { type: "newTeam", team_status: "newTeam" }
+          query: { type: "newTeam", team_status: "newTeam" },
         },
-        router => {
+        (router) => {
           router.meta.title = "新建乐团";
         }
       );
@@ -620,17 +588,17 @@ export default {
       }
       this.$router.push({
         path: "/business/teamDraft",
-        query: { type: "teamList", teamList: this.passed }
+        query: { type: "teamList", teamList: this.passed },
       });
     },
     resetTeaming(row) {
       // 修改进行中的乐团
       localStorage.removeItem(`${row.id}base`);
       localStorage.removeItem(`${row.id}sound`);
-      this.$nextTick(res => {
+      this.$nextTick((res) => {
         this.$router.push({
           path: "/business/resetTeaming",
-          query: { type: "resetTeam", id: row.id }
+          query: { type: "resetTeam", id: row.id },
         });
       });
     },
@@ -640,7 +608,7 @@ export default {
       // 有相同的key => 替换这个对象
       if (obj.type == 1) {
         let flag = false;
-        this.searchLsit = this.searchLsit.map(item => {
+        this.searchLsit = this.searchLsit.map((item) => {
           if (item.id == obj.id) {
             item = obj;
             flag = true;
@@ -652,7 +620,7 @@ export default {
         }
       } else {
         let flag = false;
-        this.searchLsit = this.searchLsit.map(item => {
+        this.searchLsit = this.searchLsit.map((item) => {
           if (item.key == obj.key) {
             // 多选框的再次点击=> 等于 就是删除
             item = obj;
@@ -702,10 +670,10 @@ export default {
         this.$confirm("是否确定开启乐团?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
           .then(() => {
-            resumeMusicGroup({ musicGroupId: row.id }).then(res => {
+            resumeMusicGroup({ musicGroupId: row.id }).then((res) => {
               if (res.code == 200) {
                 this.$message.success("开启成功");
                 this.getList();
@@ -719,10 +687,10 @@ export default {
         this.$confirm("是否确定暂停乐团?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
           .then(() => {
-            pauseMusicGroup({ musicGroupId: row.id }).then(res => {
+            pauseMusicGroup({ musicGroupId: row.id }).then((res) => {
               if (res.code == 200) {
                 this.$message.success("暂停成功");
                 this.getList();
@@ -742,7 +710,7 @@ export default {
       // 查看课表
       this.$router.push({
         path: "/teamListCourse",
-        query: { id: row.id, name: row.name }
+        query: { id: row.id, name: row.name },
       });
     },
     lookTeamDetail(row) {
@@ -766,9 +734,9 @@ export default {
           this.$router.push(
             {
               path: "/business/resetTeaming",
-              query: { type: "teamDraft", id: row.id, team_status: row.status }
+              query: { type: "teamDraft", id: row.id, team_status: row.status },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团编辑中";
             }
           );
@@ -785,10 +753,10 @@ export default {
                 type: "teamAudit",
                 id: row.id,
                 clear: "true",
-                team_status: row.status
-              }
+                team_status: row.status,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团审核中";
             }
           );
@@ -808,10 +776,10 @@ export default {
                 id: row.id,
                 name: row.name,
                 team_status: "DRAFT",
-                tabrouter: 3
-              }
+                tabrouter: 3,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "创建缴费中";
             }
           );
@@ -827,10 +795,10 @@ export default {
                 type: "feeAudit",
                 id: row.id,
                 clear: "true",
-                team_status: row.status
-              }
+                team_status: row.status,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团费用审核中";
             }
           );
@@ -846,10 +814,10 @@ export default {
                 type: "teamDraft",
                 id: row.id,
                 clear: "true",
-                team_status: row.status
-              }
+                team_status: row.status,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团审核失败";
             }
           );
@@ -866,10 +834,10 @@ export default {
                 id: row.id,
                 clear: "true",
                 team_status: row.status,
-                tabrouter: 3
-              }
+                tabrouter: 3,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "费用审核失败";
             }
           );
@@ -886,10 +854,10 @@ export default {
                 id: row.id,
                 name: row.name,
                 team_status: "PRE_APPLY",
-                tabrouter: 9
-              }
+                tabrouter: 9,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团预报名";
             }
           );
@@ -910,10 +878,10 @@ export default {
                 name: row.name,
                 team_status: "APPLY",
                 type: "look",
-                tabrouter: 11
-              }
+                tabrouter: 11,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团报名中";
             }
           );
@@ -930,10 +898,10 @@ export default {
                 name: row.name,
                 team_status: "PAY",
                 type: "look",
-                tabrouter: 11
-              }
+                tabrouter: 11,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团缴费中";
             }
           );
@@ -950,10 +918,10 @@ export default {
                 id: row.id,
                 name: row.name,
                 team_status: row.status,
-                tabrouter: 10
-              }
+                tabrouter: 10,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团筹备中";
             }
           );
@@ -971,10 +939,10 @@ export default {
                 name: row.name,
                 organId: row.organId,
                 type: "resetTeam",
-                team_status: row.status
-              }
+                team_status: row.status,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团进行中";
             }
           );
@@ -988,10 +956,10 @@ export default {
               query: {
                 type: "teamCanceled",
                 id: row.id,
-                team_status: row.status
-              }
+                team_status: row.status,
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "取消乐团";
             }
           );
@@ -1006,9 +974,9 @@ export default {
           this.$router.push(
             {
               path: "/business/resetTeaming",
-              query: { type: "resetTeam", id: row.id, team_status: row.status }
+              query: { type: "resetTeam", id: row.id, team_status: row.status },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团暂停";
             }
           );
@@ -1023,10 +991,10 @@ export default {
                 id: row.id,
                 name: row.name,
                 team_status: "CLOSE",
-                type: "look"
-              }
+                type: "look",
+              },
             },
-            router => {
+            (router) => {
               router.meta.title = "乐团关闭";
             }
           );
@@ -1048,7 +1016,7 @@ export default {
     gotodetailList(row) {
       this.$router.push({
         path: "/teamListedList",
-        query: { id: row.id }
+        query: { id: row.id },
       });
     },
     //
@@ -1061,8 +1029,8 @@ export default {
           type: "look",
           id: row.id,
           name: row.name,
-          team_status: row.status
-        }
+          team_status: row.status,
+        },
       });
     },
     // setImprovement 设置基础技能班
@@ -1071,7 +1039,7 @@ export default {
       let rules = JSON.stringify(this.rules);
       this.$router.push({
         path: "/business/setImprovement",
-        query: { id: row.id }
+        query: { id: row.id },
       });
     },
     // 停止乐团
@@ -1079,12 +1047,12 @@ export default {
       this.$confirm("您确定取消申请乐团?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           cancelMusicGroup({
-            musicGroupId: row.id
-          }).then(res => {
+            musicGroupId: row.id,
+          }).then((res) => {
             if (res.code == 200) {
               this.$message.success("停止成功");
               this.getList();
@@ -1098,10 +1066,10 @@ export default {
       this.$confirm("是否确定成团?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          startTeam({ musicGroupId: row.id }).then(res => {
+          startTeam({ musicGroupId: row.id }).then((res) => {
             if (res.code == 200) {
               this.$message.success("开启乐团成功");
               this.getList();
@@ -1114,12 +1082,12 @@ export default {
       this.$confirm("您确定删除该乐团?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           deleteMusicGroup({
-            musicGroupId: row.id
-          }).then(res => {
+            musicGroupId: row.id,
+          }).then((res) => {
             if (res.code == 200) {
               this.$message.success("删除成功");
               this.getList();
@@ -1136,9 +1104,9 @@ export default {
       this.$router.push(
         {
           path: `/business/remedy`,
-          query: { status: row.status, id: row.id, name: row.name }
+          query: { status: row.status, id: row.id, name: row.name },
         },
-        router => {
+        (router) => {
           router.meta.title = "报名详情";
         }
       );
@@ -1148,13 +1116,9 @@ export default {
       let obj = {
         ...reset,
         organId: this.topForm.orgin.join(",") || null,
-        ...getTimes(
-          createTimer,
-          ["createStartDate", "createEndDate"],
-          "YYYY-MM-DD"
-        ),
+        ...getTimes(createTimer, ["createStartDate", "createEndDate"], "YYYY-MM-DD"),
         searchType: this.$route.query.searchType,
-        ...getTimes(billTimer, ["billStartDate", "billEndDate"], "YYYY-MM-DD")
+        ...getTimes(billTimer, ["billStartDate", "billEndDate"], "YYYY-MM-DD"),
       };
       await Export(
         this,
@@ -1162,7 +1126,7 @@ export default {
           url: "/api-web/export/musicGroup",
           fileName: "乐团列表.xls",
           method: "post",
-          params: qs.stringify(cleanDeep(obj))
+          params: qs.stringify(cleanDeep(obj)),
         },
         "您确定导出乐团列表?"
       );
@@ -1174,21 +1138,21 @@ export default {
         return;
       }
       // 合作单位
-      await queryByOrganId({ organId: value.join(",") }).then(res => {
+      await queryByOrganId({ organId: value.join(",") }).then((res) => {
         if (res.code == 200) {
           this.cooperationList = res.data;
           this.topForm.cooperationOrganId = null;
         }
       });
-    }
+    },
   },
   watch: {
     showSteam(val) {
       if (!val) {
         this.activeId = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>