Merge branch 'Nov16thResetMusic' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Nov16thResetMusic

src/components/save-form/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-form
+    class="save-form"
     v-bind="{...$attrs, ...$props}"
     v-on="$listeners"
     ref="form"
@@ -45,3 +46,9 @@ export default {
   },
 }
 </script>
+<style lang="less" scoped>
+.save-form{
+
+}
+
+</style>

src/views/save-form-test/index.vue

@@ -6,26 +6,24 @@
     <div class="m-core">
       <saveform ref="form" :model.sync="form" inline>
         <el-form-item
-          label="内容"
           prop="input"
           :rules="[{required: true}]"
         >
           <el-input v-model="form.input" placeholder="请输入内容"/>
         </el-form-item>
         <el-form-item
-          label="内容2"
           prop="input2"
           :rules="[{required: true}]"
         >
           <el-input v-model="form.input2" placeholder="请输入内容2"/>
         </el-form-item>
-        <el-form-item label="活动区域" prop="region">
+        <el-form-item prop="region">
           <el-select v-model="form.region" placeholder="请选择活动区域">
             <el-option label="区域一" value="shanghai"></el-option>
             <el-option label="区域二" value="beijing"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="活动时间" required>
+        <el-form-item required>
           <el-col :span="11">
             <el-form-item prop="date1">
               <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
@@ -38,27 +36,27 @@
             </el-form-item>
           </el-col>
         </el-form-item>
-        <el-form-item label="即时配送" prop="delivery">
+        <!-- <el-form-item prop="delivery">
           <el-switch v-model="form.delivery"></el-switch>
-        </el-form-item>
-        <el-form-item label="活动性质" prop="type">
+        </el-form-item> -->
+        <!-- <el-form-item prop="type">
           <el-checkbox-group v-model="form.type">
             <el-checkbox label="美食/餐厅线上活动" value="1" name="type"></el-checkbox>
             <el-checkbox label="地推活动" value="2" name="type"></el-checkbox>
             <el-checkbox label="线下主题活动" value="3" name="type"></el-checkbox>
             <el-checkbox label="单纯品牌曝光" value="4" name="type"></el-checkbox>
           </el-checkbox-group>
-        </el-form-item>
-        <el-form-item label="特殊资源" prop="resource">
+        </el-form-item> -->
+        <!-- <el-form-item prop="resource">
           <el-radio-group v-model="form.resource">
             <el-radio label="线上品牌商赞助"></el-radio>
             <el-radio label="线下场地免费"></el-radio>
           </el-radio-group>
-        </el-form-item>
-        <el-form-item label="活动形式" prop="desc">
+        </el-form-item> -->
+        <el-form-item prop="desc">
           <el-input type="textarea" v-model="form.desc"></el-input>
         </el-form-item>
-        <el-form-item label="活动时间范围" prop="times">
+        <el-form-item prop="times">
           <el-date-picker
             v-model="form.times"
             type="daterange"
@@ -72,12 +70,14 @@
         <el-button @click="testvisible = true">打开弹窗</el-button>
       </saveform>
     </div>
-    <pagination :total="rules.total"
-                :page.sync="rules.page"
-                :limit.sync="rules.limit"
-                :page-sizes="rules.page_size"
-                :sync="true"
-                @pagination="getList" />
+    <pagination
+      :total="rules.total"
+      :page.sync="rules.page"
+      :limit.sync="rules.limit"
+      :page-sizes="rules.page_size"
+      :sync="true"
+      @pagination="getList"
+    />
     <el-dialog :visible.sync="testvisible" destroy-on-close>
       <test v-if="testvisible"/>
       <template #footer>

src/views/teamDetail/componentCourse/infoMsg.vue

