Merge branch '11/24SAAS' into 03/03GRADE

dist/static/css/chunk-28ccab81.31302744.css → dist/static/css/chunk-2a698d26.227bb351.css

@@ -1 +1 @@
-.btns[data-v-6390f4f5]{text-align:right}.files[data-v-6390f4f5]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-6390f4f5]{position:absolute;right:20px;bottom:10px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-3b593294] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-3b593294]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-3b593294] .el-dialog__body{padding:0}.iframe_back[data-v-3b593294]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-3b593294]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-3b593294]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}
+.btns[data-v-9d3bc8b0]{text-align:right}.files[data-v-9d3bc8b0]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-9d3bc8b0]{position:absolute;right:20px;bottom:10px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-3b593294] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-3b593294]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-3b593294] .el-dialog__body{padding:0}.iframe_back[data-v-3b593294]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-3b593294]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-3b593294]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

src/views/accompaniment/modals/form.vue

@@ -347,6 +347,7 @@
   </div>
 </template>
 <script>
+import axios from 'axios'
 import { Add, Update, queryPageSysExam, queryTree } from "../api";
 import { getAllmemberRank } from "@/views/resetTeaming/api";
 export default {
@@ -421,6 +422,8 @@ export default {
       } else {
         this.form.rankIdType = 0;
       }
+      const xmlres = await axios(this.detail.xmlUrl)
+      this.partListNames = this.getPartListNames(xmlres.data)
       this.FeatchDetailList();
     } else {
       // 新增条件下默认设置为收费

src/views/teamBuild/components/teamBaseInfo.vue

@@ -5,7 +5,7 @@
       <el-form
         :model="topFrom"
         ref="topinfo"
-        label-width="120px"
+        label-width="150px"
         :inline="true"
         label-position="left"
       >
@@ -235,6 +235,17 @@
             value="LEASE"></el-option>-->
           </el-select>
         </el-form-item>
+           <el-form-item label="课外训练布置老师" prop="extracurricularTeacher" v-if="tenantId ==1">
+          <el-select
+            v-model.trim="topFrom.extracurricularTeacher"
+            :disabled="basdisabled"
+          >
+            <el-option label="声部班老师" value="NORMAL"></el-option>
+            <el-option label="合奏班老师" value="MIX"></el-option>
+            <!-- <el-option label="租赁"
+            value="LEASE"></el-option>-->
+          </el-select>
+        </el-form-item>
         <!-- v-if="teamStatus == 'resetTeam' || teamStatus == 'teamList'" -->
 
         <div class="head">人员配置：</div>
@@ -502,6 +513,7 @@ export default {
         ownershipType: "OWN", // 合作机构类型
         repairUserId: null, // 维修技师
         transactionTeacherId: null, // 衔接老师
+        extracurricularTeacher:'NORMAL'
       },
       baseInfo: {},
       money: 580,
@@ -750,6 +762,7 @@ export default {
         // 如果是新建团
 
         let sotrage = JSON.parse(localStorage.getItem(`newTeambase`));
+        console.log(sotrage,this.topFrom)
         sotrage ? (this.topFrom = sotrage) : this.topFrom;
         if (this.topFrom?.section) {
           // 获取员工
@@ -979,6 +992,7 @@ export default {
               homeworkPushFlag: this.topFrom.homeworkPushFlag,
               isGiveAccessories: this.topFrom.isGiveAccessories,
               memberCourseShowFlag: this.topFrom.memberCourseShowFlag,
+              extracurricularTeacher:this.topFrom.extracurricularTeacher
             };
             // obj.musicGroupPaymentEntities = [];
             // createTeam
@@ -1098,6 +1112,7 @@ export default {
         homeworkPushFlag: 1,
         isGiveAccessories: 0,
         memberCourseShowFlag: 0,
+        extracurricularTeacher:'NORMAL'
       };
       this.$refs["topinfo"].resetFields();
     },
@@ -1338,6 +1353,7 @@ export default {
       this.topFrom.homeworkPushFlag = res.data.musicGroup.homeworkPushFlag;
       this.topFrom.isGiveAccessories = res.data.musicGroup.isGiveAccessories ? 1 : 0;
       this.topFrom.memberCourseShowFlag = res.data.musicGroup.memberCourseShowFlag ? 1 : 0;
+       this.topFrom.extracurricularTeacher = res.data.musicGroup.extracurricularTeacher
       localStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
     },
     changeType(val) {