Browse Source

Merge branch '02/23reviewBUG' into jenkins

mo 2 years ago
parent
commit
6746c066ce

+ 5 - 5
src/views/smallCourseConsumption/components/actualList.vue

@@ -59,7 +59,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于4节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="4节">
           <template slot-scope="scope">
           <p>
               {{
@@ -69,7 +69,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于3节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="3节">
           <template slot-scope="scope">
           <p>
               {{
@@ -79,7 +79,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于2节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="2节">
           <template slot-scope="scope">
           <p>
               {{
@@ -89,7 +89,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于1节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="1节">
           <template slot-scope="scope">
           <p>
               {{
@@ -99,7 +99,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于0节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="0节">
           <template slot-scope="scope">
           <p>
               {{

+ 5 - 5
src/views/smallCourseConsumption/components/preList.vue

@@ -67,7 +67,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于4节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="4节">
           <template slot-scope="scope">
           <p>
               {{
@@ -77,7 +77,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于3节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="3节">
           <template slot-scope="scope">
           <p>
               {{
@@ -87,7 +87,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于2节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="2节">
           <template slot-scope="scope">
           <p>
               {{
@@ -97,7 +97,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于1节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="1节">
           <template slot-scope="scope">
           <p>
               {{
@@ -107,7 +107,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于0节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="0节">
           <template slot-scope="scope">
           <p>
               {{

+ 5 - 5
src/views/smallCourseConsumption/components/statisticsList.vue

@@ -97,7 +97,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于4节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="4节">
           <template slot-scope="scope">
           <p>
               {{
@@ -107,7 +107,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于3节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="3节">
           <template slot-scope="scope">
           <p>
               {{
@@ -117,7 +117,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于2节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="2节">
           <template slot-scope="scope">
           <p>
               {{
@@ -127,7 +127,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于1节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="1节">
           <template slot-scope="scope">
           <p>
               {{
@@ -137,7 +137,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="大于等于0节">
+        <el-table-column align="center" prop="studentBasicInfo.subjectName" label="0节">
           <template slot-scope="scope">
           <p>
               {{

+ 119 - 193
src/views/teamBuild/components/teamBaseInfo.vue

@@ -116,13 +116,8 @@
             <p style="position: relative; display: inline-block">
               教学地点
               <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">
-                  如果已生成课表,则会修改未上课时的教学点
-                </div>
-                <i
-                  class="el-icon-question"
-                  style="font-size: 18px; color: #f56c6c"
-                ></i>
+                <div slot="content">如果已生成课表,则会修改未上课时的教学点</div>
+                <i class="el-icon-question" style="font-size: 18px; color: #f56c6c"></i>
               </el-tooltip>
             </p>
           </template>
@@ -224,15 +219,8 @@
 
           </el-select>
         </el-form-item> -->
-        <el-form-item
-          label="机构类型"
-          prop="ownershipType"
-          v-if="tenantId == 1"
-        >
-          <el-select
-            v-model.trim="topFrom.ownershipType"
-            :disabled="basdisabled"
-          >
+        <el-form-item label="机构类型" prop="ownershipType" v-if="tenantId == 1">
+          <el-select v-model.trim="topFrom.ownershipType" :disabled="basdisabled">
             <el-option label="自有" value="OWN"></el-option>
             <el-option label="三方" value="COOPERATION"></el-option>
             <!-- <el-option label="租赁"
@@ -262,12 +250,7 @@
           prop="teacher"
           :rules="[{ required: true, message: '乐团主管不能为空' }]"
         >
-          <el-select
-            v-model.trim="topFrom.teacher"
-            :disabled="true"
-            filterable
-            clearable
-          >
+          <el-select v-model.trim="topFrom.teacher" :disabled="true" filterable clearable>
             <el-option
               v-for="(item, key) in educationList"
               :key="key"
@@ -387,21 +370,21 @@
           <el-form-item
             label="收费标准"
             prop="defaultChargeStandard"
-            :rules="[{ required: true, message: '收费标准不能为空' }, {
-              pattern:
-                /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-              message: '请输入正确的金额',
-              trigger: 'blur',
-            },]"
+            :rules="[
+              { required: true, message: '收费标准不能为空' },
+              {
+                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: '请输入正确的金额',
+                trigger: 'blur',
+              },
+            ]"
           >
             <el-input
               v-model.trim="topFrom.defaultChargeStandard"
               placeholder="请输入收费标准"
               :disabled="basdisabled"
             >
-            <i slot="suffix" class="el-input__icon" style="padding-right: 5px"
-                >元</i
-              >
+              <i slot="suffix" class="el-input__icon" style="padding-right: 5px">元</i>
             </el-input>
           </el-form-item>
           <el-form-item
@@ -470,63 +453,44 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="学生基数"
-            prop="graduateGrade"
-
-          >
-          <el-input type="number"  :disabled="basdisabled"  v-model="topFrom.basicStudentNum" />
+          <el-form-item label="学生基数" prop="graduateGrade">
+            <el-input
+              type="number"
+              :disabled="basdisabled"
+              v-model="topFrom.basicStudentNum"
+            />
           </el-form-item>
 
-          <el-form-item
-            label="缴费方"
-            prop="paymentUserType"
-
-          >
-          <el-select
+          <el-form-item label="缴费方" prop="paymentUserType">
+            <el-select
               v-model.trim="topFrom.paymentUserType"
               filterable
               :disabled="basdisabled"
               clearable
+              @change="()=>{
+                topFrom.chargeMode =''
+              }"
             >
-              <el-option
-
-                label="学校"
-                value="SCHOOL"
-
-              ></el-option>
+              <el-option label="学校" value="SCHOOL"></el-option>
               <el-option label="学员" value="STUDENT"></el-option>
-<el-option label="第三方" value="THIRDPARTY"
-
-></el-option>
+              <el-option label="第三方" value="THIRDPARTY"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="计费方式"
-            prop="chargeMode"
-
-          >
-          <el-select
+          <el-form-item label="计费方式" prop="chargeMode" v-if="topFrom.paymentUserType != 'STUDENT'">
+            <el-select
               v-model.trim="topFrom.chargeMode"
               filterable
               :disabled="basdisabled"
               clearable
             >
-              <el-option
-
-                label="学员计费"
-                value="STUDENT"
-
-              ></el-option>
+              <el-option label="学员计费" value="STUDENT"></el-option>
               <el-option label="老师计费" value="TEACHER"></el-option>
             </el-select>
-
           </el-form-item>
 
-
           <el-form-item label="销售活动" prop="saleActivityDesc">
             <el-input
-            style="width:300px"
+              style="width: 300px"
               placeholder="请输入销售活动"
               :maxlength="100"
               v-model.trim="topFrom.saleActivityDesc"
@@ -551,10 +515,7 @@
                 <div slot="content">
                   学员提交乐团课后作业时,群聊中是否发送作业提交消息
                 </div>
-                <i
-                  class="el-icon-question"
-                  style="font-size: 18px; color: #f56c6c"
-                ></i>
+                <i class="el-icon-question" style="font-size: 18px; color: #f56c6c"></i>
               </el-tooltip>
             </p>
           </template>
@@ -577,10 +538,7 @@
               是否赠送辅件
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">购买团练宝是否赠送辅件</div>
-                <i
-                  class="el-icon-question"
-                  style="font-size: 18px; color: #f56c6c"
-                ></i>
+                <i class="el-icon-question" style="font-size: 18px; color: #f56c6c"></i>
               </el-tooltip>
             </p>
           </template>
@@ -646,11 +604,7 @@
         <div class="nextBtn" @click="gotoNext()" v-if="!basdisabled">
           {{ this.teamStatus == "teamDraft" ? "下一步" : "保存" }}
         </div>
-        <div
-          class="nextBtn"
-          v-if="this.teamStatus == 'teamAudit'"
-          @click="gotoNext()"
-        >
+        <div class="nextBtn" v-if="this.teamStatus == 'teamAudit'" @click="gotoNext()">
           下一步
         </div>
       </div>
@@ -738,9 +692,9 @@ export default {
         coursePlan: "", // 课程计划
         graduateGrade: "", // 毕业年级
         saleActivityDesc: "", // 销售活动描述
-        basicStudentNum:"", // 学生基数
-        paymentUserType:"", // 缴费方
-        chargeMode:"", // 计费方式
+        basicStudentNum: "", // 学生基数
+        paymentUserType: "", // 缴费方
+        chargeMode: "", // 计费方式
       },
       baseInfo: {},
       money: 580,
@@ -785,9 +739,7 @@ export default {
         expireDate: null,
       },
       extendRule: {
-        expireDate: [
-          { required: true, message: "请选择延长时间", trigger: "change" },
-        ],
+        expireDate: [{ required: true, message: "请选择延长时间", trigger: "change" }],
       },
       isPay: false,
       extendPaymentStatus: false, // 延长缴费
@@ -828,14 +780,14 @@ export default {
       this.$store.dispatch("draftIndex", 0);
     }
     this.teamStatus = this.$route.query.type;
-    console.log(this.$route.query.type,'teamStatus')
+    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 == 'FEE_AUDIT_FAILED'
+      this.teamStatus == "FEE_AUDIT_FAILED"
     ) {
       this.basdisabled = true;
     } else {
@@ -958,8 +910,8 @@ export default {
         this.teamStatus == "look" ||
         this.teamStatus == "teamAudit" ||
         this.teamStatus == "feeAudit" ||
-        this.teamStatus == "teamCanceled"||
-        this.teamStatus == 'FEE_AUDIT_FAILED'
+        this.teamStatus == "teamCanceled" ||
+        this.teamStatus == "FEE_AUDIT_FAILED"
       ) {
         this.basdisabled = true;
       } else {
@@ -969,9 +921,7 @@ export default {
         // 单团修改
         this.teamid = this.$route.query.id;
 
-        let sotrage = JSON.parse(
-          localStorage.getItem(`${this.$route.query.id}base`)
-        );
+        let sotrage = JSON.parse(localStorage.getItem(`${this.$route.query.id}base`));
 
         if (!sotrage?.section) {
           getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
@@ -1024,32 +974,30 @@ export default {
       //     this.typeList = res.data.rows;
       //   }
       // });
-      Promise.all([getType({ rows: 1000 }), getEmployeeOrgan()]).then(
-        (values) => {
-          if (values[0].code == 200) {
-            this.typeList = values[0].data;
-            // this.typeList = [];
-          }
-          if (values[1].code == 200) {
-            this.sectionList = values[1].data;
-            // this.sectionList = [];
-          }
-          let arr = [];
-          if (this.sectionList.length <= 0) {
-            arr.push("organ");
-          } else {
-            if (!this.topFrom.section) {
-              this.$set(this.topFrom, "section", this.sectionList[0].id);
-              this.changeSection(this.sectionList[0].id);
-              // diao
-            }
-          }
-          if (this.typeList.length <= 0) {
-            arr.push("teamPayType");
+      Promise.all([getType({ rows: 1000 }), getEmployeeOrgan()]).then((values) => {
+        if (values[0].code == 200) {
+          this.typeList = values[0].data;
+          // this.typeList = [];
+        }
+        if (values[1].code == 200) {
+          this.sectionList = values[1].data;
+          // this.sectionList = [];
+        }
+        let arr = [];
+        if (this.sectionList.length <= 0) {
+          arr.push("organ");
+        } else {
+          if (!this.topFrom.section) {
+            this.$set(this.topFrom, "section", this.sectionList[0].id);
+            this.changeSection(this.sectionList[0].id);
+            // diao
           }
-          this.$bus.$emit("showguide", arr);
         }
-      );
+        if (this.typeList.length <= 0) {
+          arr.push("teamPayType");
+        }
+        this.$bus.$emit("showguide", arr);
+      });
       // console.log('到这里来',getEmployeeOrgan())
       // 缓存设置时的状态
     },
@@ -1115,28 +1063,27 @@ export default {
           }
         }
       });
-      Promise.all([
-        queryByOrganId({ organId: val }),
-        getSchool({ organId: val }),
-      ]).then((values) => {
-        if (values[0].code == 200) {
-          this.cooperationList = values[0].data;
-        }
-        if (values[1].code == 200) {
-          this.addList = values[1].data;
-        }
-        let arr = [];
-        if (this.cooperationList.length <= 0) {
-          arr.push("cooperationOrgan");
-        }
-        if (this.addList.length <= 0) {
-          arr.push("school");
-        }
-        if (arr.length > 0) {
-          this.$bus.$emit("showguide", arr);
-          return;
+      Promise.all([queryByOrganId({ organId: val }), getSchool({ organId: val })]).then(
+        (values) => {
+          if (values[0].code == 200) {
+            this.cooperationList = values[0].data;
+          }
+          if (values[1].code == 200) {
+            this.addList = values[1].data;
+          }
+          let arr = [];
+          if (this.cooperationList.length <= 0) {
+            arr.push("cooperationOrgan");
+          }
+          if (this.addList.length <= 0) {
+            arr.push("school");
+          }
+          if (arr.length > 0) {
+            this.$bus.$emit("showguide", arr);
+            return;
+          }
         }
-      });
+      );
     },
     chioseSchool(val) {
       // 清除教学点
@@ -1214,9 +1161,9 @@ export default {
             //  修改  合并对象
             obj.musicGroup = {
               settlementType: this.topFrom.salary,
-              applyExpireDate: this.topFrom.time?dayjs(this.topFrom.time).format(
-                "YYYY-MM-DD HH:mm:ss"
-              ):null,
+              applyExpireDate: this.topFrom.time
+                ? dayjs(this.topFrom.time).format("YYYY-MM-DD HH:mm:ss")
+                : null,
               chargeTypeId: this.topFrom.type,
               cooperationOrganId: this.topFrom.school,
               courseViewType: this.topFrom.courseViewType,
@@ -1257,7 +1204,7 @@ export default {
               saleActivityDesc: this.topFrom.saleActivityDesc,
               basicStudentNum: this.topFrom.basicStudentNum,
               paymentUserType: this.topFrom.paymentUserType,
-              chargeMode: this.topFrom.chargeMode
+              chargeMode: this.topFrom.chargeMode,
             };
             // obj.musicGroupPaymentEntities = [];
             // createTeam
@@ -1378,16 +1325,16 @@ export default {
         isGiveAccessories: false,
         memberCourseShowFlag: 0,
         extracurricularTeacher: "NORMAL",
-        musicGroupPlanMakingId: '',
-        firstRecruitGrade: '',
-        defaultChargeStandard: '',
-        singleTrainMinutes: '',
-        coursePlan: '',
-        graduateGrade: '',
-        saleActivityDesc: '',
-        paymentUserType:'',
-        chargeMode:'',
-        basicStudentNum:''
+        musicGroupPlanMakingId: "",
+        firstRecruitGrade: "",
+        defaultChargeStandard: "",
+        singleTrainMinutes: "",
+        coursePlan: "",
+        graduateGrade: "",
+        saleActivityDesc: "",
+        paymentUserType: "",
+        chargeMode: "",
+        basicStudentNum: "",
       };
       this.$refs["topinfo"].resetFields();
     },
@@ -1551,8 +1498,7 @@ export default {
                 this.extendPaymentStatus = false;
                 getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
                   if (res.code == 200) {
-                    this.paymentExpireDate =
-                      res.data.musicGroup.paymentExpireDate;
+                    this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
                   }
                 });
               } else {
@@ -1598,10 +1544,8 @@ export default {
       this.topFrom.type = res.data.musicGroup.chargeTypeId;
       this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(",");
       this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern;
-      this.topFrom.paymentValidStartDate =
-        res.data.musicGroup.paymentValidStartDate;
-      this.topFrom.paymentValidEndDate =
-        res.data.musicGroup.paymentValidEndDate;
+      this.topFrom.paymentValidStartDate = res.data.musicGroup.paymentValidStartDate;
+      this.topFrom.paymentValidEndDate = res.data.musicGroup.paymentValidEndDate;
       this.topFrom.section = res.data.musicGroup.organId;
       this.topFrom.courseViewType = res.data.musicGroup.courseViewType;
       this.topFrom.school = res.data.musicGroup.cooperationOrganId;
@@ -1623,40 +1567,25 @@ export default {
         : null;
       this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
       this.applyExpireDate = res.data.musicGroup.applyExpireDate;
-      this.topFrom.transactionTeacherId =
-        res.data.musicGroup.transactionTeacherId || "";
+      this.topFrom.transactionTeacherId = res.data.musicGroup.transactionTeacherId || "";
       this.topFrom.homeworkPushFlag = res.data.musicGroup.homeworkPushFlag;
-      this.topFrom.isGiveAccessories = res.data.musicGroup.isGiveAccessories+''
-      console.log(this.topFrom.isGiveAccessories,'isGiveAccessories')
-      this.topFrom.memberCourseShowFlag = res.data.musicGroup
-        .memberCourseShowFlag
+      this.topFrom.isGiveAccessories = res.data.musicGroup.isGiveAccessories + "";
+      console.log(this.topFrom.isGiveAccessories, "isGiveAccessories");
+      this.topFrom.memberCourseShowFlag = res.data.musicGroup.memberCourseShowFlag
         ? 1
         : 0;
-      this.topFrom.extracurricularTeacher =
-        res.data.musicGroup.extracurricularTeacher;
-
-        this.topFrom.musicGroupPlanMakingId =
-        res.data.musicGroup.musicGroupPlanMakingId;
-        this.topFrom.firstRecruitGrade =
-        res.data.musicGroup.firstRecruitGrade+'';
-        this.topFrom.defaultChargeStandard =
-        res.data.musicGroup.defaultChargeStandard;
-        this.topFrom.singleTrainMinutes =
-        res.data.musicGroup.singleTrainMinutes;
-        this.topFrom.coursePlan =
-        res.data.musicGroup.coursePlan;
-        this.topFrom.graduateGrade =
-        res.data.musicGroup.graduateGrade+'';
-        this.topFrom.saleActivityDesc =
-        res.data.musicGroup.saleActivityDesc;
-        this.topFrom.basicStudentNum =
-        res.data.musicGroup.basicStudentNum;
-        this.topFrom.paymentUserType =
-        res.data.musicGroup.paymentUserType;
-        this.topFrom.chargeMode =
-        res.data.musicGroup.chargeMode;
-
+      this.topFrom.extracurricularTeacher = res.data.musicGroup.extracurricularTeacher;
 
+      this.topFrom.musicGroupPlanMakingId = res.data.musicGroup.musicGroupPlanMakingId;
+      this.topFrom.firstRecruitGrade = res.data.musicGroup.firstRecruitGrade + "";
+      this.topFrom.defaultChargeStandard = res.data.musicGroup.defaultChargeStandard;
+      this.topFrom.singleTrainMinutes = res.data.musicGroup.singleTrainMinutes;
+      this.topFrom.coursePlan = res.data.musicGroup.coursePlan;
+      this.topFrom.graduateGrade = res.data.musicGroup.graduateGrade + "";
+      this.topFrom.saleActivityDesc = res.data.musicGroup.saleActivityDesc;
+      this.topFrom.basicStudentNum = res.data.musicGroup.basicStudentNum;
+      this.topFrom.paymentUserType = res.data.musicGroup.paymentUserType;
+      this.topFrom.chargeMode = res.data.musicGroup.chargeMode;
 
       localStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
     },
@@ -1669,10 +1598,7 @@ export default {
       if (this.teamStatus == "newTeam" || this.teamStatus == "teamDraft") {
         return false;
       } else {
-        if (
-          this.topFrom.courseViewType == 0 ||
-          this.topFrom.courseViewType == 1
-        ) {
+        if (this.topFrom.courseViewType == 0 || this.topFrom.courseViewType == 1) {
           // val ==2
           return false;
         } else {
@@ -1706,7 +1632,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" >
+<style lang="scss">
 .messageBox-prompt-test {
   .el-message-box__status {
     top: 25% !important;