Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/api/scheduling/schedu.js

@@ -233,3 +233,15 @@ export function GetReserveClass(data) {
     data
   })
 }
+
+/**
+ * 修改预约状态
+ * @param {JSON参数} data 
+ */
+export function setVisitorReserveStatus(data) {
+  return request({
+    url: '/VisitorReserve/UpdateVisitorReserveStatus',
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file

src/components/course/record-form.vue

@@ -276,7 +276,6 @@
         this.msg.ClassId = this.setingObj.ClassId;
         this.msg.TeacherId = this.setingObj.Teacher_Id;
         GetClassPlanLogPageList(this.msg).then(res => {
-          console.log("res,", res.Data)
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.pageCount = res.Data.PageCount;

src/components/duty/addDutyItem.vue

@@ -246,7 +246,6 @@
         getSchoolDropdown({}).then(res => {
           if (res.Code == 1) {
             this.schoolOptions = res.Data;
-            console.log(this.schoolOptions,'schoolOptions');
           }
         })
       },

src/components/sale/editOrder-form.vue

@@ -456,7 +456,6 @@
         GetSelectClassOrderList(qMsg).then(res => {
           if (res.Code == 1) {
             this.beforeOrderList = res.Data;
-            console.log(res, '前置数据');
           }
         })
       },

src/components/schedul/appoint-form.vue

@@ -192,11 +192,9 @@
       },
       //子组件选中传值
       getchildInfo(obj){
-        console.log(obj,'来了');
         this.addMsg.TeacherId = obj.TeacherId;
         this.addMsg.ClassRoomId = obj.ClassRoomId;
         this.addMsg.ReserveClassId = obj.ReserveClassId;
-
       }
     }
   }

src/components/schedul/audition-form.vue

@@ -113,7 +113,6 @@
       //获取课程系列分页列表
       getList() {
         GetReserveClassPage(this.msg).then(res => {
-          console.log(res,'数据');
           if(res.Code==1){
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;

src/components/schedul/yueke-form.vue

@@ -4,18 +4,18 @@
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <q-card-section>
           <div class="text-h6">
-            <span v-if="ChoiceType==3">请填写取消备注</span>
-            <span v-if="ChoiceType==2">请选择流单原因</span>
+            <span v-if="ChoiceType==3">取消预约</span>
+            <span v-if="ChoiceType==2">流单</span>
           </div>
         </q-card-section>
         <div class="row wrap">
           <template v-if="ChoiceType==3">
-            <q-input filled stack-label :dense="false" v-model="msg.remark" type="textarea" class="col-12" label="备注" />
+            <q-input filled stack-label :dense="false" v-model="msg.Remark" type="textarea" class="col-12" label="备注" />
           </template>
           <template v-if="ChoiceType==2">
-            <q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseLiudan"
-              ref="remark" :options="reasonList" label="流单原因" :dense="false" class="col-12 q-pb-lg"
-              emit-value map-options multiple />
+            <q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseLiudan" ref="remark"
+              :options="reasonList" label="流单原因" :dense="false" class="col-12 q-pb-lg" emit-value map-options
+              multiple />
           </template>
         </div>
         </div>
@@ -30,10 +30,17 @@
   </q-dialog>
 </template>
 <script>
+  import {
+    setVisitorReserveStatus
+  } from '../../api/scheduling/schedu'
   export default {
     props: {
       ChoiceType: {
         type: Number,
+        default: 2
+      },
+      saveObj: {
+        type: Object,
         default: null
       }
     },
@@ -42,49 +49,77 @@
         persistent: true,
         saveLoading: false,
         msg: {
-          remark: ''
+          Id: 0,
+          ReserveStatus: 0,
+          Remark: '',
         },
-        chooseLiudan:[],
+        chooseLiudan: [],
         reasonList: [{
-          Id: 1,
+          Id: "教学环境",
           Name: '教学环境'
         }, {
-          Id: 2,
+          Id: "教学内容",
           Name: '教学内容'
         }, {
-          Id: 3,
+          Id: "讲师",
           Name: '讲师'
         }, {
-          Id: 4,
+          Id: "价格",
           Name: '价格'
         }, {
-          Id: 5,
+          Id: "销售跟进",
           Name: '销售跟进'
         }, {
-          Id: 6,
+          Id: "同行竞争",
           Name: '同行竞争'
         }, {
-          Id: 7,
+          Id: "其他",
           Name: '其他'
         }]
       }
     },
-    mounted() {},
+    mounted() {
+      if (this.saveObj) {
+        if (this.saveObj.Id) {
+          this.msg.Id = this.saveObj.Id;
+        }
+      }
+    },
     methods: {
       //关闭弹窗
       closeSaveForm() {
         this.$emit('close')
-        this.persistent = false
+        this.persistent = false;
       },
       //保存菜单
       saveYueke() {
         this.saveLoading = true;
-        if(this.ChoiceType==2){
+        if (this.ChoiceType == 2) {
+          this.msg.ReserveStatus = 2;
+        }
+        if (this.ChoiceType == 3) {
+          this.msg.ReserveStatus = 3;
+        }
+        if (this.ChoiceType == 2) {
           this.msg.remark = this.chooseLiudan.toString();
         }
-        console.log(this.msg,'msg');
+        setVisitorReserveStatus(this.msg).then(res => {
+          if (res.Code == 1) {
+            this.saveLoading = false
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '数据保存成功！',
+              position: 'top'
+            })
+            this.$emit("success")
+            this.closeSaveForm()
+          }
+        }).catch(() => {
+          this.saveLoading = false
+        });
       },
-
     }
   }
 

src/components/school/classroom/classroom-form.vue

@@ -223,7 +223,6 @@
        uploadFile(files) {
         UploadSelfFile('studentIcon', files, res => {
           if (res.Code == 1) {
-            console.log(211,res)
             this.objOption.RoomPicList.push(res.FileUrl);
           }
         })
@@ -236,17 +235,7 @@
   }
 
 </script>
-
 <style>
-/* .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 143px;
-    height: 82px;
-    line-height: 82px;
-    text-align: center;
-} */
-
   .avatar-uploader .el-upload {
     border-radius: 6px;
     cursor: pointer;

src/pages/activity/activeType.vue

@@ -239,8 +239,6 @@ import ActiveTypeForm from '../../components/activity/activeType-from'
                     this.data = res.data.data.pageData;
                     this.pageCount = res.data.data.pageCount;
                 }
-              
-                console.log(257,res)
             })
         },
        delType(item){

src/pages/activity/activityList.vue

@@ -422,8 +422,6 @@ import ActiveForm from '../../components/activity/active-from'
                     this.data = res.data.data.pageData;
                     this.pageCount = res.data.data.pageCount;
                 }
