页面修改

src/components/schedul/exorder-form.vue

@@ -21,7 +21,7 @@
         </div>
       </div>
       <div style="padding:20px 15px;">
-        <q-input filled stack-label maxlength="100" :dense="false" @keyup.native="checkInteger(OrderMsg,'GuestNum')"
+        <q-input filled stack-label maxlength="100" :disable="true" :dense="false" @keyup.native="checkInteger(OrderMsg,'GuestNum')"
           v-model="OrderMsg.GuestNum" @input="changePrice(),countPrice()" class="col-12" label="人数"
           :rules="[val => !!val || '请填写人数']" />
 
@@ -88,7 +88,7 @@
     queryEmployee
   } from '../../api/users/user'; //获取员工
   import {
-    getClassPage_ck
+    getClassDropDownList
   } from '../../api/school/index';//获取校区列表
 
   import {
@@ -174,10 +174,12 @@
           }
         });
       },
-
       //获取班级列表
       getClass() {
-        getClassPage_ck({}).then(res => {
+        getClassDropDownList({
+          IsAddDefault:0,
+          IsQuerySurplus:1
+        }).then(res => {
           if (res.Code == 1) {
            let tempArray = res.Data;
              if (!tempArray) {
@@ -191,7 +193,6 @@
           }
         })
       },
-
       //选择课程切换价格
       changePrice() {
         let temp = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);

src/pages/sale/appointManagement.vue

@@ -44,8 +44,9 @@
       </div>
     </div>
 
-    <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
-      separator="none" :data="dataList" :columns="columns" row-key="name">
+    <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+      class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
+      row-key="name">
       <template v-slot:top="props">
         <div class="col-2 q-table__title">约课管理</div>
         <q-space />
@@ -54,7 +55,8 @@
       <template v-slot:body-cell-OrderId="props">
         <q-td :props="props">
           <template v-if="props.row.OrderId && props.row.OrderId>0">
-            <span style="color:blue;cursor:pointer" @click="goOrderStatistics(props.row.OrderId)">{{props.row.OrderId}}</span>
+            <span style="color:blue;cursor:pointer"
+              @click="goOrderStatistics(props.row.OrderId)">{{props.row.OrderId}}</span>
           </template>
         </q-td>
       </template>
@@ -74,7 +76,7 @@
             <span style="color:green;cursor:pointer;"> {{props.row.ReserveStatusStr}}</span>
           </template>
           <template v-if="props.row.ReserveStatus==2">
-              <span style="color:#ff00ff;cursor:pointer;"> {{props.row.ReserveStatusStr}}</span>
+            <span style="color:#ff00ff;cursor:pointer;"> {{props.row.ReserveStatusStr}}</span>
               <q-tooltip :offset="[10, 10]">
                  {{props.row.Remark}}
                </q-tooltip>
@@ -91,8 +93,8 @@
         <q-td :props="props">
           <q-btn flat size="xs" @click="getDetail(props.row)" icon="iconfont icon-View" color="accent"
             style="font-weight:400" label="详情" />
-          <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400;" label="删除"
-              @click="deleteAppoint(props.row)" />
+          <q-btn flat size="xs" v-if="props.row.ReserveStatus!=1" icon="delete" color="negative" style="font-weight:400;" label="删除"
+            @click="deleteAppoint(props.row)" />
           <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"
             v-if="props.row.ReserveStatus==0">
             <q-list>
@@ -120,12 +122,12 @@
           :input="true" @input="changePage" />
       </template>
     </q-table>
-    <yuekeForm v-if="isShowYue" :ChoiceType="ChoiceType" :save-obj="visitorItem" @close="closeYuekeForm"
+    <yuekeForm v-if="isShowYue" :ChoiceType="ChoiceType" :save-obj="visitorItem" @close="closeVisitorForm"
       @success="refreshPage"></yuekeForm>
-    <exorderForm v-if="isShowExOrder" :save-obj="orderObj" @close="closeOrderForm" @success="refreshPage"></exorderForm>
-    <appodetailForm v-if="isShowDetail" :save-obj="orderObj" @close="closeAppForm"></appodetailForm>
-    <exorderForm v-if="isShowExOrder" :save-obj="visitorItem" @close="closeOrderForm" @success="refreshPage">
+    <exorderForm v-if="isShowExOrder" :save-obj="visitorItem" @close="closeVisitorForm" @success="refreshPage">
     </exorderForm>
+    <appodetailForm v-if="isShowDetail" :save-obj="visitorItem" @close="closeVisitorForm"></appodetailForm>
+
   </div>
 </template>
 
@@ -208,7 +210,6 @@
             field: 'ClassContent',
             align: 'left'
           },
-
           {
             name: 'ReserveStatusStr',
             label: '状态',
@@ -250,7 +251,7 @@
         ChoiceType: 0,
         visitorItem: {}, //选中的对象
         isShowExOrder: false,
-        orderObj: {},
+
         isShowDetail: false //显示详情
       }
     },
@@ -308,17 +309,17 @@
         this.visitorItem = item;
       },
       //关闭弹窗
-      closeYuekeForm() {
+      closeVisitorForm() {
         this.isShowYue = false;
-      },
-      closeOrderForm() {
         this.isShowExOrder = false;
-      },
-      closeAppForm() {
         this.isShowDetail = false;
       },
+
       //刷新页面
       refreshPage() {
+        this.isShowYue = false;
+        this.isShowExOrder = false;
+        this.isShowDetail = false;
         this.getList();
       },
       ExchangeOrder(item) {
@@ -327,17 +328,17 @@
       },
       //查看详情
       getDetail(item) {
-        this.orderObj = item;
+        this.visitorItem = item;
         this.isShowDetail = true;
       },
       //跳转到报名统计
-      goOrderStatistics(id){
+      goOrderStatistics(id) {
         this.OpenNewUrl("/sale/orderStatistics", {
           OrderId: id
         });
       },
       //删除约课管理
-      deleteAppoint(item){
+      deleteAppoint(item) {
         let delMsg = {
           Id: item.Id
         };