Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/school/student/student-left.vue

@@ -88,11 +88,15 @@
             emit-value map-options label="客户来源" />
         </div>
       </div>
-      <div class="info_item" v-if="customObj.CreateType==3||customObj.CreateType==4">
-        <div class="item_label">
-          <span v-if="customObj.CreateType==3">介绍人</span>
-          <span v-if="customObj.CreateType==4">转介人</span>
+      <div class="info_item" v-if="customObj.CreateType==3">
+        <div class="item_label">介绍人</div>
+        <div class="item_value">
+          <q-select filled v-model="customObj.StuSourceId" dense @filter="filterEmployee" use-input
+              :options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options />
         </div>
+      </div>
+      <div class="info_item" v-if="customObj.CreateType==4">
+        <div class="item_label">转介人</div>
         <div class="item_value">
           <q-select filled v-model="customObj.StuSourceId" dense :options="customList" option-label="CustomerName"
             option-value="CustomerId" emit-value map-options />

src/components/school/student/student-visit.vue

@@ -9,7 +9,9 @@
     height: auto;
     line-height: 28px;
   }
-
+ .el-select-dropdown{
+    z-index:8888!important;
+  }
 </style>
 <template>
   <div>
@@ -38,9 +40,18 @@
             </el-time-select>
           </template>
         </q-field>
-        <q-select filled v-model="VisitMsg.ReceptionPersion" style="width:250px;" dense @filter="filterEmployee" class="col-6 q-pb-lg"
-          :options="myEmployeeList" option-label="EmployeeName" use-input option-value="Id" emit-value map-options
-          label="接待人" />
+        <q-field filled class="q-pb-lg" dense>
+           <template v-slot:control>
+            <el-select v-model="VisitMsg.ReceptionPersion" filterable style="width:225px;" placeholder="接待人">
+              <el-option
+                v-for="item in myEmployeeList"
+                :key="item.Id"
+                :label="item.EmployeeName"
+                :value="item.Id">
+              </el-option>
+            </el-select>
+           </template>
+        </q-field>    
       </div>
       <div class="row wrap">
         <q-input filled v-model="VisitMsg.Remark" dense :rows="3" type="textarea" class="col-12 q-pb-lg q-pr-lg" label="备注">
@@ -167,7 +178,6 @@
         dataList: [],
         page_Count: 0,
         //员工列表
-        employeeList: [],
         myEmployeeList: [],
         isShowEdit: false,
         //反馈信息
@@ -235,18 +245,9 @@
         queryEmployee({
           IsLeave: 1
         }).then(res => {
-          this.employeeList = res.Data;
-          this.myEmployeeList = this.ClassList;
+          this.myEmployeeList = res.Data;
         })
       },
-      //下拉搜索
-      filterEmployee(val, update, abort) {
-        update(() => {
-          this.myEmployeeList = this.employeeList.filter(
-            v => v.EmployeeName.indexOf(val) > -1
-          );
-        });
-      },
       //获取到访分页
       getList() {
         queryStudentVisitPage(this.msg).then(res => {