页面修改

src/pages/sale/japaneseTrain.vue

@@ -24,7 +24,7 @@
         </div>
         <div class="col-3">
           <q-select @input="resetSearch" @filter="filterCourseFn" use-input filled option-value="CourseId"
-            option-label="CourseName" v-model="msg.CouseId" :options="myClassList" emit-value map-options label="学习课程"
+            option-label="CourseName" v-model="msg.CouseId" :options="myCourseList" emit-value map-options label="学习课程"
             clearable />
         </div>
         <div class="col-3">
@@ -356,7 +356,6 @@
         //关联校区列表
         schoolList: [],
         pageCount: 0,
-        ClassList: [], //关联课程下拉数据
         TeacherList: [], //关联教师下拉数据
         elvalue: new Date(),
         isShowEditOrderForm: false, //是否显示订单弹窗
@@ -368,7 +367,8 @@
         },
         isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
         CourseSubjectList: [], //科目列表
-        myClassList: []
+        CourseList: [], //关联课程下拉数据
+        myCourseList: []
       }
     },
     created() {
@@ -393,10 +393,10 @@
       this.getList();
     },
     methods: {
-      //班级筛选
+      //课程筛选
       filterCourseFn(val, update, abort) {
         update(() => {
-          this.myClassList = this.ClassList.filter(
+          this.myCourseList = this.CourseList.filter(
             v => v.CourseName.indexOf(val) > -1
           );
         });
@@ -450,8 +450,8 @@
       CourseList() {
         queryCourseDropdownList({}).then(res => {
           if (res.Code == 1) {
-            this.ClassList = res.Data;
-            this.myClassList = res.Data;
+            this.CourseList = res.Data;
+            this.myCourseList = res.Data;
           }
         })
       },

src/pages/sale/myOrder.vue

@@ -9,8 +9,8 @@
     <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-select @input="resetSearch" dense standout="bg-primary text-white" v-model="msg.CourseSubject"
@@ -18,16 +18,17 @@
             label="所属科目" clearable />
         </div>
         <div class="col-3">
-          <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.GuestName" label="客户名称"
-            @clear="resetSearch" maxlength="20" />
+          <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.GuestName"
+            label="客户名称" @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassName" label="班级名称"
-            @clear="resetSearch" maxlength="20" />
+          <q-input @change="resetSearch" dense clearable standout="bg-primary text-white" v-model="msg.ClassName"
+            label="班级名称" @clear="resetSearch" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" dense standout="bg-primary text-white" option-value="CourseId"
-            option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程" />
+          <q-select @input="resetSearch" use-input filled dense standout="bg-primary text-white" option-value="CourseId"
+            option-label="CourseName" @filter="filterCourseFn" v-model="msg.CouseId" :options="CourseList" emit-value
+            map-options label="学习课程" clearable />
         </div>
         <div class="col-3">
           <q-select dense @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()"
@@ -37,16 +38,18 @@
         <div class="col-3">
           <q-field filled dense>
              <template v-slot:control>
-              <el-date-picker v-model="dateList" @change="resetSearch()" size="mini" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间" />   
+              <el-date-picker v-model="dateList" @change="resetSearch()" size="mini"  value-format="yyyy-MM-dd"
+                 type="daterange"  style="border:none;"  range-separator="至"  start-placeholder="报名开始时间"
+                 end-placeholder="报名结束时间" />   
             </template>
           </q-field>
         </div>
         <div class="col-3">
           <q-field filled dense>
              <template v-slot:control>
-              <el-date-picker v-model="dateList2" @change="resetSearch()" size="mini" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="开班开始时间"  end-placeholder="开班结束时间" />  
+              <el-date-picker v-model="dateList2" @change="resetSearch()" size="mini"  value-format="yyyy-MM-dd"
+                 type="daterange"  style="border:none;"  range-separator="至"  start-placeholder="开班开始时间"
+                 end-placeholder="开班结束时间" />  
             </template>
           </q-field>
         </div>
@@ -149,7 +152,7 @@
           OrderId: '', //订单号
           GuestName: '', //客人名称
           ClassName: '', //班级名称
-          CouseId: 0, //课程id
+          CouseId: '', //课程id
           StartTime: '', //报名开始时间
           EndTime: '', //报名结束时间
           OPStartTime: '', //开班开始时间
@@ -165,6 +168,7 @@
         OrderStateList: [],
         pageCount: 0,
         CourseList: [], //关联课程下拉数据
+        AllCourseList: [], //所有课程列表
         classObjOption: null,
         isShowClassInfo: false, //是否显示课程信息
         showone: false,
@@ -194,6 +198,14 @@
       this.getList();
     },
     methods: {
+      //课程筛选
+      filterCourseFn(val, update, abort) {
+        update(() => {
+          this.CourseList = this.AllCourseList.filter(
+            v => v.CourseName.indexOf(val) > -1
+          );
+        });
+      },
       queryCourseSubject() {
         getCourseSubject({}).then(res => {
           if (res.Code == 1) {
@@ -221,15 +233,8 @@
       getCourseList() {
         queryCourseDropdownList({}).then(res => {
           if (res.Code == 1) {
-            var tempArray = res.Data;
-            if (!tempArray) {
-              tempArray = [];
-            }
-            tempArray.unshift({
-              CourseId: 0,
-              CourseName: "不限"
-            })
-            this.CourseList = tempArray;
+            this.CourseList = res.Data;
+            this.AllCourseList = res.Data;
           }
         })
       },