-              
-                console.log(257,res)
             })
         },
        delActive(item){

src/pages/classroom/components/classroomNav.vue

@@ -77,7 +77,6 @@
     methods:{
       showNav(val,id){
         this.schoolId=id
-        console.log(id)
       },
       chooseNav(i){
           this.currentNav=i.RoomId

src/pages/classroom/components/js/lunarCalendar.js

@@ -204,7 +204,6 @@ var lunarCalendar = {
         var objDate = new Date();
         var endDate = new Date();
         if (dateStr) {
-            console.log(dateStr)
             let d = Date.parse(dateStr)
             let res = new Date(d);
 
@@ -216,15 +215,6 @@ var lunarCalendar = {
 
 
         endDate.setDate(endDate.getDate() + dayNum);
-
-
-        // let x1 = objDate.getTime();
-        // console.log(211, x1, objDate)
-        // let x2 = endDate.getTime();
-        // console.log(222, x2, endDate)
-        // let x = x2 - x1
-        // console.log(x1 == x2, x, 'time');
-
         //修正ymd参数
         var m = objDate.getMonth() + 1, d = objDate.getDate();
         var totalMonthDay = lunarCalendar.solarDays(yearStr, m);

src/pages/classroom/components/scenicSummary.vue

@@ -398,7 +398,6 @@ export default {
       this.QStartDate = data[0].CurrentDate;
       this.QEndDate = data[data.length - 1].CurrentDate;
       this.Calendar = this.CalendarDataArray.slice(0,7);
-      console.log("初始化",this.Calendar)
     },
     
     //左侧点击
@@ -445,45 +444,18 @@ export default {
       this.msg.EndDate = d.Format("yyyy-MM-dd");
     },
     getDayInfo(Y, M, D) {
-      console.log(148,Y, M, D)
-      // let StartDate = Y + "-" + M + "-" + D;
-      // let msg = {
-      //   StartDate: StartDate
-      // };
-      // this.apipost(
-      //   "ticketcoupons_get_GetTicketCouponsSummaryDay",
-      //   msg,
-      //   res => {
-      //     if (res.data.resultCode == 1) {
-      //       this.dayList = res.data.data;
-      //     }
-      //   },
-      //   null
-      // );
+
     },
     getOffSet(index){
         let el=document.getElementsByClassName('el-timeline-item')[index]
         let top=el.getBoundingClientRect().top
         return top
     },
-
-    // timeDifference(startTime,endTime){ 
-    //   var start1=startTime.split(":");
-    //   var startAll=parseInt(start1[0]*60)+parseInt(start1[1]);
-    //   var end1=endTime.split(":");
-    //   var endAll=parseInt(end1[0]*60)+parseInt(end1[1]);
-    //   let res=Math.ceil((endAll-startAll)/15)
-
-    //   console.log("时间差===",res);
-    //   return res
-    // }
-
   },
 
   mounted() {
     this.initData();
     this.getEndDay();
-    // this.getList();
     let nowDate = new Date().Format("yyyy-MM-dd");
     this.nowYear = nowDate.split("-")[0];
     this.nowMonth = parseInt(nowDate.split("-")[1]);

src/pages/classroom/components/userHistory.vue

@@ -8,7 +8,7 @@
           {{details.ErrorTitle}}
         </div>
 
-            <img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog"/>
+        <img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog" />
       </div>
       <div class="info-box">
         <div class="user-info">
@@ -46,52 +46,47 @@
 </template>
 
 <script>
-  import {getClassRoomLogDetail} from '../../../api/classroom/index';
+  import {
+    getClassRoomLogDetail
+  } from '../../../api/classroom/index';
   export default {
     props: {
-      classroomId:{
-        type:[Number,String]
+      classroomId: {
+        type: [Number, String]
       },
     },
-    watch:{
-      classroomId(val,oldVal){
-        if(val!==oldVal){
-          
+    watch: {
+      classroomId(val, oldVal) {
+        if (val !== oldVal) {
           this.getClassRoomDetail(val)
         }
       },
-     
     },
-    
-    
     components: {
 
     },
     data() {
       return {
         persistent: false,
-         details:{}
-
+        details: {}
       }
     },
-    
     methods: {
-      getClassRoomDetail(id){
-        getClassRoomLogDetail({ID:id}).then((res)=>{
-          console.log(51,res)
-          if(res.Code===1){
-            this.details=res.Data
+      getClassRoomDetail(id) {
+        getClassRoomLogDetail({
+          ID: id
+        }).then((res) => {
+          if (res.Code === 1) {
+            this.details = res.Data
           }
-          
         })
       },
-      changeShow(){
-        this.persistent=true
+      changeShow() {
+        this.persistent = true
       },
-      hideDialog(){
+      hideDialog() {
         this.$refs.historyDialog.hide()
       }
-     
     },
   }
 
@@ -138,13 +133,15 @@
     font-size: 12px;
     color: #2961FE;
   }
-    .con{
+
+  .con {
     box-sizing: border-box;
     width: 500px;
     height: 1080px;
     background: #FFFFFF;
     box-shadow: 0px 0px 76px 0px rgba(2, 44, 66, 0.2);
-        .header{
+
+    .header {
       width: 500px;
       height: 56px;
       background-color: #F0F5FB;
@@ -152,7 +149,8 @@
       display: flex;
       align-items: center;
       position: relative;
-            .img-head{
+
+      .img-head {
         width: 35px;
         height: 35px;
         // border-radius: 50%;
@@ -160,12 +158,14 @@
         margin-right: 10px;
         object-fit: fill;
       }
-            .head-title{
+
+      .head-title {
         white-space: nowrap;
         overflow: hidden;
-              text-overflow:ellipsis;
+        text-overflow: ellipsis;
       }
-            .img-head-close{
+
+      .img-head-close {
         width: 15px;
         height: 15px;
         margin-right: 10px;
@@ -175,54 +175,65 @@
         right: 15px;
       }
     }
-        .info-box{
+
+    .info-box {
 
       box-sizing: border-box;
       padding: 20px;
-          .user-info{
+
+      .user-info {
         height: 100px;
         border-bottom: 1px solid #E2E2E2;
         font-size: 12px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-              .user-item{
+
+        .user-item {
           display: flex;
           margin-top: 20px;
-                .user-label{
+
+          .user-label {
             width: 100px;
             color: #999999;
           }
-               .user-con{
+
+          .user-con {
             color: #111111;
           }
         }
       }
-          .use{
+
+      .use {
         padding: 30px 0;
         border-bottom: 1px solid #E2E2E2;
-          .use-title{
+
+        .use-title {
           font-size: 12px;
           font-family: Microsoft YaHei;
           font-weight: bold;
           color: #111111;
           margin-bottom: 20px;
         }
-          .use-con{
+
+        .use-con {
           font-size: 12px;
           font-family: Microsoft YaHei;
           font-weight: 400;
           color: #999999;
         }
-          .img-con{
+
+        .img-con {
           display: flex;
-            .classroom-img-item{
+
+          .classroom-img-item {
             display: flex;
             width: 145px;
             height: 80px;
             border-radius: 4px;
             margin-right: 10px;
             margin-bottom: 10px;
-              .classroom-img{
+
+            .classroom-img {
               width: 100%;
               height: 100%;
 
@@ -235,4 +246,5 @@
     }
 
   }
+
 </style>

src/pages/classroom/courseInfo.vue

@@ -336,8 +336,7 @@
              "cover":cover,
              "playauth":auth,
             }, function (player) {
-              console.log(321,player)
-                 console.log("The player is created");
+              
              }
         );
       },

src/pages/classroom/useRecord.vue

@@ -128,14 +128,14 @@
         },
         //选择校区教室导航
         successNav(val){
-          console.log(114,val)
+        
             this.msg.RoomId=val.RoomId
             this.msg.SchoolId=val.schoolId
             this.getClassRoomTimeList();
             this.$forceUpdate()
         },
         dateChoose(value, reason, details){
-          // console.log(112,this.dateModel)
+        
         },
         //获取结束日期
         getEndTime(date){

src/pages/course/teacherLesson.vue

@@ -419,7 +419,6 @@
             }
           }
         })
-        console.log()
         return Str;
       },
       //跳转至备课

src/pages/financial/CommissionDetail.vue

@@ -4,17 +4,23 @@
     padding: 18px 0 0 16px;
     text-align: right;
   }
+
   .CommissionDetail .border-bottom {
     /* border-bottom: 1px dashed #EEE; */
     padding-bottom: 5px;
     margin-bottom: 5px;
   }
-    .CommissionDetail  .text-bottom{
-        height: 32px;line-height: 32px; margin-bottom: 10px;
+
+  .CommissionDetail .text-bottom {
+    height: 32px;
+    line-height: 32px;
+    margin-bottom: 10px;
   }
+
   .CommissionDetail ._icon_btn i.icon-sousuo {
     background-color: #47BF8C;
   }
+
   .CommissionDetail ._icon_btn i {
     width: 26px;
     height: 26px;
@@ -27,13 +33,14 @@
     cursor: pointer;
     outline: none;
   }
- .CommissionDetail .el-table td,.el-table th{
+
+  .CommissionDetail .el-table td,
+  .el-table th {
     padding: 5px 0;
   }
 
-  
-  </style>
-  <template>
+</style>
+<template>
   <div class="page-body CommissionDetail">
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
@@ -54,33 +61,31 @@
                 <q-input filled v-model="msg.OrderId"  @keyup.enter.native="getList()" label="订单号" />
               </div> -->
         <div class="col-3">
-                <q-btn  color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/>
+          <q-btn  color="primary"  size="11px"  label="返回"  @click="goreturn"  style="margin-left:10px" />
         </div>
       </div>
     </div>
-      <template >
-        <el-table
-            ref="filterTable"
-            :data="tableData"
-            v-loading = 'loading'
-
-            :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}"
-            border
-            style="width: 100%">
-            <el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist'  :filter-method="filterHandler"></el-table-column>
-            <el-table-column prop="DeptName" label="部门" :filters='DeptNamelist'  :filter-method="filterHandler"></el-table-column>
-            <el-table-column prop="UserName" label="销售" :filters='UserNamelist'  :filter-method="filterHandler"> </el-table-column>
+    <template>
+      <el-table ref="filterTable" :data="tableData" v-loading='loading'
+        :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
+        <el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler">
+        </el-table-column>
+        <el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler">
+        </el-table-column>
+        <el-table-column prop="UserName" label="销售" :filters='UserNamelist' :filter-method="filterHandler">
+        </el-table-column>
         <el-table-column prop="StudentCount" label="学生数量" sortable :sort-method="StudentCount"> </el-table-column>
-            <el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column>
-            <el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column>
+        <el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney">
+        </el-table-column>
+        <el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney">
+        </el-table-column>
         <el-table-column prop="CommissionMoney" label="最终提成" sortable :sort-method="CommissionMoney"> </el-table-column>
         <!-- <el-table-column prop="Periods" label="周期"> </el-table-column> -->
-            <el-table-column  label="操作" >
+        <el-table-column label="操作">
           <template slot-scope="scope">
             <div class="_icon_btn">
               <el-tooltip class="item" effect="dark" content="查看" placement="top">
-                      <i class="iconfont icon-sousuo" 
-                          @click="goUrl('userCommissionDetails',scope.row.UserId)"></i>
+                <i class="iconfont icon-sousuo" @click="goUrl('userCommissionDetails',scope.row.UserId)"></i>
               </el-tooltip>
             </div>
           </template>
@@ -89,12 +94,12 @@
     </template>
 
   </div>
-  </template>
-  <script>
+</template>
+<script>
   import {
     GetClassTypePageList,
   } from '../../api/system/index';
-    import{
+  import {
     getSellCommissionUserList,
   } from '../../api/finance/index'
   import {
@@ -113,51 +118,48 @@
         msg: {
           PeriodId: 0,
           UserId: 0,
-            ClassId:0,
-            OrderId:'',
-            School_Id:'-1',
+          ClassId: 0,
+          OrderId: '',
+          School_Id: '-1',
         },
         pageCount: 0,
         persistent: false,
-          listData:{},
-          tableData:[],
-          company:[],
-          department:[],
-          ClassList:[],
-          allClassList:[],
-          see_tcdetailed:false,
-          SchoolNamelist:[],
-          DeptNamelist:[],
-          UserNamelist:[],
+        listData: {},
+        tableData: [],
+        company: [],
+        department: [],
+        ClassList: [],
+        allClassList: [],
+        see_tcdetailed: false,
+        SchoolNamelist: [],
+        DeptNamelist: [],
+        UserNamelist: [],
       }
     },
     created() {
       let userinfo = this.getLocalStorage();
-        userinfo.ActionMenuList.map(x=>{//判断权限
-          if(x.FunctionCode == "see_tcdetailed"){//判断是否可以查看其他明细
+      userinfo.ActionMenuList.map(x => { //判断权限
+        if (x.FunctionCode == "see_tcdetailed") { //判断是否可以查看其他明细
           this.see_tcdetailed = true;
         }
       })
-        if(this.see_tcdetailed == false){
-          console.log(userinfo)
+      if (this.see_tcdetailed == false) {
         this.msg.UserId = userinfo.Id
       }
     },
     mounted() {
-        console.log(this.$route.query)
-        if(this.$route.query && this.$route.query.id){
+      if (this.$route.query && this.$route.query.id) {
         this.msg.PeriodId = this.$route.query.id
       }
-        if(this.$route.query && this.$route.query.School_Id){
+      if (this.$route.query && this.$route.query.School_Id) {
         this.msg.School_Id = this.$route.query.School_Id
       }
       this.getList()
       this.setClass()
     },
     methods: {
-     
-        getList(){
-          if(this.msg)
+      getList() {
+        if (this.msg)
           this.loading = true;
         getSellCommissionUserList(this.msg).then(res => {
           if (res.Code == 1) {
@@ -166,10 +168,19 @@
             this.SchoolNamelist = [];
             this.DeptNamelist = [];
             this.UserNamelist = [];
-              this.tableData.forEach(x=>{
-                  let obj = {text: x.SchoolName, value: x.SchoolName}
-                  let obj2 = {text: x.DeptName, value: x.DeptName}
-                  let obj3 = {text: x.UserName, value: x.UserName}
+            this.tableData.forEach(x => {
+              let obj = {
+                text: x.SchoolName,
+                value: x.SchoolName
+              }
+              let obj2 = {
+                text: x.DeptName,
+                value: x.DeptName
+              }
+              let obj3 = {
+                text: x.UserName,
+                value: x.UserName
+              }
               this.SchoolNamelist.push(obj)
               this.DeptNamelist.push(obj2)
               this.UserNamelist.push(obj3)
@@ -180,7 +191,7 @@
           }
         })
       },
-        unique(arr,Name){//数组去重
+      unique(arr, Name) { //数组去重
         const res = new Map();
         return arr.filter(
           (list) => !res.has(list.text) && res.set(list.text, 1)
@@ -214,12 +225,12 @@
         })
       },
 
-        goUrl(path, id ) {
+      goUrl(path, id) {
         this.$router.push({
           path: '/financial/' + path,
           query: {
             userId: id,
-                preriodId:this.$route.query.id,
+            preriodId: this.$route.query.id,
             blank: 'y',
           }
         })
@@ -228,29 +239,27 @@
         const property = column['property'];
         return row[property] === value;
       },
-        StudentCount(a,b,c){
-          console.log(a,b,c)
+      StudentCount(a, b, c) {
         return a.StudentCount - b.StudentCount;
       },
-        CurrentPeriodMoney(a,b){
+      CurrentPeriodMoney(a, b) {
         return a.CurrentPeriodMoney - b.CurrentPeriodMoney;
       },
-        CurrentExtraMoney(a,b){
+      CurrentExtraMoney(a, b) {
         return a.CurrentExtraMoney - b.CurrentExtraMoney;
       },
-        CommissionMoney(a,b){
+      CommissionMoney(a, b) {
         return a.CommissionMoney - b.CommissionMoney;
       },
-        goreturn(){
+      goreturn() {
         this.$router.go(-1);
       }
 
     },
   }
 
-  </script>
-  <style lang="sass">
+</script>
+<style lang="sass">
   @import url('~assets/css/table.sass')
 
-  </style>
-  
+</style>
\ No newline at end of file

src/pages/financial/cycleOrderList.vue

@@ -4,17 +4,23 @@
     padding: 18px 0 0 16px;
     text-align: right;
   }
+
   .cycleOrderList .border-bottom {
     /* border-bottom: 1px dashed #EEE; */
     padding-bottom: 5px;
     margin-bottom: 5px;
   }
-    .cycleOrderList  .text-bottom{
-        height: 32px;line-height: 32px; margin-bottom: 10px;
+
+  .cycleOrderList .text-bottom {
+    height: 32px;
+    line-height: 32px;
+    margin-bottom: 10px;
   }
+
   .cycleOrderList ._icon_btn i.icon-sousuo {
     background-color: #47BF8C;
   }
+
   .cycleOrderList ._icon_btn i {
     width: 30px;
     height: 30px;
@@ -27,42 +33,41 @@
     cursor: pointer;
     outline: none;
   }
- .cycleOrderList .el-table td,.el-table th{
+
+  .cycleOrderList .el-table td,
+  .el-table th {
     padding: 5px 0;
   }
 
-  
-  </style>
-  <template>
+</style>
+<template>
   <div class="page-body cycleOrderList">
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-                <q-btn  color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/>
+          <q-btn  color="primary"  size="11px"  label="返回"  @click="goreturn"  style="margin-left:10px" />
         </div>
       </div>
     </div>
-      <template >
-        <el-table
-            ref="filterTable"
-            :data="tableData"
-            v-loading = 'loading'
-
-            :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}"
-            border
-            style="width: 100%">
-            <el-table-column  prop="SchoolName" label="校区"  :filters='SchoolNamelist'  :filter-method="filterHandler"></el-table-column>
-            <el-table-column  prop="DeptName" label="部门" :filters='DeptNamelist'  :filter-method="filterHandler"></el-table-column>
-            <el-table-column  prop="UserName" label="销售"  :filters='UserNamelist'  :filter-method="filterHandler"> </el-table-column>
-            <el-table-column  width='170' prop="ClassName" label="班级信息" > 
+    <template>
+      <el-table ref="filterTable" :data="tableData" v-loading='loading'
+        :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
+        <el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler">
+        </el-table-column>
+        <el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler">
+        </el-table-column>
+        <el-table-column prop="UserName" label="销售" :filters='UserNamelist' :filter-method="filterHandler">
+        </el-table-column>
+        <el-table-column width='170' prop="ClassName" label="班级信息">
           <template slot-scope="scope">
-                    <div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
+            <div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;"
+                v-if='scope.row.IsContinueClass==1'>(续)</span></div>
             <div>学生数量:{{scope.row.StudentCount}}人</div>
           </template>
         </el-table-column>
-            <el-table-column prop="OrderId" label="订单号" >
+        <el-table-column prop="OrderId" label="订单号">
           <template slot-scope="scope">
-                    <div style="cursor: pointer;" >{{scope.row.OrderId}} </div>
+            <div style="cursor: pointer;">{{scope.row.OrderId}} </div>
 
           </template>
         </el-table-column>
@@ -109,12 +114,12 @@
     </template>
 
   </div>
-  </template>
-  <script>
+</template>
+<script>
   import {
     GetClassTypePageList,
   } from '../../api/system/index';
-    import{
+  import {
     getSellCommissionForOrderList,
   } from '../../api/finance/index'
   import {
@@ -133,38 +138,38 @@
         msg: {
           PeriodId: 0,
           UserId: 0,
-            ClassId:0,
-            OrderId:'',
+          ClassId: 0,
+          OrderId: '',
         },
         pageCount: 0,
         persistent: false,
-          listData:{},
-          tableData:[],
-          company:[],
-          department:[],
-          ClassList:[],
-          allClassList:[],
+        listData: {},
+        tableData: [],
+        company: [],
+        department: [],
+        ClassList: [],
+        allClassList: [],
 
-          SchoolNamelist:[],
-          DeptNamelist:[],
-          UserNamelist:[],
-          see_tcdetailed:false,
+        SchoolNamelist: [],
+        DeptNamelist: [],
+        UserNamelist: [],
+        see_tcdetailed: false,
 
       }
     },
     created() {
       let userinfo = this.getLocalStorage();
-        userinfo.ActionMenuList.map(x=>{//判断权限
-          if(x.FunctionCode == "see_tcdetailed"){//判断是否可以查看其他明细
+      userinfo.ActionMenuList.map(x => { //判断权限
+        if (x.FunctionCode == "see_tcdetailed") { //判断是否可以查看其他明细
           this.see_tcdetailed = true;
         }
       })
-        if(this.see_tcdetailed == false){
+      if (this.see_tcdetailed == false) {
         this.msg.UserId = userinfo.Id
       }
     },
     mounted() {
-        if(this.$route.query && this.$route.query.OrderId){
+      if (this.$route.query && this.$route.query.OrderId) {
         this.msg.OrderId = this.$route.query.OrderId
       }
 
@@ -173,8 +178,8 @@
     },
     methods: {
 
-        getList(){
-          if(this.msg)
+      getList() {
+        if (this.msg)
           this.loading = true;
         getSellCommissionForOrderList(this.msg).then(res => {
           if (res.Code == 1) {
@@ -184,10 +189,19 @@
             this.SchoolNamelist = [];
             this.DeptNamelist = [];
             this.UserNamelist = [];
-              this.tableData.forEach(x=>{
-                  let obj = {text: x.SchoolName, value: x.SchoolName}
-                  let obj2 = {text: x.DeptName, value: x.DeptName}
-                  let obj3 = {text: x.UserName, value: x.UserName}
+            this.tableData.forEach(x => {
+              let obj = {
+                text: x.SchoolName,
+                value: x.SchoolName
+              }
+              let obj2 = {
+                text: x.DeptName,
+                value: x.DeptName
+              }
+              let obj3 = {
+                text: x.UserName,
+                value: x.UserName
+              }
               this.SchoolNamelist.push(obj)
               this.DeptNamelist.push(obj2)
               this.UserNamelist.push(obj3)
@@ -198,7 +212,7 @@
           }
         })
       },
-        unique(arr,Name){//数组去重
+      unique(arr, Name) { //数组去重
         const res = new Map();
         return arr.filter(
           (list) => !res.has(list.text) && res.set(list.text, 1)
@@ -232,7 +246,7 @@
         })
       },
 
-        goUrl(path, id ) {
+      goUrl(path, id) {
         this.$router.push({
           path: '/financial/' + path,
           query: {
@@ -246,11 +260,10 @@
         const property = column['property'];
         return row[property] === value;
       },
-        StudentCount(a,b){
-            console.log(a,b)
+      StudentCount(a, b) {
         return a.StudentCount - b.StudentCount;
       },
-        goreturn(){
+      goreturn() {
         this.$router.go(-1);
       }
 
@@ -259,9 +272,8 @@
     },
   }
 
-  </script>
-  <style lang="sass">
+</script>
+<style lang="sass">
   @import url('~assets/css/table.sass')
 
-  </style>
-  
+</style>
\ No newline at end of file

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -2532,7 +2532,6 @@
         })
       },
       getAccountListtype(AccountId){
-        console.log(AccountId)
         this.accountList2.map(x=>{
           if(x.ID == AccountId){
             this.FinanceTrabeMsg.Type = x.BankType

src/pages/financial/userCommissionDetails.vue

@@ -4,17 +4,23 @@
     padding: 18px 0 0 16px;
     text-align: right;
   }
+
   .userCommissionDetails .border-bottom {
     /* border-bottom: 1px dashed #EEE; */
     padding-bottom: 5px;
     margin-bottom: 5px;
   }
-    .userCommissionDetails  .text-bottom{
-        height: 32px;line-height: 32px; margin-bottom: 10px;
+
+  .userCommissionDetails .text-bottom {
+    height: 32px;
+    line-height: 32px;
+    margin-bottom: 10px;
   }
+
   .userCommissionDetails ._icon_btn i.icon-sousuo {
     background-color: #47BF8C;
   }
+
   .userCommissionDetails ._icon_btn i {
     width: 30px;
     height: 30px;
@@ -27,23 +33,24 @@
     cursor: pointer;
     outline: none;
   }
- .userCommissionDetails .el-table td,.el-table th{
+
+  .userCommissionDetails .el-table td,
+  .el-table th {
     padding: 5px 0;
   }
 
-  
-  </style>
-  <template>
+</style>
+<template>
   <div class="page-body userCommissionDetails">
     <div class="page-search row items-center">
       <div style="margin-right: 10px;">
-              <q-btn color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/>
+        <q-btn color="primary"  size="11px"  label="返回"  @click="goreturn"  style="margin-left:10px" />
       </div>
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
           <q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList"
-                  option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false"
-                  emit-value map-options @filter="filterFn">
+            option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false" emit-value
+            map-options @filter="filterFn">
             <template v-slot:no-option>
               <q-item>
                 <q-item-section class="text-grey">
@@ -58,27 +65,23 @@
         </div>
       </div>
     </div>
-      <template >
-        <el-table
-            ref="filterTable"
-            :data="tableData"
-            v-loading = 'loading'
-
-            :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}"
-            border
-            style="width: 100%">
-            <el-table-column  prop="SchoolName" label="校区" ></el-table-column>
-            <el-table-column  prop="DeptName" label="部门" ></el-table-column>
-            <el-table-column  prop="UserName" label="销售" > </el-table-column>
-            <el-table-column  width='170' prop="ClassName" label="班级信息" > 
+    <template>
+      <el-table ref="filterTable" :data="tableData" v-loading='loading'
+        :header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
+        <el-table-column prop="SchoolName" label="校区"></el-table-column>
+        <el-table-column prop="DeptName" label="部门"></el-table-column>
+        <el-table-column prop="UserName" label="销售"> </el-table-column>
+        <el-table-column width='170' prop="ClassName" label="班级信息">
           <template slot-scope="scope">
-                    <div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
+            <div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;"
+                v-if='scope.row.IsContinueClass==1'>(续)</span></div>
             <div>学生数量:{{scope.row.StudentCount}}人</div>
           </template>
         </el-table-column>
-            <el-table-column prop="OrderId" label="订单号" >
+        <el-table-column prop="OrderId" label="订单号">
           <template slot-scope="scope">
-                    <div style="cursor: pointer;text-decoration: underline;" @click='goorderUrl(scope.row.OrderId)'>{{scope.row.OrderId}} </div>
+            <div style="cursor: pointer;text-decoration: underline;" @click='goorderUrl(scope.row.OrderId)'>
+              {{scope.row.OrderId}} </div>
 
           </template>
         </el-table-column>
@@ -123,12 +126,12 @@
     </template>
 
   </div>
-  </template>
-  <script>
+</template>
+<script>
   import {
     GetClassTypePageList,
   } from '../../api/system/index';
-    import{
+  import {
     getSellCommissionUserDetailList,
   } from '../../api/finance/index'
   import {
@@ -147,25 +150,25 @@
         msg: {
           PeriodId: 0,
           UserId: 0,
-            ClassId:0,
-            OrderId:'',
+          ClassId: 0,
+          OrderId: '',
         },
         pageCount: 0,
         persistent: false,
-          listData:{},
-          tableData:[],
-          company:[],
-          department:[],
-          ClassList:[],
-          allClassList:[],
+        listData: {},
+        tableData: [],
+        company: [],
+        department: [],
+        ClassList: [],
+        allClassList: [],
       }
     },
     created() {},
     mounted() {
-        if(this.$route.query && this.$route.query.userId){
+      if (this.$route.query && this.$route.query.userId) {
         this.msg.UserId = this.$route.query.userId
       }
-        if(this.$route.query && this.$route.query.preriodId){
+      if (this.$route.query && this.$route.query.preriodId) {
         this.msg.PeriodId = this.$route.query.preriodId
       }
       this.getList()
@@ -173,8 +176,8 @@
     },
     methods: {
 
-        getList(){
-          if(this.msg)
+      getList() {
+        if (this.msg)
           this.loading = true;
         getSellCommissionUserDetailList(this.msg).then(res => {
           if (res.Code == 1) {
@@ -211,7 +214,7 @@
         })
       },
 
-        goUrl(path, id ) {
+      goUrl(path, id) {
         this.$router.push({
           path: '/financial/' + path,
           query: {
@@ -225,30 +228,25 @@
         const property = column['property'];
         return row[property] === value;
       },
-        StudentCount(a,b){
-            console.log(a,b)
+      StudentCount(a, b) {
         return a.StudentCount - b.StudentCount;
       },
-        goorderUrl(id){
-            console.log(id)
+      goorderUrl(id) {
         this.$router.push({
-            path: '/financial/cycleOrderList' ,
+          path: '/financial/cycleOrderList',
           query: {
             OrderId: id,
             blank: 'y',
           }
         })
       },
-        goreturn(){
+      goreturn() {
         this.$router.go(-1);
       }
-
     },
   }
-  
-  </script>
-  <style lang="sass">
+</script>
+<style lang="sass">
   @import url('~assets/css/table.sass')
 
-  </style>
-  
+</style>
\ No newline at end of file

src/pages/sale/appointManagement.vue

 <template>
   <div class="page-body">
+    <div class="page-search row items-center">
+      <div class="col row wrap q-mr-lg q-col-gutter-md">
+        <div class="col-4">
+          <div class="col-4 Sysuser_Date">
+            <q-field filled>
+               <template v-slot:control>
+                <el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间"
+                  size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
+                </el-date-picker>至
+                <el-date-picker v-model="msg.EndClassDate" value-format="yyyy-MM-dd" type="date" placeholder="结束时间"
+                  size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
+                </el-date-picker>
+              </template>
+            </q-field>
+          </div>
+        </div>
+        <div class="col-3">
+          <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 class="col-3">
+          <q-select @input="resetSearch" filled stack-label option-value="RoomId" option-label="RoomName"
+            v-model="msg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室" clearable :dense="false"
+            class="col-6 q-pb-lg" emit-value map-options />
+        </div>
+      </div>
+    </div>
+
     <q-table :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
       separator="none" :data="dataList" :columns="columns" row-key="name">
       <template v-slot:top="props">
@@ -11,7 +39,7 @@
         <q-td :props="props">
           <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
             <q-list>
-              <q-item clickable v-close-popup @click="OperateVitior(props.row,1)">
+              <q-item clickable v-close-popup @click="ExchangeOrder(props.row)">
                 <q-item-section>
                   <q-item-label>转订单</q-item-label>
                 </q-item-section>
@@ -21,7 +49,7 @@
                   <q-item-label>流单</q-item-label>
                 </q-item-section>
               </q-item>
-              <q-item clickable v-close-popup @click="OperateVitior(props.row,3)"  >
+              <q-item clickable v-close-popup @click="OperateVitior(props.row,3)">
                 <q-item-section>
                   <q-item-label>取消</q-item-label>
                 </q-item-section>
@@ -35,7 +63,8 @@
           :input="true" @input="changePage" />
       </template>
     </q-table>
-    <yuekeForm v-if="isShowYue" :ChoiceType="ChoiceType" @close="closeYuekeForm" @success="refreshPage"></yuekeForm>
+    <yuekeForm v-if="isShowYue" :ChoiceType="ChoiceType" :save-obj="visitorItem" @close="closeYuekeForm" @success="refreshPage"></yuekeForm>
+    <exorderForm v-if="isShowExOrder" :save-obj="visitorItem" @close="closeOrderForm" @success="refreshPage"></exorderForm>
   </div>
 </template>
 
@@ -43,20 +72,31 @@
   import {
     queryVisitorReservePage
   } from '../../api/scheduling/schedu'
+  import {
+    getTeacherDropDownList,
+    queryClassRoomList
+  } from "../../api/school/index";
   import yuekeForm from '../../components/schedul/yueke-form'
+  import exorderForm from '../../components/schedul/exorder-form'
 
   export default {
     meta: {
       title: "约课管理"
     },
     components: {
-      yuekeForm
+      yuekeForm,
+      exorderForm
     },
     data() {
       return {
         msg: {
           pageIndex: 1,
-          pageSize: 10
+          pageSize: 10,
+          rowsPerPage: 10,
+          StartClassDate: "", //开始日期
+          EndClassDate: "", //结束日期
+          TeacherId: "",
+          ClassRoomId: "",
         },
         dataList: [],
         loading: false,
@@ -110,14 +150,36 @@
           }
         ],
         isShowYue:false,
-        ChoiceType:0
+        ChoiceType:0,
+        visitorItem:{},//选中的对象
+        isShowExOrder:false,
+ 
       }
     },
-
+    created() {
+      this.GetTeacherList();
+      this.getClassRoomList();
+    },
     mounted() {
       this.getList()
     },
     methods: {
+      //获取教师下拉
+      GetTeacherList() {
+        getTeacherDropDownList({}).then(res => {
+          if (res.Code == 1) {
+            this.TeacherList = res.Data;
+          }
+        });
+      },
+      //获取教室下拉
+      getClassRoomList() {
+        queryClassRoomList({}).then(res => {
+          if (res.Code == 1) {
+            this.ClassRoomList = res.Data;
+          }
+        })
+      },
       //重新查询
       resetSearch() {
         this.msg.pageIndex = 1;
@@ -130,7 +192,6 @@
       //获取课程系列分页列表
       getList() {
         queryVisitorReservePage(this.msg).then(res => {
-          console.log(res, '数据');
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
@@ -138,20 +199,26 @@
         })
       },
       //预约操作按钮
-      OperateVitior(item,type)
-      {
+      OperateVitior(item, type) {
         this.ChoiceType = type;
         this.isShowYue = true;
+        this.visitorItem = item;
       },
       //关闭弹窗
       closeYuekeForm() {
         this.isShowYue = false
       },
+      closeOrderForm() {
+        this.isShowExOrder = false
+      },
       //刷新页面
       refreshPage() {
         this.getList();
+      },
+      ExchangeOrder(item){
+        this.visitorItem = item;
+        this.isShowExOrder=true;
       }
-
     }
   }