页面修改

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/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/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"
@@ -100,18 +90,16 @@
         </q-pagination>
       </div>
     </div>
-    
+
   </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();
@@ -199,16 +187,16 @@
           this.msg.EndTime = '';
         }
         let msg = JSON.parse(JSON.stringify(this.msg));
-         if (msg.Id == '' || msg.Id == null) {
+        if (msg.Id == '' || msg.Id == null) {
           msg.Id = 0
         }
         this.loading = true;
         this.apipostDS("/api/Education/GetConsultOrderStatisticsPage", msg, (res) => {
           this.loading = false
           if (res.data.resultCode === 1) {
-           
-              this.data = res.data.data.pageData;
-           
+
+            this.data = res.data.data.pageData;
+
             //   let OrderIds = []
             //   this.data.forEach(x => {
             //     OrderIds.push(x.Id)
@@ -217,7 +205,7 @@
             //   if (this.data.length > 0) {
             //     this.$refs.orderL.getOrderFinanceList(OrderIds, 1)
             //   }
-              this.pageCount = res.data.data.pageCount;
+            this.pageCount = res.data.data.pageCount;
           }
         })
       },
@@ -227,7 +215,6 @@
       },
     }
   }
-
 </script>
 <style>
   li {
@@ -286,5 +273,4 @@
     font-weight: 600;
     margin-right: 20px
   }
-
-</style>
+</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>
+</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"