样式修复

1

src/views/resetTeaming/index.vue

@@ -25,11 +25,15 @@
     <div class="m-core">
       <el-popover
         placement="left"
+        :append-to-body="false"
         width="1000"
         trigger="hover"
         ref="popover"
         :open-delay="500"
+          @show="setpopover()"
       >
+      <!--  @setpopover='setpopover'  -->
+
         <teamJournal :teamid="teamid" />
         <!--  v-if="team_status" -->
         <p slot="reference" class="msg" :class="team_status">
@@ -247,6 +251,7 @@ export default {
   name: "resetTeaming",
   data() {
     return {
+      visible:false,
       activeIndex: "1",
       teamid: "",
       baseInfo: null,
@@ -388,9 +393,13 @@ export default {
       });
       return p;
     },
-    setpopover() {
-      console.log("调整位置");
-      this.$refs.popover.updatePopper();
+    setpopover(scope) {
+
+      this.$nextTick(()=>{
+            // this.visible = true;
+            this.$refs.popover.updatePopper();
+      })
+
     },
     gotoArchices() {
       console.log("跳转");

src/views/teamBuild/components/teamJournal.vue

@@ -77,7 +77,10 @@ export default {
       }).then(res => {
         if (res.code == 200) {
           this.processList = res.data;
-          this.$emit('setpopover')
+          // this.$nextTick(()=>{
+          //     this.$emit('setpopover')
+          // })
+
         }
       })
     },

src/views/teamDetail/teamCourseList.vue

@@ -29,65 +29,12 @@
             placeholder="课程编号"
           />
         </el-form-item>
-        <!-- <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            clearable
-            placeholder="课程组编号/课程名称"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-select
-            v-model.trim="searchForm.schoolId"
-            clearable
-            filterable
-            placeholder="请选择教学点"
-          >
-            <el-option
-              v-for="(item, index) in selects.schools"
-              :key="index"
-              :value="item.id"
-              :label="item.name"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <remote-search
             :commit="'setTeachers'"
             v-model="searchForm.teacherIdList"
           />
         </el-form-item>
-        <!-- <el-form-item>
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.organIdList"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item, index) in selects.branchs"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select
-            v-model.trim="searchForm.groupType"
-            clearable
-            filterable
-            placeholder="课程组类型"
-          >
-            <el-option
-              v-for="item in courseListType"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-select
             v-model.trim="searchForm.courseType"
@@ -103,17 +50,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item>
-          <el-select
-            v-model.trim="searchForm.teachMode"
-            clearable
-            filterable
-            placeholder="教学模式"
-          >
-            <el-option label="线上课" value="ONLINE"></el-option>
-            <el-option label="线下课" value="OFFLINE"></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-select
             v-model.trim="searchForm.courseStatus"
@@ -126,47 +62,6 @@
             <el-option label="已结束" value="OVER"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item>
-          <el-select
-            v-model.trim="searchForm.mergeCourseType"
-            clearable
-            filterable
-            placeholder="合并课程类型"
-          >
-            <el-option
-              v-for="(item, index) in mergeCourseTypeOptions"
-              :key="index"
-              :value="item.value"
-              :label="item.label"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select
-            v-model.trim="searchForm.teachType"
-            clearable
-            filterable
-            placeholder="老师类型"
-          >
-            <el-option
-              v-for="item in workTypeOptions"
-              :key="item.label"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select
-            v-model.trim="searchForm.isCallNames"
-            clearable
-            filterable
-            placeholder="是否点名"
-          >
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-date-picker
             v-model.trim="searchForm.timer"
@@ -213,8 +108,65 @@
         >
           >
           <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-form label-position="left" class="demo-table-expand">
+                <el-row style="margin-left: 64px">
+                  <el-col :span="4">
+                    <el-form-item label="考勤申诉:">
+                      <span>{{
+                        props.row.isComplaints == 1 ? "是" : "否"
+                      }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="是否冻结:">
+                      <span>{{ props.row.isLock ? "是" : "否" }}</span>
+                    </el-form-item></el-col
+                  >
+
+                  <el-col :span="4">
+                    <el-form-item label="合并类型:">
+                      <span>
+                        <div>
+                          <span
+                            v-if="
+                              props.row.newCourseId > 0 &&
+                              props.row.newCourseId == props.row.id
+                            "
+                            >合并课
+                          </span>
+                          <el-button
+                            type="text"
+                            @click="common(scope.row)"
+                            v-if="
+                              props.row.newCourseId > 0 &&
+                              props.row.newCourseId != props.row.id
+                            "
+                          >
+                            被合并课
+                          </el-button>
+                          <p v-if="props.row.newCourseId == 0">无</p>
+                        </div>
+                      </span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="云教练课程:">
+                      {{ props.row.memberFlag ? "是" : "否" }}
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="是否点名:">
+                      {{ props.row.isCallNames ? "是" : "否" }}
+                    </el-form-item></el-col
+                  >
+                </el-row>
+              </el-form>
+            </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             prop="organName"
             label="分部名称"
           ></el-table-column>
@@ -230,63 +182,80 @@
               </el-button>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="id"
-            width="100px"
-            label="课程编号"
-          >
+          <el-table-column align="left" prop="id" label="课程类型/编号">
             <template slot-scope="scope">
-              <copy-text>{{ scope.row.id }}</copy-text>
+              <div>
+                <p style="color: #ff802c">{{ scope.row.type | coursesType }}</p>
+                <copy-text>{{ scope.row.id }}</copy-text>
+              </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200px" label="上课时间">
-            <template slot-scope="scope"
-              >{{
-                scope.row.startClassTime
-                  ? scope.row.startClassTime.substr(0, 16)
-                  : ""
-              }}-{{
-                scope.row.endClassTime
-                  ? scope.row.endClassTime.substr(11, 5)
-                  : ""
-              }}</template
-            >
+          <el-table-column align="center" width="200px" label="课程状态/时间">
+            <template slot-scope="scope">
+              <div>
+                <p :class="getColor(scope.row.status)">
+                  {{ scope.row.status | coursesStatus }}
+                </p>
+                <p>
+                  {{
+                    scope.row.startClassTime
+                      ? scope.row.startClassTime.substr(0, 16)
+                      : ""
+                  }}-{{
+                    scope.row.endClassTime
+                      ? scope.row.endClassTime.substr(11, 5)
+                      : ""
+                  }}
+                </p>
+              </div>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="subjectName"
             label="声部"
           ></el-table-column>
-          <el-table-column prop="name" width="150px" label="课程名称">
+          <el-table-column prop="name" width="150px" label="主教老师/课程名称">
             <template slot-scope="scope">
-              <copy-text>{{ scope.row.name }}</copy-text>
+              <div>
+                <p style="color: #ff802c">{{ scope.row.teacherName }}</p>
+                <copy-text>{{ scope.row.name }}</copy-text>
+              </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="150px" label="课程类型">
+          <!-- <el-table-column align="center" width="150px" label="课程类型">
             <template slot-scope="scope">
               <div>{{ scope.row.type | coursesType }}</div>
             </template>
-          </el-table-column>
-          <el-table-column align="center" label="教学模式">
+          </el-table-column> -->
+          <!-- <el-table-column align="center" label="教学模式">
             <template slot-scope="scope">
               <div>{{ scope.row.teachMode | teachMode }}</div>
             </template>
-          </el-table-column>
-          <el-table-column
+          </el-table-column> -->
+          <!-- <el-table-column
             align="center"
             prop="teacherName"
             width="110"
             label="主教老师"
-          ></el-table-column>
-          <el-table-column align="center" prop="schoolName" label="教学点">
+          ></el-table-column> -->
+          <el-table-column
+            align="center"
+            prop="schoolName"
+            label="教学模式/教学点"
+          >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.schoolName ? scope.row.schoolName : "网络教室" }}
+                <p style="color: #ff802c">
+                  {{ scope.row.teachMode | teachMode }}
+                </p>
+                <p>
+                  {{ scope.row.schoolName ? scope.row.schoolName : "网络教室" }}
+                </p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="courseScheduleStatus"
             label="课程状态"
