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

src/components/course/classmate-form.vue

@@ -124,7 +124,7 @@
       </thead>
     </table>
     <div class="planTabDiv" ref="planTabDiv">
-      <table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
+      <table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;" v-loading="loading">
         <tbody>
           <tr v-for="(item,index) in dataList.fridayList" :key="index">
             <td>
@@ -176,6 +176,10 @@
         type: Object,
         default: null
       },
+      loading:{
+        type:Boolean,
+        default:false,
+      }
     },
     components: {
       mateitem,

src/components/course/mateitem.vue

@@ -19,7 +19,7 @@
           <div class="plan_LeftTitle">上课时间：</div>
           <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
         </div>
-        <div class="plan_Inner" v-if="subItem.ClassName">
+        <div class="plan_Inner" v-if="subItem.ClassName&&subItem.ClassType!==3">
           <div class="plan_LeftTitle">班级：</div>
           <div class="plan_RightInner">{{subItem.ClassName}}</div>
         </div>

src/components/duty/dutyItemManagement.vue

@@ -21,7 +21,7 @@
     <div class="page-content">
       <q-table :pagination='qMsg' :loading="loading" no-data-label="暂无相关数据" flat class="sticky-right-column-table"
         separator="none" :data="dataList" :columns="columns" row-key="name">
-        <template v-slot:top="props">
+        <template v-slot:top>
           <div class="col-2 q-table__title">值班事项管理</div>
           <q-space />
           <div class="page-option">
@@ -175,7 +175,9 @@
       },
       //获取数据
       getList() {
+        this.loading=true;
         queryDutyItemPage(this.qMsg).then(res => {
+          this.loading=false;
           if (res.Code == 1) {
             this.pageCount = res.Data.PageCount;
             this.dataList = res.Data.PageData;;

src/components/sale/b2bcustomlist.vue

@@ -15,10 +15,11 @@
       :visible-columns="visibleColumns" row-key="CustomerId">
       <template v-slot:top>
         <q-space />
-        <div class="page-option" v-if="authObj.isShowEdit">
-          <q-btn color="accent" size="sm" class="q-mr-md" icon="add" @click="EditCustom(null)" label="新增联系人" />
-          <q-btn color="accent" size="sm" label="转交" :disable="selection.length == 0" icon="swap_horiz"
-            @click="isShowTrans = true">
+        <div class="page-option">
+          <q-btn v-if="authObj.isShowEdit" color="accent" size="sm" class="q-mr-md" icon="add" @click="EditCustom(null)"
+            label="新增联系人" />
+          <q-btn v-if="authObj.isShowEdit" color="accent" size="sm" label="转交" :disable="selection.length == 0"
+            icon="swap_horiz" @click="isShowTrans = true">
             <q-popup-proxy :offset="[10, 10]">
               <q-banner v-if="isShowTrans">
                 <q-select style="margin-top:20px;" filled v-model="TransferMsg.EmpId" @filter="filterEmployee" use-input
@@ -29,6 +30,8 @@
               </q-banner>
             </q-popup-proxy>
           </q-btn>
+          <q-btn v-if="authObj&&authObj.isShowDownload" color="accent" class="q-mr-md" size="sm" icon="add" label="下载"
+            @click="downloadCustomer" />
         </div>
       </template>
       <template v-slot:body-cell-CustomerName="props">
@@ -87,9 +90,13 @@
   import {
     setCustomerCareOf
   } from "../../api/sale/peemanagement";
+  import {
+    EduDownLoad
+  } from "../../api/common/common";
   import customerEditForm from "../sale/customerEdit-form";
   import customerReviewForm from "../sale/customerReview-form";
   import customerInfo from "./b2bcustomerinfo/b2bCustomerInfo.vue";
+  import obj from '../../pages/financial/lang/zh-demo';
   export default {
     props: {
       dataList: {
@@ -111,6 +118,18 @@
       sticky: {
         type: String,
         default: ""
+      },
+      loading: {
+        type: Boolean,
+        default: false,
+      },
+      queryMsg: {
+        type: Object,
+        default: null,
+      },
+      authObj: {
+        type: Object,
+        default: null,
       }
     },
     components: {
@@ -134,7 +153,7 @@
           },
           {
             name: "CategoryName",
-            label: "同业名称",
+            label: "同行名称",
             field: "CategoryName",
             align: "left"
           },
@@ -231,15 +250,24 @@
       this.getEmployeeList();
     },
     mounted() {
-      if(this.dataList&&this.dataList.length>0){
-        this.dataList.forEach(x=>{
-          if(x.CustomerType==4){
+      if (this.dataList && this.dataList.length > 0) {
+        this.dataList.forEach(x => {
+          if (x.CustomerType == 4) {
             x.CategoryName = x.EnterpriseName
           }
         })
       }
     },
     methods: {
+      //下载同行联系人
+      downloadCustomer() {
+        var msg = JSON.parse(JSON.stringify(this.queryMsg));
+        EduDownLoad(
+          "/b2bcustomer/DownLoadCustomerLinkMan",
+          msg,
+          "同行资料.xls"
+        );
+      },
       //初始化权限
       initAuth() {
         if (this.authObj) {

src/components/sale/customcategorylist.vue

@@ -10,8 +10,8 @@
 </style>
 <template>
   <div class="b2bcustomlist">
-    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat
-        class="sticky-column-table" separator="none" :data="dataList" :columns="columns" row-key="CustomerId">
+    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+      separator="none" :data="dataList" :columns="columns" row-key="CustomerId">
       <template v-slot:top>
         <q-space />
         <div class="page-option">
@@ -41,8 +41,10 @@
       </template>
       <template v-slot:body-cell-optioned="props">
         <q-td :props="props">
-          <q-btn flat size="xs" icon="edit" color="accent" @click="EditCustom(props.row)" style="font-weight:400" label="修改" />
-          <q-btn flat size="xs" icon="delete" @click="RemoveCustomer(props.row)" color="negative" style="font-weight:400" label="删除" />
+          <q-btn flat size="xs" icon="edit" color="accent" @click="EditCustom(props.row)" style="font-weight:400"
+            label="修改" />
+          <q-btn flat size="xs" icon="delete" @click="RemoveCustomer(props.row)" color="negative"
+            style="font-weight:400" label="删除" />
         </q-td>
       </template>
       <template v-slot:bottom>
@@ -52,7 +54,8 @@
     <categoryEdit-form v-if="isShowCategoryForm" :customerObj="customerObj" @close="closeCustomForm"
       @success="refreshQuestion">
     </categoryEdit-form>
-    <peerRight v-if="isShowDetailForm" :CategoryId="CategoryId" @close="closeCustomForm" :auth="AuthorityObj" @success="refreshQuestion"></peerRight>
+    <peerRight v-if="isShowDetailForm" :CategoryId="CategoryId" @close="closeCustomForm" :auth="AuthorityObj"
+      @success="refreshQuestion"></peerRight>
   </div>
 </template>
 <script>
@@ -66,6 +69,10 @@
       dataList: {
         type: Array,
         default: null
+      },
+      loading: {
+        type: Boolean,
+        default: false,
       }
     },
     components: {
@@ -127,7 +134,7 @@
         loading: false,
         isShowCategoryForm: false,
         customerObj: null, //传入参数
-        tabId:1,
+        tabId: 1,
         //权限设置
         AuthorityObj: {
           isShowEdit: false, //是否显示新增修改按钮
@@ -135,15 +142,14 @@
           isShowBankBook: false, //是否显示幸福存折
           isShowRebate: false //是否显示返佣
         },
-        isShowDetailForm:false,
-        CategoryId:0
+        isShowDetailForm: false,
+        CategoryId: 0
       };
     },
     created() {
 
     },
-    mounted() {
-    },
+    mounted() {},
     methods: {
       //新增或者修改客户
       EditCustom(obj) {

src/components/sale/customerEdit-form.vue

@@ -139,12 +139,12 @@
             :options="customList" class="col-6 q-pr-lg q-pb-lg" v-model="objOption.CategoryId" clearable emit-value map-options />
           <template v-if="objOption.CustomerType!=4">
             <div class="col-6" v-if="!isShowEdit">
-              <q-btn label="立即添加" @click="isShowEdit=true" size="sm" color="primary" />
+              <q-btn label="立即添加同行" @click="isShowEdit=true" size="sm" color="primary" />
             </div>
             <div class="col-6" v-if="isShowEdit" style="position:relative">
               <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.CategoryName" lazy-rules
                 ref="CategoryName" class="col-6 q-pb-lg" label="名称" />
-              <div class="custom_Close" @click="isShowEdit=false">
+              <div class="custom_Close" @click="closeCageName()">
                 <i style="position" class="iconfont icon-guanbi1"></i>
               </div>
             </div>
@@ -283,6 +283,10 @@
       this.getCustomList(1);
     },
     methods: {
+      closeCageName(){
+        this.isShowEdit=false;
+        this.objOption.CategoryName='';
+      },
       //初始化表单
       initObj() {
         if (this.customerObj && this.customerObj.CustomerId > 0) {
@@ -337,9 +341,8 @@
       saveCourse() {
         this.$refs.CustomerName.validate();
         // this.$refs.ContactNumber.validate();
-        this.$refs.Address.validate();
         if(this.objOption.CustomerType!=4){
-          if (this.objOption.CategoryId=='' && this.objOption.CategoryName=='') {
+          if (!this.objOption.CategoryId && this.objOption.CategoryName=='') {
             this.$q.notify({
               type:'warning',
               message: "请选择客户或立即添加",
@@ -367,7 +370,7 @@
           });
           return
         }
-        if (!this.$refs.CustomerName.hasError && !this.$refs.Address.hasError) {
+        if (!this.$refs.CustomerName.hasError) {
           this.saveCustomLoading = true;
           SetCustomer(this.objOption).then(res => {
             if (res.Code == 1) {

src/components/sale/orderlist.vue

@@ -37,7 +37,7 @@
         </thead>
       </table>
     </div>
-    <div class="table-body">
+    <div class="table-body" v-loading="loading">
       <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
         <colgroup>
           <col width="12%" />
@@ -1267,6 +1267,10 @@
         //来自 1是来自 学管今日订单
         type: Number,
         default: 0
+      },
+      loading:{
+        type:Boolean,
+        default:false,
       }
     },
     data() {

src/components/schedul/reservelist.vue

@@ -110,7 +110,7 @@
       },
       loading: {
         type: Boolean,
-        default: null
+        default: false
       },
       authObj: {
         type: Object,

src/pages/course/classPlan.vue

@@ -25,12 +25,17 @@
       </div>
       <div class="col-2">
         <el-select v-model="msg.ClassType" style="width:100%;" placeholder="类型" size="small" @change="getPlanList()">
-          <el-option :key="0" label="全部" :value="0">
-          </el-option>
-          <el-option :key="1" label="正常" :value="1">
-          </el-option>
-          <el-option :key="2" label="试听课" :value="2">
-          </el-option>
+          <el-option :key="0" label="全部" :value="0"> </el-option>
+          <el-option :key="1" label="跟班课" :value="1"> </el-option>
+          <el-option :key="2" label="试听课" :value="2"> </el-option>
+          <el-option :key="2" label="预约课" :value="3"> </el-option>
+        </el-select>
+      </div>
+      <div class="col-2" v-if="msg.ClassType==3">
+        <el-select v-model="msg.AppointState" style="width:100%;" placeholder="预约状态" size="small" @change="getPlanList()">
+          <el-option :key="0" label="不限" :value="0"> </el-option>
+          <el-option :key="0" label="待确认" :value="1"> </el-option>
+          <el-option :key="1" label="已确认" :value="2"> </el-option>
         </el-select>
       </div>
     </div>
@@ -70,6 +75,7 @@
           TeacherId: 0,
           ClassRoomId: 0,
           ClassType: 0,
+          AppointState:0,
         }
       };
     },

src/pages/course/questionlist.vue

@@ -26,7 +26,7 @@
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
-        <template v-slot:top="props">
+        <template v-slot:top>
           <div class="col-2 q-table__title">题库列表</div>
           <q-space />
           <div class="page-option">
@@ -154,7 +154,9 @@
       },
       //获取题库分页列表
       getQuestionBankPage() {
+        this.loading=true;
         queryQuestionBankPage(this.msg).then(res => {
+          this.loading=false;
           if (res.Code == 1) {
             this.data = res.Data.PageData;
             this.pageCount = res.Data.PageCount;

src/pages/financial/market/empBonusDetail.vue

@@ -25,6 +25,7 @@
                   <el-table-column prop="OrderGuestNum" label="订单人数"></el-table-column>
                   <el-table-column prop="OrderMoney" label="订单金额"> </el-table-column>
                   <el-table-column prop="OrderStateName" label="订单状态"> </el-table-column>
+                  <el-table-column prop="Remarks" label="备注"> </el-table-column>
                 </el-table>
               </div>
               <el-button slot="reference" type="success" plain size="mini">{{scope.row.CurRewardMoney}}</el-button>

src/pages/sale/activeOrderStatistics.vue

@@ -104,7 +104,7 @@
     </div>
     <div class="page-content">
        <activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
-        ref="orderL">
+        ref="orderL" :loading="loading">
       </activeOrder>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"

src/pages/sale/auditionList.vue

@@ -10,8 +10,8 @@
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
           <div class="col-4 Sysuser_Date">
-            <q-field filled>
-               <template v-slot:control>
+            <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>至
@@ -32,14 +32,14 @@
             class="col-6 q-pb-lg" emit-value map-options />
         </div>
         <div class="col-3">
-            <q-input @input="resetSearch" clearable filled v-model="msg.LessonName"
-            label="试听课程名称" @clear="resetSearch" maxlength="20" />
+          <q-input @input="resetSearch" clearable filled v-model="msg.LessonName" label="试听课程名称" @clear="resetSearch"
+            maxlength="20" />
         </div>
       </div>
     </div>
     <reservelist :data="dataList" :authObj="authObj" :loading="loading" @success="refreshPage"></reservelist>
-    <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount"
-      :input="true" @input="changePage" />
+    <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" :input="true"
+      @input="changePage" />
   </div>
 </template>
 
@@ -71,16 +71,15 @@
           EndClassDate: "", //结束时间
           TeacherId: "", //教师编号
           ClassRoomId: "", //教室编号
-          LessonName:'' //课程名称
+          LessonName: '' //课程名称
         },
         dataList: [],
         loading: false,
         PageCount: 0,
-        
         TeacherList: [],
         ClassRoomList: [],
-        authObj:{
-            isShowEdit:false
+        authObj: {
+          isShowEdit: false
         }
       }
     },
@@ -107,7 +106,9 @@
       },
       //获取课程系列分页列表
       getList() {
+        this.loading=true;
         GetReserveClassPage(this.msg).then(res => {
+          this.loading=false;
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;

src/pages/sale/b2bAllCustomer.vue

@@ -28,7 +28,7 @@
             <q-input @input="resetSearch" filled clearable v-model="msg.CustomerName" label="联系人" maxlength="20" />
           </div>
           <div class="col-3">
-            <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同业名称" maxlength="20" />
+            <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同行名称" maxlength="20" />
           </div>
           <div class="col-3">
             <q-input @input="resetSearch" filled clearable v-model="msg.ContactNumber" label="电话" maxlength="20" />
@@ -40,7 +40,7 @@
         </div>
       </div>
       <div class="page-content">
-        <b2bcustomlist :dataList="dataList" :authObj="authObj" :loading="loading" @success="getList"
+        <b2bcustomlist :dataList="dataList" :authObj="authObj" :loading="loading" @success="getList" :queryMsg="msg"
           :visibleColumns="visibleColumns" sticky="sticky-tow-column-table sticky-right-column-table"></b2bcustomlist>
         <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
           :input="true" @input="changePage" />
@@ -109,7 +109,7 @@
           "QQ",
           "WeChatNo",
         ],
-        tabCheck: 2,
+        tabCheck: 1,
         //审核状态列表
         ApproveStateList: [
           {
@@ -126,7 +126,8 @@
         authObj: {
           isShowEdit: true, //显示新增、修改、删除
           isShowBankBook: true, //显示幸福存折
-          isShowRebate: true //是否显示返佣
+          isShowRebate: true, //是否显示返佣,
+          isShowDownload:true,//显示下载按钮
         },
         categoryMsg: {
           pageIndex: 1,

src/pages/sale/b2bcustomer.vue

@@ -28,7 +28,7 @@
               <q-input @input="resetSearch" filled clearable v-model="msg.CustomerName" label="联系人" maxlength="20" />
             </div>
             <div class="col-3">
-              <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同业名称" maxlength="20" />
+              <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同行名称" maxlength="20" />
             </div>
             <div class="col-3">
               <q-input @input="resetSearch" filled clearable v-model="msg.ContactNumber" label="电话" maxlength="20" />

src/pages/sale/b2bcustomerapprove.vue

@@ -77,8 +77,7 @@
           "WeChatNo",
         ],
         //审核状态列表
-        ApproveStateList: [
-          {
+        ApproveStateList: [{
             label: "待审核",
             value: "3"
           },
@@ -118,6 +117,7 @@
       },
       //获取分页数据
       getList() {
+        this.loading = true;
         GetCustomerPage(this.msg)
           .then(res => {
             this.dataList = res.Data.PageData;

src/pages/sale/myActiveOrder.vue

@@ -23,20 +23,18 @@
             v-model="msg.EnrollState" :options="EnrollStateOpt" emit-value map-options label="报名状态" />
         </div>
         <div class="col-3">
-          <q-field filled>
-             <template v-slot:control>
+          <q-field filled>
+            <template v-slot:control>
               <el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间">
-                 </el-date-picker>       
+                 range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间" />
             </template>
           </q-field>
         </div>
         <div class="col-3">
-          <q-field filled>
-             <template v-slot:control>
+          <q-field filled>
+            <template v-slot:control>
               <el-date-picker v-model="dateList2" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="活动开始时间"  end-placeholder="活动结束时间">
-                 </el-date-picker>       
+                 range-separator="至"  start-placeholder="活动开始时间"  end-placeholder="活动结束时间" />
             </template>
           </q-field>
         </div>
@@ -63,14 +61,6 @@
         <span class="stics-name">取消人数</span>
         <span>{{data.Statistics.CancelNum}}人</span>
       </div>
-      <!-- <div class="col stics">
-        <span class="stics-name">提成金额</span>
-        <span>{{data.Statistics.CommissionMoney}}</span>
-      </div>
-      <div class="col stics">
-        <span class="stics-name">额外奖励</span>
-        <span>{{data.Statistics.ExtraRewardMoney}}</span>
-      </div> -->
     </div>
     <div class="row col" style="justify-content: flex-end">
       <div class="row tis">
@@ -92,7 +82,7 @@
     </div>
     <div class="page-content">
       <activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
-        ref="orderL">
+        ref="orderL" :loading="loading">
       </activeOrder>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
@@ -104,14 +94,12 @@
   </div>
 </template>
 <script>
-//   import myOrderForm from '../../components/sale/myOrder-form'
   import activeOrder from '../../components/sale/activeOrder-item'
   export default {
     meta: {
       title: "我的活动订单"
     },
     components: {
-    //   myOrderForm,
       activeOrder
     },
     data() {
@@ -162,8 +150,8 @@
       }
     },
     created() {
-     let data= JSON.parse(localStorage.getItem("loginUserInfo")).data
-    this.msg.EduUserId=data.Id
+      let data = JSON.parse(localStorage.getItem("loginUserInfo")).data
+      this.msg.EduUserId = data.Id
     },
     mounted() {
       this.getList();
@@ -227,7 +215,6 @@
       },
     }
   }
-
 </script>
 <style>
   li {
@@ -286,5 +273,4 @@
     font-weight: 600;
     margin-right: 20px
   }
-
 </style>
\ No newline at end of file

src/pages/sale/myOrder.vue

@@ -105,7 +105,7 @@
     </div>
     <div class="page-content">
       <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
-        ref="orderL">
+        ref="orderL" :loading="loading">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"

src/pages/sale/orderStatistics.vue

@@ -141,7 +141,7 @@
     </div>
     <div class="page-content">
       <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3"
-        ref="orderL">
+        ref="orderL" :loading="loading">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"

src/pages/sale/reserveClass.vue

@@ -107,7 +107,9 @@
       },
       //获取课程系列分页列表
       getList() {
+        this.loading=true;
         GetReserveClassPage(this.msg).then(res => {
+          this.loading=false;
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;

src/pages/sale/studyOrder.vue

@@ -9,23 +9,24 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-          <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.OrderId" label="订单号"
-            @clear="resetSearch" maxlength="10" />
+          <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.OrderId"
+            label="订单号" @clear="resetSearch" maxlength="10" />
         </div>
         <div class="col-3">
-          <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.GuestName" label="客户名称"
-            @clear="resetSearch" maxlength="20" />
+          <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.GuestName"
+            label="客户名称" @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-select dense @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()" standout="bg-primary text-white" option-value="Id" option-label="Name"
-            v-model="msg.OrderState" :options="OrderStateList" emit-value map-options label="订单状态" />
+          <q-select dense @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()"
+            standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="msg.OrderState"
+            :options="OrderStateList" emit-value map-options label="订单状态" />
         </div>
         <div class="col-3">
-          <q-field filled dense>
-             <template v-slot:control>
-              <el-date-picker v-model="dateList" size="mini" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间">
-                 </el-date-picker>       
+          <q-field filled dense>
+            <template v-slot:control>
+              <el-date-picker v-model="dateList" size="mini"  @change="resetSearch()"  value-format="yyyy-MM-dd"
+                 type="daterange"  style="border:none;"  range-separator="至"  start-placeholder="报名开始时间"
+                 end-placeholder="报名结束时间" />
             </template>
           </q-field>
         </div>
@@ -80,7 +81,8 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List"  :authObj="authObj" :modityOrderType="1" @success="refreshClassOrder" ref="orderL">
+      <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="1" @success="refreshClassOrder" ref="orderL"
+        :loading="loading">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
@@ -260,7 +262,6 @@
       },
     }
   }
-
 </script>
 <style>
   li {
@@ -319,5 +320,4 @@
     font-weight: 600;
     margin-right: 20px
   }
-
 </style>
\ No newline at end of file

src/pages/sale/studyOrderStatistics.vue

@@ -90,7 +90,7 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="3" @success="refreshClassOrder" ref="orderL">
+      <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="3" @success="refreshClassOrder" ref="orderL" :loading="loading">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"

src/pages/school/student.vue

@@ -48,7 +48,7 @@
       </div>
     </div>
     <div class="page-content">
-      <stulist :dataList="data" @success="refreshPage" ref="stuList">
+      <stulist :dataList="data" @success="refreshPage" :loading="loading" ref="stuList" :authObj="AuthObj" :queryMsg="msg">
       </stulist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
@@ -109,7 +109,10 @@
         myEmployeeList: [],
         //客户阶段状态列表
         customState: [],
-        customTypeList: [] //客户类型
+        customTypeList: [], //客户类型
+        AuthObj:{
+          isShowDownload:true,
+        }
       }
     },
     computed: {

src/pages/stuMan/classPlan.vue

@@ -2,157 +2,85 @@
   <div class="page-body MainPlan xg">
     <div class="col row wrap q-col-gutter-md">
       <div class="col-2 flex">
-        <el-select
-          v-model="msg.TeacherId"
-          style="width: 100%"
-          placeholder="教师"
-          size="small"
-          @change="getPlanList()"
-        >
-          <el-option
-            v-for="item in TeacherList"
-            :key="item.TeacherName"
-            :label="item.TeacherName"
-            :value="item.TId"
-          >
+        <el-select v-model="msg.TeacherId" style="width: 100%" placeholder="教师" size="small" @change="getPlanList()">
+          <el-option v-for="item in TeacherList" :key="item.TeacherName" :label="item.TeacherName" :value="item.TId">
           </el-option>
-          <div
-            slot="prefix"
-            class="full-height flex items-center"
-            style="color: #000; padding-right: 10px"
-          >
+          <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
             教师:
           </div>
         </el-select>
       </div>
       <div class="col-2">
-        <el-select
-          v-model="msg.ClassRoomId"
-          style="width: 100%"
-          placeholder="教室"
-          size="small"
-          @change="getTypeWay()"
-        >
-          <el-option
-            v-for="item in ClassRoomList"
-            :key="item.RoomName"
-            :label="item.RoomName"
-            :value="item.RoomId"
-          >
+        <el-select v-model="msg.ClassRoomId" style="width: 100%" placeholder="教室" size="small" @change="getTypeWay()">
+          <el-option v-for="item in ClassRoomList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomId">
           </el-option>
-          <div
-            slot="prefix"
-            class="full-height flex items-center"
-            style="color: #000; padding-right: 10px"
-          >
+          <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
             教室:
           </div>
         </el-select>
       </div>
       <div class="col-2" style="width: 13%">
-        <el-date-picker
-          v-model="msg.StartTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="开始日期"
-          size="small"
-          style="width: 100%"
-          @change="getTypeWay()"
-          :picker-options="picker"
-          :clearable="false"
-        >
+        <el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="开始日期" size="small"
+          style="width: 100%" @change="getTypeWay()" :picker-options="picker" :clearable="false">
         </el-date-picker>
       </div>
       <div class="col-2" style="width: 13%">
-        <el-date-picker
-          v-model="msg.EndTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="结束日期"
-          size="small"
-          style="width: 100%"
-          @change="getTypeWay()"
-          clear-icon="iconfont icon-guanbi"
-          :picker-options="pickerEnd"
-        >
+        <el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="结束日期" size="small"
+          style="width: 100%" @change="getTypeWay()" clear-icon="iconfont icon-guanbi" :picker-options="pickerEnd">
         </el-date-picker>
       </div>
       <div class="col-1" style="width: 10%">
-        <el-select
-          v-model="msg.ClassType"
-          style="width: 100%"
-          placeholder="类型"
-          size="small"
-          @change="getTypeWay()"
-        >
+        <el-select v-model="msg.ClassType" style="width: 100%" placeholder="类型" size="small" @change="getTypeWay()">
           <el-option :key="0" label="全部" :value="0"> </el-option>
-          <el-option :key="1" label="正常" :value="1"> </el-option>
+          <el-option :key="1" label="跟班课" :value="1"> </el-option>
           <el-option :key="2" label="试听课" :value="2"> </el-option>
-          <div
-            slot="prefix"
-            class="full-height flex items-center"
-            style="color: #000; padding-right: 10px"
-          >
-            状态:
+          <el-option :key="2" label="预约课" :value="3"> </el-option>
+          <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
+            类型:
+          </div>
+        </el-select>
+      </div>
+      <div class="col-2 yuyuezhuangtai" style="width: 10%" v-if="msg.ClassType==3">
+        <el-select v-model="msg.AppointState" style="width: 100%;" placeholder="预约状态" size="small" @change="getTypeWay()">
+          <el-option :key="0" label="不限" :value="0"> </el-option>
+          <el-option :key="0" label="待确认" :value="1"> </el-option>
+          <el-option :key="1" label="已确认" :value="2"> </el-option>
+          <div slot="prefix" class="full-height flex items-center" style="color: #000;margin-right:61px; white-space:nowrap;">
+            预约状态:
           </div>
         </el-select>
       </div>
       <div class="col-3" style="width: 30%">
-        <q-btn
-          color="accent"
-          size="sm"
-          class="q-mr-md"
-          style="margin-top: 2px"
-          @click="exchangeType"
-          :label="typeName"
-        />
-        <q-btn
-          color="accent"
-          size="sm"
-          class="q-mr-md"
-          label="下载计划"
-          @click="downLoadPlan()"
-        />
-        <q-btn
-          color="negative"
-          size="sm"
-          label="调课申请"
-          @click="openForm"
-        ></q-btn>
+        <q-btn color="accent" size="sm" class="q-mr-md" style="margin-top: 2px" @click="exchangeType"
+          :label="typeName" />
+        <q-btn color="accent" size="sm" class="q-mr-md" label="下载计划" @click="downLoadPlan()" />
+        <q-btn color="negative" size="sm" label="调课申请" @click="openForm"></q-btn>
       </div>
     </div>
-    <classmateForm :dataList="dataList" v-if="commonType == 1"></classmateForm>
-    <change-class-form
-      v-if="persistent"
-      @close="closeSaveForm"
-      @success="refreshPage"
-    ></change-class-form>
-    <teachTable
-      v-if="commonType == 2"
-      :tableData="tableData"
-      :PageCount="PageCount"
-      :setMsg="tabMsg"
-      :showCZ="false"
-      @getChange="getChange"
-    ></teachTable>
+    <classmateForm :dataList="dataList" v-if="commonType == 1" :loading="loading"></classmateForm>
+    <change-class-form v-if="persistent" @close="closeSaveForm" @success="refreshPage"></change-class-form>
+    <teachTable v-if="commonType == 2" :tableData="tableData" :PageCount="PageCount" :setMsg="tabMsg" :showCZ="false"
+      @getChange="getChange" :loading="loading"></teachTable>
   </div>
 </template>
 
 <script>
-import {
+  import {
     getTeacherDropDownList,
     queryClassRoomList,
-} from "../../api/school/index";
-import {
+  } from "../../api/school/index";
+  import {
     GetClassPlanStatistical,
     GetClassPlanStatisticalPage,
-} from "../../api/teacher/index";
-import { EduDownLoad } from "../../api/common/common";
-import classmateForm from "../../components/course/classmate-form";
-import teachTable from "../teacher/components/teachTable";
-import changeClassForm from "../../components/teacher/changeClassForm.vue";
+  } from "../../api/teacher/index";
+  import {
+    EduDownLoad
+  } from "../../api/common/common";
+  import classmateForm from "../../components/course/classmate-form";
+  import teachTable from "../teacher/components/teachTable";
+  import changeClassForm from "../../components/teacher/changeClassForm.vue";
 
-export default {
+  export default {
     meta: {
       title: "教师课表",
     },
@@ -178,6 +106,7 @@ export default {
           TeacherId: 0,
           ClassRoomId: 0,
           ClassType: 0,
+          AppointState:0,
         },
         commonType: 1, //1日历模式 2列表模式
         typeName: "列表模式",
@@ -213,6 +142,7 @@ export default {
             }
           },
         },
+        loading:false,
       };
     },
     created() {
@@ -223,9 +153,9 @@ export default {
       let today =
         date.getFullYear() +
         "-" +
-      (date.getMonth() < 9
-        ? "0" + (date.getMonth() + 1)
-        : date.getMonth() + 1) +
+        (date.getMonth() < 9 ?
+          "0" + (date.getMonth() + 1) :
+          date.getMonth() + 1) +
         "-" +
         (date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
       this.msg.StartTime = today;
@@ -301,7 +231,9 @@ export default {
         this.tabMsg.EndTime = this.msg.EndTime;
         this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
         this.tabMsg.ClassType = this.msg.ClassType;
+        this.loading=true;
         GetClassPlanStatisticalPage(this.tabMsg).then((res) => {
+          this.loading=false;
           if (res.Code == 1) {
             this.tableData = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
@@ -320,10 +252,13 @@ export default {
         }
       },
     },
-};
+  };
 </script>
 <style lang="scss">
-.xg .el-input--prefix .el-input__inner {
+  .xg .el-input--prefix .el-input__inner {
     padding-left: 50px;
-}
+  }
+  .yuyuezhuangtai .el-input--prefix .el-input__inner {
+    padding-left: 60px;
+  }
 </style>
\ No newline at end of file

src/pages/stuMan/classRecord.vue

@@ -45,7 +45,7 @@
       </div>
     </div>
     <teachTable v-if="commonType == 2" :tableData="tableData" :PageCount="PageCount" :setMsg="tabMsg" :showCZ="true"
-      @getChange="getChange"></teachTable>
+      @getChange="getChange" :loading="loading"></teachTable>
   </div>
 </template>
 
@@ -80,6 +80,7 @@
         TeacherId: 0,
         ClassRoomId: 0,
         dataList: {},
+        loading:false,
         msg: {
           StartTime: "",
           EndTime: "",
@@ -211,7 +212,9 @@
         this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
         this.tabMsg.ClassType = this.msg.ClassType;
         this.tabMsg.TeacherId=this.msg.TeacherId;
+        this.loading=true;
         GetClassPlanStatisticalPage(this.tabMsg).then((res) => {
+          this.loading=false;
           if (res.Code == 1) {
             this.tableData = res.Data.PageData;
             this.PageCount = res.Data.PageCount;

src/pages/system/siteconfig.vue

@@ -2,7 +2,6 @@
   .site_ListDiv {
     margin-bottom: 10px;
   }
-
 </style>
 <template>
   <div class="page-body">
@@ -102,7 +101,6 @@
           }
         ],
         data: [],
-        // loading: true,
         loading: false,
         msg: {
           pageIndex: 1,
@@ -116,12 +114,14 @@
     },
     methods: {
       getList() {
+        this.loading = true;
         getSiteConfig(this.msg).then(res => {
+          this.loading = false;
           if (res.Code == 1) {
             this.data = res.Data;
           }
         }).catch(() => {
-
+          this.loading = false;
         })
       },
       //新增站点
@@ -160,9 +160,7 @@
       },
     }
   }
-
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-
 </style>
\ No newline at end of file

src/pages/teacher/components/teachTable.vue

 <template>
   <div style="padding: 20px 0">
     <div class="page-content">
-      <q-table
-        :pagination="setMsg"
-        no-data-label="暂无相关数据"
-        flat
-        class="sticky-column-table sticky-right-column-table"
-        separator="none"
-        :data="tableData"
-        :columns="showCZ ? columns : columns2"
-        row-key="name"
-      >
+      <q-table :pagination="setMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
+        separator="none" :data="tableData" :columns="showCZ ? columns : columns2" row-key="name">
         <template v-slot:body-cell-GuestList="props">
           <q-td auto-width :props="props">
-            <span
-              v-for="(item, index) in props.row.GuestList"
-              style="margin-right: 5px"
-            >
+            <span v-for="(item, index) in props.row.GuestList" style="margin-right: 5px" :key="index">
               {{ item.GuestName }}
             </span>
           </q-td>
@@ -31,44 +20,22 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td>
-            <q-btn
-              flat
-              size="xs"
-              icon="iconfont icon-view"
-              v-if="props.row.ClassType == 1"
-              color="accent"
-              style="font-weight: 400"
-              label="课程回顾"
-              @click="goCourseRecord(props.row)"
-            />
-            <q-btn
-              flat
-              size="xs"
-              icon="iconfont icon-view"
-              v-if="props.row.ClassType == 1"
-              color="accent"
-              style="font-weight: 400"
-              label="课程反馈"
-              @click="goFeedBack(props.row)"
-            />
+            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
+              style="font-weight: 400" label="课程回顾" @click="goCourseRecord(props.row)" />
+            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
+              style="font-weight: 400" label="课程反馈" @click="goFeedBack(props.row)" />
           </q-td>
         </template>
         <template v-slot:bottom>
-          <q-pagination
-            class="full-width justify-end"
-            v-model="PageIndex"
-            color="primary"
-            :max="PageCount"
-            :input="true"
-            @input="changePage"
-          />
+          <q-pagination class="full-width justify-end" v-model="PageIndex" color="primary" :max="PageCount"
+            :input="true" @input="changePage" />
         </template>
       </q-table>
     </div>
   </div>
 </template>
 <script>
-export default {
+  export default {
     props: {
       setMsg: {
         type: Object,
@@ -87,6 +54,10 @@ export default {
         Type: Boolean,
         default: true,
       },
+      loading:{
+        type:Boolean,
+        default:false,
+      }
     },
     meta: {
       title: "我的课表",
@@ -94,8 +65,7 @@ export default {
     components: {},
     data() {
       return {
-      columns: [
-        {
+        columns: [{
             name: "ClassDate",
             label: "日期",
             field: "ClassDate",
@@ -143,8 +113,7 @@ export default {
             field: "Id",
           },
         ],
-      columns2: [
-        {
+        columns2: [{
             name: "ClassDate",
             label: "日期",
             field: "ClassDate",
@@ -221,8 +190,8 @@ export default {
         });
       },
     },
-};
+  };
 </script>
 <style lang="sass">
-@import url('~assets/css/table.sass')
+  @import url('~assets/css/table.sass')
 </style>
\ No newline at end of file