页面修改

src/components/todolist/index.vue

@@ -193,7 +193,6 @@ export default {
   },
   mounted() {
     this.currentMenu = this.menulist[0].id.toString();
-    //console.log(this.todoTipList);
   },
   methods: {}
 };

src/components/todolist/payee.vue

 <template>
   <div class="full-height">
     <div class="row items-center">
-      <q-avatar
-        size="40px"
-        font-size="20px"
-        color="primary"
-        class="q-mr-md"
-        text-color="white"
-        rounded
-        :icon="`iconfont ${node.icon}`"
-      />
+      <q-avatar size="40px" font-size="20px" color="primary" class="q-mr-md" text-color="white" rounded
+        :icon="`iconfont ${node.icon}`" />
       <div class="pingfang text-subtitle1">{{ node.name }}</div>
     </div>
     <div class="q-my-md row">
-      <q-input
-        standout
-        v-model="msg.KeyWords"
-        dense
-        type="text"
-        style="width:250px;"
-        label="关键字（名称/微信/手机号）"
-        class="q-mr-md"
-      />
-      <q-btn
-        color="primary"
-        class="q-px-md"
-        label="查询"
-        unelevated
-        dense
-        @click="searchKeyHandler"
-      />
+      <q-input standout v-model="msg.KeyWords" dense type="text" style="width:250px;" label="关键字（名称/微信/手机号）"
+        class="q-mr-md" />
+      <q-btn color="primary" class="q-px-md" label="查询" unelevated dense @click="searchKeyHandler" />
       <div class="col text-right text-grey-6 f12">
         TIPS：创建订单后，请及时完成订单款项的入账动作，收款单据点击“修改-选择学员-制单”完成此项任务。
       </div>
     </div>
     <div style="height:calc(100% - 158px);overflow-y:auto;">
-      <orderlist
-        :dataList="stus"
-        @success="refreshPage"
-        :loading="loading"
-        :authObj="authObj"
-      ></orderlist>
+      <orderlist :dataList="stus" @success="refreshPage" :loading="loading" :authObj="authObj"></orderlist>
     </div>
     <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"
-        color="primary"
-        :input="true"
-      >
+      <q-pagination v-model="msg.PageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
+        color="primary" :input="true">
       </q-pagination>
     </div>
   </div>
 </template>
 
 <script>
