bug修复和三期简单需求

1

src/constant/index.js

@@ -294,10 +294,10 @@ export const vipResetType = {
   '2': '线下不可调为线上',
   '3': '线上线下不可互调'
 }
-
+//   1: 'AMR收费',
 export const courseViewType = {
   0: '课程收费',
-  1: 'AMR收费',
+
   2: '会员收费'
 }
 

src/views/auditList/index.vue

@@ -152,32 +152,15 @@
           ></el-table-column> -->
           <el-table-column
             align="center"
-            prop="courseOriginalPrice"
+            prop="originalTotalAmount"
             label="总原价(元)"
           >
-            <template slot-scope="scope">
-              <div>
-                {{
-                  (scope.row.courseOriginalPrice +
-                    scope.row.originalMemberPaymentAmount)
-                    | moneyFormat
-                }}
-              </div>
-            </template>
           </el-table-column>
           <el-table-column
             align="center"
-            prop="courseCurrentPrice"
+            prop="currentTotalAmount"
             label="申请价格(元)"
           >
-            <template slot-scope="scope">
-              <div>
-                {{
-                  (scope.row.courseCurrentPrice + scope.row.memberPaymentAmount)
-                    | moneyFormat
-                }}
-              </div>
-            </template>
           </el-table-column>
           <el-table-column
             align="center"

src/views/categroyManager/insideSetting/branchManager.vue

@@ -142,7 +142,21 @@
       @close="onFormClose('ruleForm')"
       width="1060px"
     >
-      <el-form :model="form" :rules="rules" ref="ruleForm" :inline="true">
+      <el-form
+        :model="form"
+        :rules="rules"
+        ref="ruleForm"
+        :inline="true"
+        class="eidtForm"
+        label-position="left"
+      >
+        <el-alert
+          style="margin: 10px 0"
+          title="合作单位信息"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
         <el-row>
           <el-form-item
             label="单位名称"
@@ -153,7 +167,6 @@
               v-model.trim="form.name"
               :disabled="basdisabled"
               autocomplete="off"
-              style="width: 180px !important"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -163,7 +176,6 @@
           >
             <el-select
               :disabled="basdisabled"
-              style="width: 180px !important"
               v-model.trim="form.organId"
               @change="changeOrgan"
               filterable
@@ -186,7 +198,6 @@
             :rules="[{ required: true, message: '乐团主管不能为空' }]"
           >
             <el-select
-              style="width: 180px !important"
               :disabled="!form.organId || basdisabled"
               v-model.trim="form.educationUserId"
               filterable
@@ -215,7 +226,6 @@
               v-model.trim="form.isEnable"
               filterable
               clearable
-              style="width: 180px !important"
             >
               <el-option label="开启" :value="true"></el-option>
               <el-option label="关闭" :value="false"></el-option>
@@ -229,16 +239,23 @@
             <el-select
               :disabled="basdisabled"
               v-model.trim="form.fullJobResource"
-              style="width: 180px !important"
             >
               <el-option label="是" :value="1"></el-option>
               <el-option label="否" :value="0"></el-option>
             </el-select>
           </el-form-item>
         </el-row>
+        <el-alert
+          style="margin: 10px 0"
+          title="合作单位联系人"
+          :closable="false"
+          type="info"
+        >
+        </el-alert>
         <el-row
           v-for="(item, index) in form.cooperationOrganLinkmanList"
           :key="index"
+          class="greyRow"
         >
           <el-form-item
             :rules="[
@@ -252,7 +269,6 @@
               :disabled="basdisabled"
               v-model.trim="item.linkman"
               autocomplete="off"
-              style="width: 180px !important"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -267,7 +283,6 @@
               :disabled="basdisabled"
               v-model.trim="item.job"
               autocomplete="off"
-              style="width: 180px !important"
             ></el-input>
           </el-form-item>
           <el-form-item
@@ -288,25 +303,30 @@
               :disabled="basdisabled"
               v-model.trim="item.mobileNo"
               autocomplete="off"
-              style="width: 180px !important"
             ></el-input>
           </el-form-item>
           <i
-            class="el-icon-remove-outline marginLeft10 iconStyle"
+            class="el-icon-delete-solid marginLeft10 iconStyle"
             v-if="form.cooperationOrganLinkmanList.length > 1 && !basdisabled"
             @click="deleteLinkMan(index)"
             style="font-size: 20px; cursor: pointer"
           ></i>
