页面修改

src/components/schedul/appoint-form.vue

@@ -24,6 +24,7 @@
         <div style="margin-bottom:20px;">
           <div class="Appoint_Line"></div>预约申请
         </div>
+        <q-btn color="primary" label="选择试听课" @click="isShowTeacher=true" style="margin-bottom:20px;" />
         <q-input filled v-model="addMsg.ClassDate" class="col-6 q-pb-lg" :rules="[val => !!val || '请选择预约日期']"
           ref="ClassDate" mask="date" label="预约日期">
           <template v-slot:append>
@@ -57,12 +58,9 @@
         <q-select filled stack-label option-value="Name" option-label="Name" v-model="addMsg.ClassContent"
           ref="ClassContent" :options="ContentList" :rules="[val => !!val || '请选择主讲内容']" label="主讲内容" :dense="false"
           class="col-6 q-pb-lg" emit-value map-options />
-        <div style="display:flex;align-items:center;">
-          <q-select filled stack-label option-value="TId" style="width:90%" option-label="TeacherName"
-            v-model="addMsg.TeacherId" ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false"
-            class="col-6 q-pb-lg" emit-value map-options />
-          <div style="margin:-20px 0 0 9px;cursor:pointer;" @click="isShowTeacher=true">选择</div>
-        </div>
+        <q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="addMsg.TeacherId"
+          ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pb-lg" emit-value
+          map-options />
         <q-select filled stack-label option-value="RoomId" option-label="RoomName" v-model="addMsg.ClassRoomId"
           ref="ClassRoomId" :options="ClassRoomList" label="关联教室" :dense="false" class="col-6 q-pb-lg" emit-value
           map-options />
@@ -180,7 +178,6 @@
         if (this.saveObj) {
           this.addMsg.Visitor_Id = this.saveObj.Id;
         }
-
         this.$refs.ClassDate.validate();
         this.$refs.ClassContent.validate();
         if (this.addMsg.ClassTime == '') {
@@ -192,7 +189,7 @@
           })
           return;
         }