@@ -64,10 +64,12 @@ export default {
   },
   methods: {
     filterKeys(item) {
+      const teachingTeacherNames = (item.teachingTeacherNames || '').split(',').sort((a, b) => (a || '').localeCompare((b || ''), 'zh'))
+      console.log(teachingTeacherNames.join(','), item.teachingTeacherNames)
       return {
         name: item.name,
         actualTeacherName: item.actualTeacherName,
-        teacherName: item.teacherName,
+        teachingTeacherNames: teachingTeacherNames.join(','),
         startClassTime: item.startClassTime,
         classDate: item.classDate,
         endClassTime: item.endClassTime,

src/views/teamDetail/componentCourse/infoMsgContent.vue

@@ -6,15 +6,21 @@
           <el-form-item label="主教老师">
             <!-- <div>{{item.actualTeacherName}}</div> -->
             <div v-if="diff.hasOwnProperty('actualTeacherName')">
-              <el-tag type="danger"><s>{{before.actualTeacherName}}</s></el-tag>
-              <el-tag type="success">{{after.actualTeacherName}}</el-tag>
+              <el-tag type="danger" v-if="before.actualTeacherName"><s>{{before.actualTeacherName}}</s></el-tag>
+              <el-tag type="success" v-if="after.actualTeacherName">{{after.actualTeacherName}}</el-tag>
             </div>
             <div v-else>{{after.actualTeacherName}}</div>
           </el-form-item>
         </el-col>
+        <el-form-item :span="12" label="助教老师">
+          <div v-if="diff.hasOwnProperty('teachingTeacherNames')">
+            <el-tag type="danger" v-if="before.teachingTeacherNames"><s>{{before.teachingTeacherNames}}</s></el-tag>
+            <el-tag type="success" v-if="after.teachingTeacherNames">{{after.teachingTeacherNames}}</el-tag>
+          </div>
+          <div v-else>{{after.teachingTeacherNames}}</div>
+        </el-form-item>
         <el-col :span="12">
           <el-form-item label="上课时间">
-            <!-- <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div> -->
             <div v-if="diff.hasOwnProperty('startClassTime')">
               <el-tag type="danger"><s>{{ before.startClassTime ? before.startClassTime.substr(0, 16) : '' }}-{{ before.endClassTime ? before.endClassTime.substr(11,5) : ''}}</s></el-tag>
               <el-tag type="success">{{ after.startClassTime ? after.startClassTime.substr(0, 16) : '' }}-{{ after.endClassTime ? after.endClassTime.substr(11,5) : ''}}</el-tag>
@@ -24,10 +30,9 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="课程时长">
-            <!-- <div>{{getTimers(item)}}分钟</div> -->
             <div v-if="diff.hasOwnProperty('timers')">
-              <el-tag type="danger"><s>{{before.timers}} 分钟</s></el-tag>
-              <el-tag type="success">{{after.timers}} 分钟</el-tag>
+              <el-tag type="danger" v-if="before.timers"><s>{{before.timers}} 分钟</s></el-tag>
+              <el-tag type="success" v-if="after.timers">{{after.timers}} 分钟</el-tag>
             </div>
             <div v-else>{{after.timers}} 分钟</div>
           </el-form-item>
@@ -36,17 +41,17 @@
           <el-form-item label="课程类型">
             <!-- <div>{{item.teachMode| teachMode}}</div> -->
             <div v-if="diff.hasOwnProperty('teachMode')">
-              <el-tag type="danger"><s>{{before.teachMode | teachMode}}</s></el-tag>
-              <el-tag type="success">{{after.teachMode | teachMode}}</el-tag>
+              <el-tag type="danger" v-if="before.teachMode"><s>{{before.teachMode | teachMode}}</s></el-tag>
+              <el-tag type="success" v-if="after.teachMode">{{after.teachMode | teachMode}}</el-tag>
             </div>
             <div v-else>{{after.teachMode | teachMode}}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="教学地点">
             <div v-if="diff.hasOwnProperty('schoolName')">
-              <el-tag type="danger"><s>{{before.schoolName}}</s></el-tag>
-              <el-tag type="success">{{after.schoolName}}</el-tag>
+              <el-tag type="danger" v-if="before.schoolName"><s>{{before.schoolName}}</s></el-tag>
+              <el-tag type="success" v-if="after.schoolName">{{after.schoolName}}</el-tag>
             </div>
             <div v-else>{{after.schoolName}}</div>
           </el-form-item>