页面修改

src/pages/sale/myOrder.vue

@@ -14,8 +14,8 @@
         </div>
         <div class="col-3">
           <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.CourseSubject"
-            :options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目"
-            clearable />
+            :options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options
+            label="所属科目" clearable />
         </div>
         <div class="col-3">
           <q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.GuestName" label="客户名称"
@@ -35,20 +35,18 @@
             :options="OrderStateList" 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>
@@ -299,7 +297,6 @@
       },
     }
   }
-
 </script>
 <style>
   li {
@@ -358,5 +355,4 @@
     font-weight: 600;
     margin-right: 20px
   }
-
 </style>
\ No newline at end of file

src/pages/sale/mystu.vue

@@ -8,6 +8,18 @@
         <div class="col-3">
           <q-input @input="resetSearch" clearable filled v-model="msg.StuTel" label="电话" maxlength="20" />
         </div>
+        <div class="col-3">
+          <q-select @input="resetSearch" filled v-model="msg.StuStage" :options="customState" option-label="Name"
+            option-value="Id" emit-value map-options label="客户状态" clearable />
+        </div>
+        <div class="col-3">
+          <q-field filled>
+             <template v-slot:control>
+              <el-date-picker v-model="dateArray" @change="resetSearch" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
+                 range-separator="至"  start-placeholder="开始时间"  end-placeholder="结束时间" />    
+            </template>
+          </q-field>
+        </div>
       </div>
       <div class="page-option">
         <q-btn color="accent" class="q-mr-md" icon="add" label="新增客户" @click="EditStudent(null)" />
@@ -29,7 +41,8 @@
     getStudentPage,
     getSchoolDropdown,
     deleteStudent,
-    createStudentAccount
+    createStudentAccount,
+    queryStuStageList
   } from '../../api/school/index'
   import {
     queryEmployee
@@ -60,38 +73,31 @@
           Status: "-1",
           CreateBy: "",
           IsQueryMyStu: 1,
+          StuStage: "", //客户阶段
+          StartTime: "", //开始时间
+          EndTime: "", //结束时间
         },
+        dateArray: [], //日期数组
         pageCount: 0,
-        employeeList: [],
-        myEmployeeList: [],
+        //客户阶段状态列表
+        customState: [],
       }
     },
     created() {
-      this.getEmployeeList();
-      this.getSchool()
+      this.getSchool();
+      this.getStuStageList();
     },
     mounted() {
       this.currentUrl = this.$route.path
       this.getStudent()
     },
     methods: {
-      //获取员工列表
-      getEmployeeList() {
-        queryEmployee({
-          IsLeave: 1
-        }).then(res => {
-          this.employeeList = res.Data;
-          this.myEmployeeList = res.Data;
+      //获取客户阶段列表
+      getStuStageList() {
+        queryStuStageList().then(res => {
+          this.customState = res.Data;
         })
       },
-      //筛选员工
-      filterEmployee(val, update, abort) {
-        update(() => {
-          this.myEmployeeList = this.employeeList.filter(
-            v => v.EmployeeName.indexOf(val) > -1
-          );
-        });
-      },
       resetSearch() {
         this.msg.pageIndex = 1;
         this.getStudent()

src/pages/school/student.vue

@@ -9,8 +9,21 @@
           <q-input @input="resetSearch" clearable filled v-model="msg.StuTel" label="电话" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-select filled v-model="msg.CreateBy" @filter="filterEmployee" use-input :options="myEmployeeList"
-            option-label="EmployeeName" option-value="Id" emit-value map-options label="负责人" />
+          <q-select @input="resetSearch" filled v-model="msg.CreateBy" @filter="filterEmployee" use-input
+            :options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options label="负责人"
+            clearable />
+        </div>
+        <div class="col-3">
+          <q-select @input="resetSearch" filled v-model="msg.StuStage" :options="customState" option-label="Name"
+            option-value="Id" emit-value map-options label="客户状态" clearable />
+        </div>
+        <div class="col-3">
+          <q-field filled>
+             <template v-slot:control>
+              <el-date-picker v-model="dateArray" @change="resetSearch" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
+                 range-separator="至"  start-placeholder="开始时间"  end-placeholder="结束时间" />    
+            </template>
+          </q-field>
         </div>
       </div>
       <div class="page-option">
@@ -33,8 +46,10 @@
     getStudentPage,
     getSchoolDropdown,
     deleteStudent,
-    createStudentAccount
+    createStudentAccount,
+    queryStuStageList
   } from '../../api/school/index'
+
   import {
     queryEmployee
   } from '../../api/users/user'
@@ -42,7 +57,6 @@
     resetPassword
   } from '../../api/users/user.js'
   import stulist from '../../components/school/student/stulist'
-
   export default {
     meta: {
       title: "客户管理"
@@ -59,24 +73,36 @@
           pageIndex: 1,
           pageSize: 12,
           rowsPerPage: 12,
-          StuName: "",
-          StuTel: "",
-          Status: "-1",
-          CreateBy: ""
+          StuName: "", //昵称
+          StuTel: "", //电话
+          CreateBy: "", //负责人
+          StuStage: "", //客户阶段
+          StartTime: "", //开始时间
+          EndTime: "", //结束时间
         },
+        dateArray: [], //日期数组
         pageCount: 0,
         employeeList: [],
         myEmployeeList: [],
+        //客户阶段状态列表
+        customState: [],
       }
     },
     created() {
       this.getEmployeeList();
+      this.getStuStageList();
     },
     mounted() {
       this.currentUrl = this.$route.path
       this.getStudent()
     },
     methods: {
+      //获取客户阶段列表
+      getStuStageList() {
+        queryStuStageList().then(res => {
+          this.customState = res.Data;
+        })
+      },
       //获取员工列表
       getEmployeeList() {
         queryEmployee({
@@ -108,6 +134,13 @@
         this.getStudent();
       },
       getStudent() {
+        if (this.dateArray && this.dateArray.length > 0) {
+          this.msg.StartTime = this.dateArray[0];
+          this.msg.EndTime = this.dateArray[1];
+        } else {
+          this.msg.StartTime = '';
+          this.msg.EndTime = '';
+        }
         this.loading = true;
         getStudentPage(this.msg).then(res => {
           this.loading = false;