修改

src/components/teacher/changeClassForm.vue

@@ -158,6 +158,24 @@
     line-height: 41px;
     text-align: center;
   }
+  .classFlictTable {
+    width: 500px;
+    text-align: center;
+  }
+
+  .classFlictTable tr td {
+    height: 40px;
+    color: #000;
+  }
+
+  .classFlictTable tr th {
+    height: 40px;
+    background-color: rgb(238, 238, 239);
+  }
+  .resStyle{
+    color:red;
+  }
+
 
 </style>
 <template>
@@ -507,7 +525,7 @@
           </div>
           <q-input filled type="textarea" :rows="3" style="margin-top: 20px" stack-label maxlength="2000"
             v-model="msg.Remarks" :dense="false" class="col-12 q-pb-lg" label="备注" />
-          <div class="row">
+          <div class="row" style="display:none;">
             <div class="col-12 q-mt-md text-grey-6">
               上传附件：<span class="fj-tip" style="font-size: 10px; color: #f00">*单文件限制5M内</span>
             </div>
@@ -569,6 +587,62 @@
               </div>
             </div>
           </div>
+          <q-table no-data-label="暂无相关数据" :data="conflictData" v-if="conflictData.length>0" :columns="columns3" flat style="max-height: 300px"
+            :pagination="pages" class="sticky-column-table no-bottom-table" separator="none" row-key="ClassPlanId">
+            <template v-slot:top="props">
+              <div class="text-caption q-px-md text-grey-6 col">
+                冲突数据
+              </div>
+              <q-space />
+            </template>
+            <template v-slot:body-cell-PlanTimeList="props">
+              <q-td>
+                <div v-for="(item,index) in props.row.PlanTimeList" :key="index">
+                  {{item.StartTime}}-{{item.EndTime}}
+                </div>
+              </q-td>
+            </template>
+            <template v-slot:body-cell-optioned="props">
+              <q-td :props="props">
+                <span>
+                  <q-btn flat size="xs" icon="iconfont icon-View" color="accent" style="font-weight:400" label="查看" />
+                  <q-popup-proxy>
+                    <q-banner>
+                      <table class="classFlictTable" style="border-collapse:collapse;">
+                        <tr>
+                          <th>班级</th>
+                          <th>日期</th>
+                          <th>老师</th>
+                          <th>教室</th>
+                          <th>上课时段</th>
+                        </tr>
+                        <tr v-for="(subItem,subIndex) in props.row.PlanRepeatList" :key="subIndex">
+                          <td style="width:180px;text-align:left;">
+                            {{subItem.ClassName}}
+                          </td>
+                          <td>{{subItem.ClassDate}}</td>
+                          <td><span :class="{'resStyle':props.row.TeacherId==subItem.TeacherId}">
+                              {{subItem.TeacherName}}</span>
+                          </td>
+                          <td>
+                            <span
+                              :class="{'resStyle':props.row.ClassRoomId==subItem.ClassRoomId}">{{subItem.RoomName}}</span>
+                          </td>
+                          <td>
+                            <template v-if="subItem.PlanTimeList&&subItem.PlanTimeList.length>0">
+                              <div v-for="(cItem,cIndex) in subItem.PlanTimeList" :key="cIndex">
+                                {{cItem.StartTime}}-{{cItem.EndTime}}
+                              </div>
+                            </template>
+                          </td>
+                        </tr>
+                      </table>
+                    </q-banner>
+                  </q-popup-proxy>
+                </span>
+              </q-td>
+            </template>
+          </q-table>
         </q-scroll-area>
       </q-card-section>
 
@@ -840,6 +914,37 @@
         picIsShow: false,
         picObj: [],
         initialIndex: 0,
+        columns3: [{
+            name: "ClassDate",
+            label: "日期",
+            field: "ClassDate",
+            align: "left"
+          },
+          {
+            name: "TeacherName",
+            label: "老师",
+            field: "TeacherName",
+            align: "left"
+          },
+          {
+            name: "RoomName",
+            label: "教室",
+            field: "RoomName",
+            align: "left"
+          },
+          {
+            name: "PlanTimeList",
+            label: "上课时段",
+            field: "PlanTimeList",
+            align: "left",
+          },
+          {
+            name: "optioned",
+            label: "操作",
+            field: "CourseId"
+          }
+        ],
+        conflictData: [],
       };
     },
     created() {
@@ -1099,6 +1204,10 @@
                   position: "top",
                 });
               }
+            }).catch((e) => {
+              if (e.Code == 0) {
+                this.conflictData = e.Data;
+              }
             });
           })
           .onCancel(() => {});
@@ -1184,7 +1293,7 @@
             this.classList.unshift(obj);
             if (this.msg.ClassId > 0 && isClear == 0) {
               this.currentClass = this.classList.find((x) => {
-                return x.ClassId == this.msg.ClassId ;
+                return x.ClassId == this.msg.ClassId;
               }).PlanList;
             }
           }