-        if(this.addMsg.EndTime == ''){
+        if (this.addMsg.EndTime == '') {
           this.$q.notify({
             type: 'negative',
             position: "top",
@@ -212,7 +209,7 @@
                 position: 'top'
               })
               this.$emit('success');
-            }else{
+            } else {
               this.$q.notify({
                 type: 'negative',
                 position: "top",
@@ -226,9 +223,15 @@
       },
       //子组件选中传值
       getchildInfo(obj) {
+        if (obj) {
           this.addMsg.TeacherId = obj.TeacherId;
           this.addMsg.ClassRoomId = obj.ClassRoomId;
           this.addMsg.ReserveClassId = obj.ReserveClassId;
+          this.addMsg.ClassDate = obj.ClassDateStr;
+          this.addMsg.ClassTime = obj.ClassTime;
+          this.addMsg.EndTime = obj.EndTime;
+          this.addMsg.ClassContent = obj.ClassContent;
+        }
       }
     }
   }

src/components/schedul/audition-form.vue

 <template>
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
     <q-card style="width: 800px;max-width:900px;">
+      <q-card-section>
+        <div class="text-h6">试听课信息</div>
+      </q-card-section>
+      <q-card-section>
+        <div class="row wrap">
+          <div class="col-6 q-pb-lg q-pr-lg auditionformdate">
+            <q-field borderless>
+               <template v-slot:prepend>
+                <q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期">
+                  <template v-slot:append>
+                    <q-icon name="event" class="cursor-pointer">
+                      <q-popup-proxy ref="StartClassDate" transition-show="scale" transition-hide="scale">
+                        <q-date v-model="msg.StartClassDate" @input="() => $refs.StartClassDate.hide()" />
+                      </q-popup-proxy>
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+              <template v-slot:append>
+                至
+              </template>
+              <template v-slot:append>
+                <q-input filled v-model="msg.EndClassDate" mask="date" label="结束日期">
+                  <template v-slot:append>
+                    <q-icon name="event" class="cursor-pointer">
+                      <q-popup-proxy ref="EndClassDate" transition-show="scale" transition-hide="scale">
+                        <q-date v-model="msg.EndClassDate" @input="() => $refs.EndClassDate.hide()" />
+                      </q-popup-proxy>
+                    </q-icon>
+                  </template>
+                </q-input>
+              </template>
+            </q-field>
+          </div>
+          <div class="col-6 q-pr-lg q-pb-lg">
+            <q-select @input="resetSearch" filled option-value="TId" option-label="TeacherName" v-model="msg.TeacherId"
+              :options="TeacherList" emit-value map-options label="老师" clearable />
+          </div>
+        </div>
+      </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
-        <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" style="margin-top:20px;" flat class="sticky-column-table sticky-right-column-table"
-          separator="none" :data="dataList" :columns="columns" row-key="name">
+        <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" style="margin-top:20px;" flat
+          class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
+          row-key="name">
           <template v-slot:top="props">
-            <div class="col-2 q-table__title">人员信息</div>
+            <div class="col-2 q-table__title"></div>
             <q-space />
           </template>
+          <template v-slot:body-cell-ClassTime="props">
+            <q-td :props="props">
+              {{props.row.ClassTime}}-{{props.row.EndTime}}
+            </q-td>
+          </template>
           <template v-slot:body-cell-Id="props">
             <q-td :props="props">
-              <q-btn flat size="xs" icon="edit" color="accent" @click="getStuInfo(props.row)" style="font-weight:400" label="报入" />
+              <q-btn flat size="xs" icon="edit" color="accent" @click="getStuInfo(props.row)" style="font-weight:400"
+                label="报入" />
             </q-td>
           </template>
           <template v-slot:bottom>
@@ -21,7 +68,7 @@
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
-        <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
+        <q-btn label="关闭" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
       </q-card-actions>
     </q-card>
   </q-dialog>
@@ -31,7 +78,9 @@
   import {
     GetReserveClassPage
   } from '../../api/scheduling/schedu'
-
+  import {
+    getTeacherDropDownList
+  } from "../../api/school/index";
   export default {
     components: {},
     data() {
@@ -39,12 +88,15 @@
         persistent: true,
         loading: false,
         msg: {
-          pageIndex:1,
-          pageSize:10,
-          rowsPerPage: 10,
-          StartClassDate:''
+          pageIndex: 1,
+          pageSize: 6,
+          rowsPerPage: 6,
+          StartClassDate: "", //开始时间
+          EndClassDate: "", //结束时间
+          TeacherId: "", //教师编号
+          ClassRoomId: "", //教室编号
         },
-        PageCount:0,
+        PageCount: 0,
         columns: [{
             name: 'TeacherName',
             label: '老师',
@@ -86,17 +138,32 @@
             label: '操作',
           }
         ],
-        dataList:[],
-        StuObj:{}
+        TeacherList: [], //教师列表
+        dataList: [],
+        StuObj: {}
       }
     },
-    created() {},
+    created() {
+      this.GetTeacherList();
+    },
     mounted() {
-      var day = new Date();
-      this.msg.StartClassDate = day.getFullYear()+"-" + (day.getMonth()+1) + "-" + day.getDate();
+      let nowDay = new Date();
+      var year = nowDay.getFullYear(); //年
+      var month = nowDay.getMonth() + 1; //月
+      var day = nowDay.getDate(); //日
+      var currentDay = year + '-' + (month < 10 ? ('0' + month) : month) + '-' + day;
+      this.msg.StartClassDate = currentDay;
       this.getList();
     },
     methods: {
+      //获取教师下拉
+      GetTeacherList() {
+        getTeacherDropDownList({}).then(res => {
+          if (res.Code == 1) {
+            this.TeacherList = res.Data;
+          }
+        });
+      },
       closeSaveForm() {
         this.$emit('close')
         this.persistent = false
@@ -113,26 +180,34 @@
       //获取课程系列分页列表
       getList() {
         GetReserveClassPage(this.msg).then(res => {
-          if(res.Code==1){
+          if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
           }
         })
       },
       //点击报入
-      getStuInfo(item){
-        if(item){
+      getStuInfo(item) {
+        if (item) {
           this.StuObj.ClassRoomId = item.ClassRoomId;
           this.StuObj.TeacherId = item.TeacherId;
           this.StuObj.ReserveClassId = item.ReserveClassId;
+          this.StuObj.ClassDateStr = item.ClassDateStr;
+          this.StuObj.ClassTime = item.ClassTime;
+          this.StuObj.EndTime = item.EndTime;
+          this.StuObj.ClassContent = item.ClassContent;
         }
-        this.$emit('getchildInfo',this.StuObj);
+        this.$emit('getchildInfo', this.StuObj);
         this.closeSaveForm();
       }
     },
   }
 
 </script>
-
 <style>
+  .auditionformdate .el-input__inner {
+    background: transparent !important;
+    border: 0 !important;
+  }
+
 </style>

src/utils/erpindex.js

@@ -156,7 +156,7 @@ export default {
           document.body.appendChild(link);
           link.click();
           successCall(res);
-        }).catch(function (res) { });
+        }).catch(function (res) {});
       },
 
       //HTTP提交数据
@@ -261,7 +261,6 @@ export default {
       //HTTP提交数据-电商
       Vue.prototype.apipostDS = function (cmd, msg, successCall, faildCall) {
         var apiurl = this.domainManager().mallUrl + cmd;
-        console.log(337, apiurl)
         var postData = this.GetPostDataDS(cmd, msg, "");
         this.$http.post(apiurl, postData, {
             headers: {
@@ -270,7 +269,7 @@ export default {
             }
           })
           .then(res => {
-            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) { } else if (res.resultCode == 10005) {
+            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {} else if (res.resultCode == 10005) {
               this.$router.go(-1);
             } else {
               successCall(res);
@@ -503,7 +502,7 @@ export default {
           Key: newFileName, //文件名
           StorageClass: 'STANDARD',
           Body: fileObj, // 上传文件对象
-          onProgress: function (progressData) { }
+          onProgress: function (progressData) {}
         }, function (err, data) {
           if (data && data.statusCode == 200) {
             var uploadResult = {
@@ -542,7 +541,7 @@ export default {
         var newFileName = str + '/Upload/' + path + "/" + timestamp1 + "" + suffix;
         this.Info('上传中...')
         var result = oss.multipartUpload(newFileName, fileObj, {
-          progress: function* (p) { }
+          progress: function* (p) {}
         }).then(res => {
           var uploadResult = {
             resultCode: 1,