12/1 修改声部树

src/views/categroyManager/specialSetup/discountManage.vue

@@ -320,7 +320,7 @@ export default {
     },
     getSubjectTree () { // 获取声部列表
       subjectListTree({
-        delFlag: 0,
+        delFlag: 'NO',
         rows: 9999
       }).then(res => {
         const subjectListById = {}

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -222,7 +222,7 @@ export default {
     },
     getSubjectTree () { // 获取声部列表
       subjectListTree({
-        delFlag: 0,
+        delFlag: 'NO',
         rows: 9999
       }).then(res => {
         let result = res.data

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -13,7 +13,7 @@
                       trigger="click">
             <el-input v-model.trim="oneTypeName"
                       size="medium"
-                      style="width: 73%"
+                      style="width: 70%"
                       autocomplete="off"></el-input>
             <el-button style="margin: 0;"
                        @click="onAddMusic"
@@ -142,7 +142,7 @@ export default {
     },
     getList () {
       subjectListTree({
-        delFlag: 0,
+        delFlag: 'NO',
         tenantId: 1,
         rows: 9999
       }).then(res => {

src/views/categroyManager/specialSetup/musicalManagerOut.vue

@@ -12,7 +12,7 @@
                       trigger="click">
             <el-input v-model.trim="oneTypeName"
                       size="medium"
-                      style="width: 73%"
+                      style="width: 70%"
                       autocomplete="off"></el-input>
             <el-button style="margin: 0;"
                        @click="onAddMusic"
@@ -140,7 +140,7 @@ export default {
     },
     getList () {
       subjectListTree({
-        delFlag: 0,
+        delFlag: 'NO',
         tenantId: 2,
         rows: 9999
       }).then(res => {

src/views/studentManager/studentList.vue

@@ -699,7 +699,7 @@ export default {
     },
     async getSubjectList () {
       await subjectListTree({
-        delFlag: 0,
+        delFlag: 'NO',
         tenantId: 1,
         rows: 9999
       }).then(res => {

src/views/teacherManager/teacherList.vue

@@ -318,7 +318,7 @@ export default {
       });
 
       subjectListTree({
-        delFlag: 0,
+        delFlag: 'NO',
         rows: 9999
       }).then(res => {
         let result = res.data;

src/views/teamDetail/components/modals/class-pay-list.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <el-form-item
+      label="班级"
+      style="padding-left: 20px"
+     
+    >
+     <div></div>
+      <a @click="lookStudentList" class="studentTitle">学员列表>></a>
+    </el-form-item>
+        <div class="infomsg">
+      <div class="left">
+        剩余课时:
+        <p>合奏课:<span>1</span>节</p>
+      </div>
+      <div class="right">
+        已选学员:
+        <p><span>{{item.studentList.length}}</span>人</p>
+      </div>
+    
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {};
+  },
+};
+</script>
+<style lang="scss" scoped>
+.studentTitle {
+
+}
+</style>

src/views/teamDetail/components/modals/classList-group.vue

@@ -1,44 +1,65 @@
 <template>
   <div>
     <el-form :model="form">
-      <classListItem v-for="(item,index) in form.classList"
-                     :key="index"
-                     :index='index'
-                     :item='item'
-                     @deteleClass="deteleClass"
-                     :form="form"
-                     :classList="classList" />
+      <classListItem
+        v-for="(item, index) in form.classList"
+        :key="index"
+        :index="index"
+        :item="item"
+        @deteleClass="deteleClass"
+        :form="form"
+        :classList="classList"
+      />
     </el-form>
-    <el-button icon="el-icon-circle-plus-outline"
-               plain
-               type="info"
-               size="small"
-               style="width: 100%;margin: 20px 0;"
-               @click="addClass"
-               :disabled="form.classList.length >= classList.length">添加班级</el-button>
+    <el-button
+      icon="el-icon-circle-plus-outline"
+      plain
+      type="info"
+      size="small"
+      style="width: 100%; margin: 20px 0"
+      @click="addClass"
+      :disabled="form.classList.length >= classList.length"
+      >添加班级</el-button
+    >
   </div>
 </template>
 <script>
-import classListItem from './classList-item'
+import classListItem from "./classList-item";
 export default {
-  props: ['classList'],
+  props: ["classList"],
   components: { classListItem },
-  data () {
+  data() {
     return {
       form: {
-        classList: [{ classId: '', studentList: [], courseList: [], index: '', classList: [] }]
+        classList: [
+          {
+            classId: "",
+            studentList: [],
+            courseList: [],
+            index: "",
+            classList: [],
+          },
+        ],
       },
-    }
-  }, methods: {
-    addClass () {
-
-      this.form.classList.push({ classId: '', studentList: [], courseList: [], index: '', classList: [] })
+    };
+  },
+  methods: {
+    addClass() {
+      this.form.classList.push({
+        classId: "",
+        studentList: [],
+        courseList: [],
+        index: "",
+        classList: [],
+      });
+    },
+    deteleClass(index) {
+      this.form.classList.splice(index, 1);
     },
-    deteleClass (index) {
-      this.form.classList.splice(index, 1)
-    }
-  }
-}
+   
+  },
+};
 </script>
 <style lang="scss" scoped>
+
 </style>

src/views/teamDetail/components/modals/classList-item.vue

@@ -39,28 +39,48 @@
         已选学员:
         <p><span>{{item.studentList.length}}</span>人</p>
       </div>
+    
     </div>
-        <el-dialog title="学员列表"
+      <!-- <extraClass  :form="eclass"
+      class="extraClass"
+      ref="eclass"
+      :isUserType="true"
+      :isCommon="false"
+      :isDisabled="true"
+      :courseUnitPriceSettingsByType="organizationCourseUnitPriceSettingsByType"
+      @priceChange="priceChange"
+      @moneyChange="syncAllMoney"/>
+      <paymentCycle ref="cycles"
+          :form="item"
+          :isUserType="false"
+          :isCommon="true"
+          :isDisabled="true"/> -->
+    <el-dialog title="学员列表"
          width="700px"
                :visible.sync="studentListModalVisible"
                append-to-body
                destroy-on-close>
       <viewStudentList :list="studentList" :chioseList='item.studentList' v-if="studentListModalVisible"
       :isChiose='true'
-                       @close="closeStudentView" />
+                       @close="closeStudentView" /> 
     </el-dialog>
   </div>
 </template>
 <script>
 import { getClassAllStudent } from "@/api/studentManager";
 import viewStudentList from './view-student-list'
+import paymentCycle from "@/views/resetTeaming/modals/payment-cycle";
+import extraClass from "../../../resetTeaming/modals/extra-class";
 export default {
   props: ["item", "index", "classList", "form"],
-  components:{viewStudentList},
+  components:{viewStudentList,paymentCycle,extraClass},
   data() {
     return {
       studentList: [],
-      studentListModalVisible:false
+      studentListModalVisible:false,
+      organizationCourseUnitPriceSettingsByType:[],
+      eclass:[],
+
     };
   },
   methods: {
@@ -103,7 +123,9 @@ export default {
     closeStudentView(list){
       this.item.studentList = list
       this.studentListModalVisible = false
-    }
+    },
+    priceChange(){},
+    syncAllMoney(){},
   },
 };
 </script>
@@ -144,4 +166,7 @@ export default {
   flex-direction: row;
   justify-content: flex-end;
 }
+.extraClass {
+  margin-bottom: 20px;
+}
 </style>

src/views/teamDetail/components/modals/student-reset-view.vue

@@ -7,6 +7,11 @@
               show-icon>
     </el-alert>
     <classListGroup :classList="classList" />
+     <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" >下一步</el-button>
+    </div>
+    <div style="clear:both;"></div>
   </div>
 </template>
 <script>
@@ -20,6 +25,10 @@ export default {
     return {
 
     }
+  },methods:{
+     close(){
+      this.$emit('close')
+    }
   }
 }
 </script>
@@ -27,4 +36,8 @@ export default {
 .alert {
   margin-bottom: 10px;
 }
+.dialog-footer {
+  float: right;
+  
+}
 </style>

src/views/teamDetail/components/resetClass.vue

@@ -28,9 +28,9 @@
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                   tooltip-effect="dark"
                   @selection-change="handleSelectionChange">
-          <el-table-column type="selection"
+          <!-- <el-table-column type="selection"
                            v-bind:selectable="chkstu"
-                           width="55"></el-table-column>
+                           width="55"></el-table-column> -->
           <el-table-column align="center"
                            prop="name"
                            label="班级名称"></el-table-column>
@@ -362,9 +362,9 @@
     </el-dialog>
 
     <el-dialog title='学员班级调整'
-               width="700px"
+               width="800px"
                :visible.sync="studentResetVisiable">
-      <studentResetView :classList='activeSingleList' />
+      <studentResetView v-if="studentResetVisiable" :classList='activeSingleList' @close='closeStudentReset'/> 
     </el-dialog>
   </div>
 </template>
@@ -1329,6 +1329,9 @@ export default {
       this.weekList[index].startClassTime = ""
       this.weekList[index].endClassTime = ""
       console.log()
+    },
+    closeStudentReset(){
+      this.studentResetVisiable = false
     }
   },
   watch: {
@@ -1457,10 +1460,10 @@ export default {
     width: 180px !important;
   }
 }
-/deep/.el-date-editor.el-input,
-/deep/.el-date-editor.el-input__inner {
-  width: 100px !important;
-}
+// /deep/.el-date-editor.el-input,
+// /deep/.el-date-editor.el-input__inner {
+//   width: 100px !important;
+// }
 .higheSelect {
   /deep/.el-input__inner {
     height: 40px !important;

src/views/vipClass/vipList.vue

@@ -139,7 +139,7 @@
                            label="课程单价">
             <template slot-scope="scope">
               <div>
-                <p>{{scope.row.courseUnitPrice.toFixed(2)+'元'}}</p>
+                <p>{{scope.row.courseUnitPrice| moneyFormat }} 元</p>
               </div>
             </template>
           </el-table-column>