-          <i
+          <!-- <i
             class="el-icon-circle-plus-outline marginLeft10 iconStyle"
-            v-if="
-              !basdisabled &&
-              index + 1 == form.cooperationOrganLinkmanList.length
-            "
-            @click="addLinkMan"
+
+
             style="font-size: 20px; cursor: pointer"
-          ></i>
+          ></i> -->
         </el-row>
+        <!-- index + 1 == form.cooperationOrganLinkmanList.length -->
+        <el-button
+          v-if="!basdisabled"
+          class="greyRow"
+          style="width: 100%"
+          icon="el-icon-plus"
+          @click="addLinkMan"
+          >添加联系人</el-button
+        >
       </el-form>
 
       <span slot="footer" class="dialog-footer">
@@ -590,7 +610,7 @@ export default {
             id: val,
           });
           this.educationList = ruselt?.data?.educationId;
-          if (!this.educationList ||this.educationList?.length <= 0) {
+          if (!this.educationList || this.educationList?.length <= 0) {
             this.$bus.$emit("showguide", ["teamManager"]);
           }
         } catch (e) {
@@ -633,6 +653,33 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.eidtForm {
+  /deep/.el-form--inline {
+    .el-form-item__content {
+      display: block;
+    }
+  }
+  /deep/.el-select {
+    width: 300px !important;
+  }
+  /deep/.el-date-editor {
+    width: 300px !important;
+  }
+  /deep/.el-checkbox {
+    margin-left: 15px !important;
+  }
+  /deep/.el-input {
+    position: relative;
+    font-size: 14px;
+    display: inline-block;
+    width: 300px !important;
+  }
+}
+.greyRow {
+  background-color: #f9f9f9;
+  padding: 10px;
+  margin-bottom: 10px;
+}
 
 /deep/.el-select {
   width: 100% !important;

src/views/courseRulersManager/components/onlineCloudRules.vue

@@ -343,6 +343,7 @@
             云教室课程间隔<el-input
               v-model="form['50']"
               placeholder="请输入时间"
+              :disabled="isPlatform?false:true"
             >
               <template slot="append">分钟</template>
             </el-input>

src/views/resetTeaming/components/payInfoDetail.vue

@@ -703,13 +703,19 @@ export default {
       }
     },
     async "form.musicGroupOrganizationCourseSettingId"(val) {
-      // && !this.rowDetail
+      // && !this.rowDetail !this.$route.query.calenderId
 
-      if (val && !this.isSetCourseSettingsId && !this.$route.query.calenderId) {
+      if (val && !this.isSetCourseSettingsId  ) {
         try {
           const res = await queryByMusicGroupOrganizationCourseSettingsId({
             id: val,
           });
+          let CourseSettingDetail = res.data.map(course=>{
+            return {
+              ...course,
+
+            }
+          })
           this.$set(this.form, "eclass", res.data);
           // this.syncAllMoney();
         } catch (error) {}

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -8,7 +8,7 @@
           <el-table-column label="乐团课课酬课时结算">
             <template slot-scope="scope">{{ scope.row.courseScheduleType | coursesType }}</template>
           </el-table-column>
-          <el-table-column label="自定义课酬-主教">
+          <!-- <el-table-column label="自定义课酬-主教">
             <template slot-scope="scope">
               <el-input type="number"
                         @mousewheel.native.prevent
@@ -37,7 +37,7 @@
                           v-else>元/30分钟</template>
               </el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="标准课酬-主教">
             <template slot-scope="scope">
               <el-input type="number"

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

@@ -233,7 +233,6 @@ export default {
                       // 如果没有一个声部 则请求默认声部
 
                       if (res.data?.musicGroupSubjectPlans?.length > 0) {
-
                         let activeSound = [];
                         this.activeSoundList =
                           res.data?.musicGroupSubjectPlans.map((item) => {
@@ -496,7 +495,11 @@ export default {
       //  初始化声部
       obj.musicGroupSubjectGoodsGroups = [];
       obj.musicGroupSubjectPlans = [];
+      let noMusic = [];
       this.activeSoundList.forEach((active) => {
+        if (!active.chioseMusic[0]?.musical) {
+          noMusic.push(active.sound);
+        }
         // 格式化声部数据
         let item = {
           expectedStudentNum: active.expectedStudentNum,
@@ -586,8 +589,16 @@ export default {
           obj.musicGroupStatus = "DRAFT";
         }
 
-        if (type == 2) {
-          this.$confirm("是否提交审核?", "提示", {
+        if (type) {
+          let str = "";
+          if (noMusic.length > 0) {
+            str =
+              noMusic.join(",") +
+              "尚未设置乐器，学员报名该声部时将无乐器可购买，是否确认？";
+          } else {
+            str = "是否提交审核";
+          }
+          this.$confirm(str, "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
@@ -605,25 +616,39 @@ export default {
             })
             .catch(() => {});
         } else {
-          updateSubjectInfo(obj).then((res) => {
-            if (res.code == 200) {
-              this.setStore();
-              if (type == 1) {
-                this.$message.success("已提交审核");
-                let query = this.$route.query;
-                this.$store.dispatch("delVisitedViews", this.$route);
-                this.$router.push({
-                  path: "/teamList",
-                  query: {
-                    ...query,
-                  },
-                });
-              } else {
-                this.$message.success("保存成功");
+          let str = "";
+          if (noMusic.length > 0) {
+            str =
+              noMusic.join(",") +
+              "尚未设置乐器，学员报名该声部时将无乐器可购买，是否确认？";
+          } else {
+            str = "是否保存";
+          }
+          this.$confirm(str, "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            updateSubjectInfo(obj).then((res) => {
+              if (res.code == 200) {
+                this.setStore();
+                if (type == 1) {
+                  this.$message.success("保存成功");
+                  let query = this.$route.query;
+                  this.$store.dispatch("delVisitedViews", this.$route);
+                  this.$router.push({
+                    path: "/teamList",
+                    query: {
+                      ...query,
+                    },
+                  });
+                } else {
+                  this.$message.success("保存成功");
+                }
+                // this.$emit("chiosetab", 2);
+                // 创建乐团，只会到声部了
               }
-              // this.$emit("chiosetab", 2);
-              // 创建乐团，只会到声部了
-            }
+            });
           });
         }
       }

src/views/teamBuild/components/teamBaseInfo.vue

@@ -207,7 +207,7 @@
             placeholder="选择日期"
           ></el-date-picker>
         </el-form-item> -->
-        <el-form-item
+        <!-- <el-form-item
           label="课酬结算标准"
           :rules="[{ required: true, message: '请选择课酬结算标准' }]"
           prop="salary"
@@ -220,9 +220,9 @@
           >
             <el-option label="自定义课酬" value="TEACHER_DEFAULT"></el-option>
             <el-option label="标准课酬" value="GRADIENT_SALARY"></el-option>
-            <!-- <el-option label="课堂课酬" value="CLASSROOM_SALARY"></el-option> -->
+
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="机构类型" prop="ownershipType">
           <el-select
             v-model.trim="topFrom.ownershipType"
@@ -462,7 +462,7 @@ export default {
         time: "", // 报名截止时间
         startClass: [], // 招生年级起始
         address: "", // 教学地点
-        salary: "", // 收费模式
+        salary: "TEACHER_DEFAULT", // 收费模式
         head: "",
         homeworkPushFlag: 1, // 是否同步群消息
         memberCourseShowFlag: 0,
@@ -1295,7 +1295,7 @@ export default {
       this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
       this.topFrom.boss = res.data.musicGroup.teamTeacherId;
       this.topFrom.address = res.data.musicGroup.schoolId;
-      this.topFrom.salary = res.data.musicGroup.settlementType;
+      // this.topFrom.salary = res.data.musicGroup.settlementType;
       this.topFrom.head = res.data.musicGroup.directorUserId
         ? res.data.musicGroup.directorUserId
         : null;

src/views/teamBuild/components/teamSoundSet.vue

@@ -127,15 +127,8 @@ export default {
       this.$emit("chiosetab", val);
     },
     submitAudit(val) {
-      this.$confirm(`是否提交审核?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$refs.soundSetCore.submitInfo(val);
-        })
-        .catch(() => {});
+       this.$refs.soundSetCore.submitInfo(val);
+
     },
     selectMusic() {
       this.$refs.soundSetCore.submitInfo();