Browse Source

乐团缴费是否隐藏 1半

1
mo 2 năm trước cách đây
mục cha
commit
29615e46d1

+ 1 - 1
src/views/resetTeaming/components/payInfoDetail.vue

@@ -368,7 +368,7 @@ export default {
         ],
         leBaoList: [{}],
         activeList: [{}],
-
+        isMusicGroupFee:null,
         leixing: "1",
       },
       teamCourse: false,

+ 28 - 1
src/views/resetTeaming/modals/payTeamCourse.vue

@@ -53,6 +53,17 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="是否展示" prop="isMusicGroupFee" v-if="allCourseCurrentPrice==0"  class="titleFormItem">
+        <el-select
+          style="width: 100% !important"
+          v-model="form.isMusicGroupFee"
+          placeholder="请选择是否展示乐团费用"
+          size="mini"
+        >
+          <el-option label="是" :value="true"> </el-option>
+          <el-option label="否" :value="false"> </el-option>
+        </el-select>
+      </el-form-item>
       <el-button
         icon="el-icon-plus"
         size="mini"
@@ -147,7 +158,12 @@
               <div slot="content">学生实际缴费金额</div>
               <i
                 class="el-icon-question"
-                style="font-size: 18px; color: #f56c6c;top:2px;position: relative"
+                style="
+                  font-size: 18px;
+                  color: #f56c6c;
+                  top: 2px;
+                  position: relative;
+                "
               ></i>
             </el-tooltip>
           </p>
@@ -232,6 +248,7 @@ export default {
       courseType,
       courseTypeOptions: this.courseUnitPriceSettingsByType,
       boolOptionsOptions: objectToOptions(boolOptions),
+      showisMusicGroupFee :false
     };
   },
   mounted() {},
@@ -248,6 +265,16 @@ export default {
     isDisabled() {
       return this.form.leixing == 1;
     },
+    allCourseCurrentPrice(){
+      let price = 0
+      this.form.eclass.forEach(element => {
+        price+=element.courseCurrentPrice
+      });
+      if(price >0){
+        this.form.isMusicGroupFee = null
+      }
+      return price
+    }
   },
 };
 </script>

+ 1 - 1
src/views/teamDetail/teamCourseList.vue

@@ -34,7 +34,7 @@
           <remote-search
             :commit="'setTeachers'"
             v-model="searchForm.teacherIdList"
-            :demissionFlag="true"
+            :demissionFlag="false"
           />
         </el-form-item>
         <el-form-item>

+ 25 - 12
src/views/teamDetail/teamList.vue

@@ -7,7 +7,7 @@
         @reload="reloadSearch"
         :moreKeys="['organId']"
         :keys="['searchType']"
-          v-if="permission('/teamList/abnormal')"
+        v-if="permission('/teamList/abnormal')"
       />
     </h2>
     <div class="m-core">
@@ -110,6 +110,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="isStartedCourse">
+          <el-select
+            v-model.trim="topForm.isStartedCourse"
+            filterable
+            placeholder="是否开课"
+            clearable
+          >
+            <el-option label="是" :value="true"></el-option>
+            <el-option label="否" :value="false"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="courseViewType">
           <el-select
             v-model.trim="topForm.courseViewType"
@@ -242,12 +253,7 @@
             label="乐团主管"
           >
           </el-table-column>
-          <!-- <el-table-column
-            prop="teamTeacherName"
-            align="center"
-            label="运营主管"
-          >
-          </el-table-column> -->
+
           <el-table-column
             prop="groupMemberNum"
             align="center"
@@ -256,10 +262,15 @@
           </el-table-column>
           <el-table-column prop="payNum" align="center" label="在读人数">
           </el-table-column>
-          <!-- <el-table-column prop="course"
+          <el-table-column prop="course"
                            align='center'
-                           label="当前课时">
-          </el-table-column> -->
+                           label="是否开课">
+                           <template slot-scope="scope">
+                            <div>
+                              {{scope.row.firstCourseStartTime?'是':'否'}}
+                            </div>
+                           </template>
+          </el-table-column>
           <el-table-column
             prop="createTime"
             width="100px"
@@ -405,7 +416,8 @@
                            @click="stopTeam(scope.row)">取消乐团</el-button> -->
                 <el-button
                   v-if="
-                    (scope.row.status == 'PAUSE'|| scope.row.status == 'CLOSE') &&
+                    (scope.row.status == 'PAUSE' ||
+                      scope.row.status == 'CLOSE') &&
                     permission('musicGroup/resumeMusicGroup')
                   "
                   @click="onTeamOpeation('start', scope.row)"
@@ -503,6 +515,7 @@ export default {
         billTimer: [],
         createTimer: [],
         cooperationOrganId: null,
+        isStartedCourse:null
       },
       organList: [],
       typeList: [], // 收费类型
@@ -1144,7 +1157,7 @@ export default {
           ["createStartDate", "createEndDate"],
           "YYYY-MM-DD"
         ),
-         searchType: this.$route.query.searchType,
+        searchType: this.$route.query.searchType,
         ...getTimes(billTimer, ["billStartDate", "billEndDate"], "YYYY-MM-DD"),
       };
       await Export(