页面修改

src/pages/teacher/teacherTrack.vue

@@ -101,68 +101,6 @@
         </div>
         <template v-if="morequery">
           <div class="col-3">
-<<<<<<< HEAD
-          <q-select @input="resetSearch" dense filled option-value="SId" option-label="SName" v-model="msg.School_Id"
-            :options="CompanyList" emit-value map-options label="校区" />
-        </div>
-        <div class="col-3">
-          <q-select @input="resetSearch" filled option-value="CourseId" option-label="CourseName" v-model="msg.CourseId"
-            clearable emit-value use-input :options="myCourseList" label="课程" dense map-options @filter="filterFnkec" />
-        </div>
-        <div class="col-3">
-          <q-select @input="resetSearch" dense filled option-value="Id" option-label="EmployeeName"
-            v-model="msg.ConsultantId" clearable :options="RoleListData" emit-value map-options label="课程顾问" />
-        </div>
-        <div class="col-3">
-          <q-select @input="resetSearch" dense filled option-value="Id" option-label="Name" v-model="msg.StuGuestState"
-            clearable :options="hetongList" emit-value map-options label="合同状态" />
-        </div>
-        <div class="col-3">
-          <q-select @input="msg.StuSourceId='',msg.StuChannel='',resetSearch()" dense clearable filled option-value="Id"
-            option-label="Name" v-model="msg.CreateType" :options="customFromList" emit-value map-options
-            label="客户来源" />
-        </div>
-        <div class="col-3" v-if="msg.CreateType==1">
-          <q-select filled v-model="msg.StuChannel" @input="resetSearch" label="收客渠道" dense :options="StuChannelList"
-            option-label="Name" option-value="Id" emit-value map-options use-input clearable @filter="filterStuChannel">
-            <template v-slot:no-option>
-              <q-item>
-                <q-item-section class="text-grey">
-                  未找到相关数据
-                </q-item-section>
-              </q-item>
-            </template>
-          </q-select>
-        </div>
-        <div class="col-3" v-if="msg.CreateType==2">
-          <q-select filled v-model="msg.StuSourceId" dense :options="customList" use-input label="关联同行"
-            @filter="filterFn" option-label="CustomerName" @input="resetSearch" clearable option-value="CustomerId"
-            emit-value map-options>
-            <template v-slot:no-option>
-              <q-item>
-                <q-item-section class="text-grey">
-                  未找到相关数据
-                </q-item-section>
-              </q-item>
-            </template>
-          </q-select>
-        </div>
-        <div class="col-3" v-if="msg.CreateType==3">
-          <q-select filled v-model="msg.StuSourceId" dense @filter="filterEmployee" label="介绍人" use-input
-            :options="myEmployeeList" option-label="EmployeeName" @input="resetSearch" clearable option-value="Id"
-            emit-value map-options />
-        </div>
-        <div class="col-3" v-if="msg.CreateType==4">
-          <q-select filled v-model="msg.StuSourceId" dense use-input @filter="filterStudent" label="转介人"
-            :options="MyTransListData" option-label="StuName" @input="resetSearch" clearable option-value="StuId"
-            emit-value map-options />
-        </div>
-        <div class="col-3">
-          (
-          <q-radio size="xs" v-model="msg.Q_FType" val="1" label="范围内有跟进记录" @input='resetSearch' />
-          <q-radio size="xs" v-model="msg.Q_FType" val="2" label="范围内没有跟进记录" @input='resetSearch' />）
-        </div>
-=======
             <q-select @input="resetSearch" dense filled option-value="SId" option-label="SName" v-model="msg.School_Id"
               :options="CompanyList" emit-value map-options label="校区" />
           </div>
@@ -230,7 +168,6 @@
             <q-radio size="xs" v-model="msg.Q_FType" val="1" label="范围内有跟进记录" @input='resetSearch' />
             <q-radio size="xs" v-model="msg.Q_FType" val="2" label="范围内没有跟进记录" @input='resetSearch' />）
           </div>
->>>>>>> 1ddb07f8ba44a5f2da138e264e49f06802be1383
         </template>
       </div>
     </div>