@@ -294,8 +263,8 @@
             <template slot-scope="scope">
               <div>{{ scope.row.status | coursesStatus }}</div>
             </template>
-          </el-table-column>
-          <el-table-column align="center" label="考勤申诉">
+          </el-table-column> -->
+          <!-- <el-table-column align="center" label="考勤申诉">
             <template slot-scope="scope">
               <div>{{ scope.row.isComplaints == 1 ? "是" : "否" }}</div>
             </template>
@@ -348,7 +317,7 @@
             <template slot-scope="scope">{{
               scope.row.isCallNames ? "是" : "否"
             }}</template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             label="详情"
@@ -861,7 +830,7 @@ import resetClass from "./componentCourse/resetClass";
 import teacherList from "./componentCourse/teacherList";
 import addCompound from "./componentCourse/addCompound";
 import infoMsg from "./componentCourse/infoMsg";
-import cleanDeep from 'clean-deep'
+import cleanDeep from "clean-deep";
 let nowTime = new Date();
 nowTime =
   nowTime.getFullYear() +
@@ -956,7 +925,9 @@ export default {
         this.searchForm.teachType ||
         this.searchForm.isCallNames ||
         this.searchForm.memberFlag ||
-        this.searchForm.creatTimer?.length > 0 || (this.searchForm.courseTime?.length > 0&&this.searchForm.courseTime[0])
+        this.searchForm.creatTimer?.length > 0 ||
+        (this.searchForm.courseTime?.length > 0 &&
+          this.searchForm.courseTime[0])
       );
     },
   },
@@ -1158,10 +1129,10 @@ export default {
           load.startLoading();
           axios(options)
             .then((res) => {
-              if(res.data.code == 200) {
+              if (res.data.code == 200) {
                 this.$message.success(res.data.data);
               } else {
-                this.$message.error(res.data.msg)
+                this.$message.error(res.data.msg);
               }
               // let blob = new Blob([res.data], {
               // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
@@ -1408,6 +1379,14 @@ export default {
         }
       }
     },
+    getColor(str) {
+      let obj = {
+        NOT_START: "coruseGreen",
+        UNDERWAY: "courseYellow",
+        OVER: "courseRed",
+      };
+      return obj[str]
+    },
   },
   filters: {
     isCall(val) {
@@ -1429,6 +1408,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.courseRed{color: #808080;}
+.courseYellow{color:#FF802C}
+.coruseGreen{color:#01C1B5}
 .visible {
   visibility: hidden;
 }