1

src/components/course/classconflict-form.vue

@@ -93,6 +93,12 @@
                 @input="changeTypeResult" />
             </div>
           </template>
+          <template v-slot:body-cell-TeacherName="props">
+            <q-td>
+              {{getTeacherName(props.row.TeacherId)}}
+            </q-td>
+          </template>
+
           <template v-slot:body-cell-PlanTimeList="props">
             <q-td>
               <div v-for="(item,index) in props.row.PlanTimeList" :key="index">
@@ -140,7 +146,80 @@
                   </q-banner>
                 </q-popup-proxy>
               </span>
-      
+              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;" label="编辑"
+                @click="getInfo(props.row)">
+                <q-popup-proxy>
+                  <q-banner v-if="isShowEdit">
+                    <div class="classConDialog">
+                      <div style="margin:10px 0 15px 0;">{{props.row.ClassDate}}课程安排</div>
+                      <q-select filled stack-label option-value="TId" option-label="TeacherName"
+                        v-model="props.row.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师"
+                        :dense="false" class="col-6 q-pb-lg" emit-value map-options />
+                      <q-input filled v-model="props.row.ClassDate" class="col-6 q-pb-lg" mask="date" label="上课时间">
+                        <template v-slot:append>
+                          <q-icon name="event" class="cursor-pointer">
+                            <q-popup-proxy ref="qDateProxy3" transition-show="scale" transition-hide="scale">
+                              <q-date v-model="props.row.ClassDate" @input=' () => $refs.qDateProxy3[0].hide()' />
+                            </q-popup-proxy>
+                          </q-icon>
+                        </template>
+                      </q-input>
+                      <q-select filled stack-label option-value="RoomId" option-label="RoomName"
+                        v-model="props.row.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
+                        :dense="false" class="col-6 q-pb-lg" emit-value map-options />
+                      <div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
+                        <q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
+                      </div>
+                      <div class="row wrap" style="position:relative;"
+                        v-for="(subItem,subIndex) in props.row.PlanTimeList" :key="subIndex">
+                        <div class="col-4">
+                          <q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" mask="time">
+                            <template v-slot:append>
+                              <q-icon name="access_time" class="cursor-pointer">
+                                <q-popup-proxy transition-show="scale" transition-hide="scale">
+                                  <q-time v-model="subItem.StartTime">
+                                    <div class="row items-center justify-end">
+                                      <q-btn v-close-popup label="确定" color="primary" flat />
+                                    </div>
+                                  </q-time>
+                                </q-popup-proxy>
+                              </q-icon>
+                            </template>
+                          </q-input>
+                        </div>
+                        <div class="col-4">
+                          <q-input filled v-model="subItem.EndTime" class="col-6 q-pr-lg q-pb-lg" mask="time">
+                            <template v-slot:append>
+                              <q-icon name="access_time" class="cursor-pointer">
+                                <q-popup-proxy transition-show="scale" transition-hide="scale">
+                                  <q-time v-model="subItem.EndTime">
+                                    <div class="row items-center justify-end">
+                                      <q-btn v-close-popup label="确定" color="primary" flat />
+                                    </div>
+                                  </q-time>
+                                </q-popup-proxy>
+                              </q-icon>
+                            </template>
+                          </q-input>
+                        </div>
+                        <div class="col-4">
+                          <q-input filled stack-label maxlength="10" :dense="false" v-model="subItem.TimeHour"
+                            ref="TimeHour" class="col-4 q-pr-lg q-pb-lg" label="消耗课时"
+                            :rules="[val => !!val || '请填写消耗课时']" @keyup.native="checkPrice(subItem,'TimeHour')" />
+                        </div>
+                        <div class="delBtnStyle">
+                          <i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i>
+                        </div>
+                      </div>
+                      <q-card-actions align="right" class="bg-white">
+                       
+                        <q-btn label="确认调整" color="accent q-px-md" style="font-weight:400 !important"
+                         @click="isShowEdit=false" />
+                      </q-card-actions>
+                    </div>
+                  </q-banner>
+                </q-popup-proxy>
+              </q-btn>
             </q-td>
           </template>
         </q-table>
@@ -243,7 +322,7 @@
           ClassId: 53,
           ClassName: "",
           ClassNo: "",
-          ChangeType:1,
+          ChangeType: 1,
         },
         isShowEdit: false,
         //单行修改参数
@@ -282,6 +361,10 @@
       }
     },
     created() {
+      this.GetTeacherList();
+      this.getClassRoomList();
+    },
+    computed: {
 
     },
     mounted() {
@@ -289,13 +372,22 @@
         this.msg.ClassId = this.ClassId;
         this.selectObj.ClassId = this.ClassId;
       }
-      this.GetTeacherList();
-      this.getClassRoomList();
       this.getList();
     },
     methods: {
       changeTypeResult(){
-
+          
+      },
+      getTeacherName(teacherId) {
+        let obj = {};
+        obj = this.TeacherList.find(item => {
+          return item.TId === teacherId; //筛选出匹配数据
+        });
+        var tName = "";
+        if (obj) {
+          tName = obj.TeacherName;
+        }
+        return tName;
       },
       //关闭弹窗
       closeCourseForm() {