-import orderlist from "../sale/orderlist.vue";
-import { getMyOrderNotBalance } from "../../api/stuMan/index";
-export default {
-  components: { orderlist },
-  props: ["node"],
-  data() {
-    return {
-      stus: [],
-      loading: false,
-      isJudgeTrans: 1,
-      pageCount: 0,
-      msg: {
-        PageIndex: 1,
-        pageSize: 10,
-        KeyWords: ""
-      },
-      //权限判断
-      authObj: {
-        isShowGuestBtn: 1, //显示新增学员名单按钮
-        isShowFinanceBtn: true, //显示财务单据按钮
-        isShowTransOrder: true, //显示转交订单按钮
-        isShowSaleRemark: true, //显示修改销售备注
-        isShowBackClass: true, //显示退课按钮
-        isShowRenewClass: true, //显示续课按钮
-        isShowTransClassOrder: true, //现在转班按钮
-        isShowSeparater: true //显示分拆按钮
-      }
-    };
-  },
-  mounted() {
-    this.getStudent();
-  },
-  methods: {
-    getStudent() {
-      if (this.loading) return;
-      this.loading = true;
-      getMyOrderNotBalance(this.msg)
-        .then(r => {
-          this.stus = r.Data.PageData;
-          this.pageCount = r.Data.PageCount;
-          console.log(this.stus);
-          setTimeout(() => {
-            this.loading = false;
-          }, 1000);
-        })
-        .catch(e => {
-          this.loading = false;
-        });
+  import orderlist from "../sale/orderlist.vue";
+  import {
+    getMyOrderNotBalance
+  } from "../../api/stuMan/index";
+  export default {
+    components: {
+      orderlist
     },
-    refreshPage() {
-      this.getStudent();
-      this.$root.$emit("updateTodoList");
+    props: ["node"],
+    data() {
+      return {
+        stus: [],
+        loading: false,
+        isJudgeTrans: 1,
+        pageCount: 0,
+        msg: {
+          PageIndex: 1,
+          pageSize: 10,
+          KeyWords: ""
+        },
+        //权限判断
+        authObj: {
+          isShowGuestBtn: 1, //显示新增学员名单按钮
+          isShowFinanceBtn: true, //显示财务单据按钮
+          isShowTransOrder: true, //显示转交订单按钮
+          isShowSaleRemark: true, //显示修改销售备注
+          isShowBackClass: true, //显示退课按钮
+          isShowRenewClass: true, //显示续课按钮
+          isShowTransClassOrder: true, //现在转班按钮
+          isShowSeparater: true //显示分拆按钮
+        }
+      };
     },
-    changePage() {
+    mounted() {
       this.getStudent();
     },
-    searchKeyHandler() {
-      this.msg.PageIndex = 1;
-      this.getStudent();
+    methods: {
+      getStudent() {
+        if (this.loading) return;
+        this.loading = true;
+        getMyOrderNotBalance(this.msg)
+          .then(r => {
+            this.stus = r.Data.PageData;
+            this.pageCount = r.Data.PageCount;
+            setTimeout(() => {
+              this.loading = false;
+            }, 1000);
+          })
+          .catch(e => {
+            this.loading = false;
+          });
+      },
+      refreshPage() {
+        this.getStudent();
+        this.$root.$emit("updateTodoList");
+      },
+      changePage() {
+        this.getStudent();
+      },
+      searchKeyHandler() {
+        this.msg.PageIndex = 1;
+        this.getStudent();
+      }
     }
-  }
-};
+  };
 </script>
-
-<style></style>
+<style>
+</style>
\ No newline at end of file

src/pages/Work.vue

@@ -225,7 +225,6 @@ export default {
   methods: {
     initTodoList() {
       getTodayStatic().then(r => {
-        console.log(r);
         let d = r.Data;
         this.todoList.result = d;
         let tempCount = 0;

src/pages/stuMan/classPlan.vue

@@ -34,7 +34,7 @@
           <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-option :key="3" label="预约课" :value="3"> </el-option>
           <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
             类型:
           </div>

src/pages/stuMan/classRecord.vue

@@ -2,8 +2,7 @@
   <div class="page-body MainPlan xg">
     <div class="col row wrap q-col-gutter-md">
       <div class="col-2">
-        <el-select v-model="msg.TeacherId" style="width: 100%" placeholder="教师" size="small"
-          @change="getTypeWay()">
+        <el-select v-model="msg.TeacherId" style="width: 100%" placeholder="教师" size="small" @change="getTypeWay()">
           <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">
@@ -36,13 +35,18 @@
           <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-option :key="3" 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">
+        <el-input v-model="msg.StuName" style="width: 100%" placeholder="学员姓名" size="small" @input="getTypeWay()" clearable>
+          <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
+            学员:
+          </div>
+        </el-input>
       </div>
     </div>
     <teachTable v-if="commonType == 2" :tableData="tableData" :PageCount="PageCount" :setMsg="tabMsg" :showCZ="true"
@@ -54,11 +58,13 @@
   import {
     getTeacherDropDownList,
     queryClassRoomList,
+    getStudentDorpDownList,
   } from "../../api/school/index";
   import {
     GetClassPlanStatistical,
     GetClassPlanStatisticalPage,
   } from "../../api/teacher/index";
+
   import classmateForm from "../../components/course/classmate-form";
   import teachTable from "../teacher/components/teachTable";
   import changeClassForm from "../../components/teacher/changeClassForm.vue";
@@ -81,13 +87,15 @@
         TeacherId: 0,
         ClassRoomId: 0,
         dataList: {},
-        loading:false,
+        loading: false,
         msg: {
           StartTime: "",
           EndTime: "",
           TeacherId: 0,
           ClassRoomId: 0,
           ClassType: 0,
+          Student_Id: "",
+          StuName: "",
         },
         commonType: 2, //1日历模式 2列表模式
         typeName: "列表模式",
@@ -101,6 +109,7 @@
           ClassRoomId: 0,
           ClassType: 0,
           OrderBy: 1,
+          StuName:"",
         },
         tableData: [], //表格数据
         PageCount: 0,
@@ -121,6 +130,7 @@
           },
         },
         today: "",
+        StuList: [], //学员列表
       };
     },
     created() {
@@ -148,6 +158,13 @@
       this.getTableList();
     },
     methods: {
+      queryStuList() {
+        getStudentDorpDownList({}).then(res => {
+          if (res.Code == 1) {
+            this.StuList = res.Data;
+          }
+        });
+      },
       refreshPage() {
         this.getPlanList();
       },
@@ -212,10 +229,11 @@
         this.tabMsg.EndTime = this.msg.EndTime;
         this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
         this.tabMsg.ClassType = this.msg.ClassType;
-        this.tabMsg.TeacherId=this.msg.TeacherId;
-        this.loading=true;
+        this.tabMsg.TeacherId = this.msg.TeacherId;
+        this.tabMsg.StuName=this.msg.StuName;
+        this.loading = true;
         GetClassPlanStatisticalPage(this.tabMsg).then((res) => {
-          this.loading=false;
+          this.loading = false;
           if (res.Code == 1) {
             this.tableData = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
@@ -235,11 +253,9 @@
       },
     },
   };
-
 </script>
 <style lang="scss">
   .xg .el-input--prefix .el-input__inner {
     padding-left: 50px;
   }
-
-</style>
+</style>
\ No newline at end of file

src/pages/teacher/assessmentType.vue

@@ -38,7 +38,8 @@
                 </q-td>
                 <template v-for="(subItem,subIndex) in props.row.SubtypeList[cIndex].OptionList">
                   <q-td :key="subIndex+200000" class="assessmentType_td">
-                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green" v-if="subItem.LevelScore>0">
+                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green"
+                        v-if="subItem.LevelScore>0">
                         {{subItem.LevelScore}}分
                       </q-badge>
                     </div>
@@ -60,7 +61,8 @@
                 </q-td>
                 <template v-for="(subItem,subIndex) in props.row.SubtypeList[cIndex].OptionList">
                   <q-td :key="subIndex+400000" class="assessmentType_td">
-                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green" v-if="subItem.LevelScore>0">
+                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green"
+                        v-if="subItem.LevelScore>0">
                         {{subItem.LevelScore}}分
                       </q-badge>
                     </div>
@@ -113,7 +115,6 @@
         this.columns = [];
         queryAssessmentTypeList(this.msg).then(res => {
           this.loading = false;
-          console.log("res", res);
           if (res.Code == 1) {
             this.dataList = res.Data.result;
             this.columns = res.Data.header;