|  | @@ -14,7 +14,7 @@
 | 
											
												
													
														|  |          <el-form-item>
 |  |          <el-form-item>
 | 
											
												
													
														|  |            <el-input
 |  |            <el-input
 | 
											
												
													
														|  |              placeholder="学员姓名/编号/手机号"
 |  |              placeholder="学员姓名/编号/手机号"
 | 
											
												
													
														|  | -            v-model.trim="searchForm.search"
 |  | 
 | 
											
												
													
														|  | 
 |  | +            v-model.trim="searchForm.student"
 | 
											
												
													
														|  |              @keyup.enter.native="
 |  |              @keyup.enter.native="
 | 
											
												
													
														|  |                (e) => {
 |  |                (e) => {
 | 
											
												
													
														|  |                  e.target.blur();
 |  |                  e.target.blur();
 | 
											
										
											
												
													
														|  | @@ -63,7 +63,7 @@
 | 
											
												
													
														|  |          </el-form-item> -->
 |  |          </el-form-item> -->
 | 
											
												
													
														|  |          <el-form-item>
 |  |          <el-form-item>
 | 
											
												
													
														|  |            <el-date-picker
 |  |            <el-date-picker
 | 
											
												
													
														|  | -            v-model.trim="searchForm.timer"
 |  | 
 | 
											
												
													
														|  | 
 |  | +            v-model.trim="searchForm.visitCycle"
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              type="month"
 |  |              type="month"
 | 
											
												
													
														|  |              placeholder="回访周期"
 |  |              placeholder="回访周期"
 | 
											
										
											
												
													
														|  | @@ -97,11 +97,11 @@
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  |            <el-table-column align="center" prop="organName" label="分部">
 |  |            <el-table-column align="center" prop="organName" label="分部">
 | 
											
												
													
														|  |              <template slot-scope="scope">
 |  |              <template slot-scope="scope">
 | 
											
												
													
														|  | -              <copy-text>{{ scope.row.organName }}</copy-text>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <copy-text>{{ scope.row.orgname }}</copy-text>
 | 
											
												
													
														|  |              </template>
 |  |              </template>
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -          <el-table-column align="center" prop="type" label="回访周期">
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <el-table-column align="center" prop="visitCycle" label="回访周期">
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  |            <el-table-column align="center" prop="isVisit" label="回访状态">
 |  |            <el-table-column align="center" prop="isVisit" label="回访状态">
 | 
											
												
													
														|  |              <template slot-scope="scope">
 |  |              <template slot-scope="scope">
 | 
											
										
											
												
													
														|  | @@ -161,7 +161,7 @@
 | 
											
												
													
														|  |  import { visitChiose1 } from "@/utils/searchArray";
 |  |  import { visitChiose1 } from "@/utils/searchArray";
 | 
											
												
													
														|  |  import pagination from "@/components/Pagination/index";
 |  |  import pagination from "@/components/Pagination/index";
 | 
											
												
													
														|  |  import { getEmployeeOrgan } from "@/api/buildTeam";
 |  |  import { getEmployeeOrgan } from "@/api/buildTeam";
 | 
											
												
													
														|  | -import { getVisitList } from "../api.js";
 |  | 
 | 
											
												
													
														|  | 
 |  | +import { getWaitVisitList } from "../api.js";
 | 
											
												
													
														|  |  import cleanDeep from "clean-deep";
 |  |  import cleanDeep from "clean-deep";
 | 
											
												
													
														|  |  import { getTimes } from "@/utils";
 |  |  import { getTimes } from "@/utils";
 | 
											
												
													
														|  |  import { resetQuery } from "@/utils/utils";
 |  |  import { resetQuery } from "@/utils/utils";
 | 
											
										
											
												
													
														|  | @@ -171,11 +171,11 @@ export default {
 | 
											
												
													
														|  |    data() {
 |  |    data() {
 | 
											
												
													
														|  |      return {
 |  |      return {
 | 
											
												
													
														|  |        searchForm: {
 |  |        searchForm: {
 | 
											
												
													
														|  | -        search: "",
 |  | 
 | 
											
												
													
														|  | 
 |  | +        student: "",
 | 
											
												
													
														|  |          organId: "",
 |  |          organId: "",
 | 
											
												
													
														|  |          visiterType: "",
 |  |          visiterType: "",
 | 
											
												
													
														|  | -        typeList: [],
 |  | 
 | 
											
												
													
														|  | -        timer: [],
 |  | 
 | 
											
												
													
														|  | 
 |  | +        isVisit: '',
 | 
											
												
													
														|  | 
 |  | +        visitCycle: '',
 | 
											
												
													
														|  |        },
 |  |        },
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |        visitChiose: visitChiose1,
 |  |        visitChiose: visitChiose1,
 | 
											
										
											
												
													
														|  | @@ -250,23 +250,20 @@ export default {
 | 
											
												
													
														|  |      },
 |  |      },
 | 
											
												
													
														|  |      getList() {
 |  |      getList() {
 | 
											
												
													
														|  |        // cleanDeep
 |  |        // cleanDeep
 | 
											
												
													
														|  | -      let { timer, typeList, ...rest } = this.searchForm;
 |  | 
 | 
											
												
													
														|  | -      let type,
 |  | 
 | 
											
												
													
														|  | -        purpose = null;
 |  | 
 | 
											
												
													
														|  | -      if (typeList.length > 0) {
 |  | 
 | 
											
												
													
														|  | -        type = typeList[0];
 |  | 
 | 
											
												
													
														|  | -        purpose = typeList[1];
 |  | 
 | 
											
												
													
														|  | -      }
 |  | 
 | 
											
												
													
														|  | 
 |  | +      // let { timer, typeList, ...rest } = this.searchForm;
 | 
											
												
													
														|  | 
 |  | +      // let type,
 | 
											
												
													
														|  | 
 |  | +      //   purpose = null;
 | 
											
												
													
														|  | 
 |  | +      // if (typeList.length > 0) {
 | 
											
												
													
														|  | 
 |  | +      //   type = typeList[0];
 | 
											
												
													
														|  | 
 |  | +      //   purpose = typeList[1];
 | 
											
												
													
														|  | 
 |  | +      // }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |        let params = {
 |  |        let params = {
 | 
											
												
													
														|  | -        ...rest,
 |  | 
 | 
											
												
													
														|  | 
 |  | +        ...this.searchForm,
 | 
											
												
													
														|  |          page: this.rules.page,
 |  |          page: this.rules.page,
 | 
											
												
													
														|  |          rows: this.rules.limit,
 |  |          rows: this.rules.limit,
 | 
											
												
													
														|  | -        ...getTimes(timer, ["startTime", "endTime"]),
 |  | 
 | 
											
												
													
														|  | -        type,
 |  | 
 | 
											
												
													
														|  | -        purpose,
 |  | 
 | 
											
												
													
														|  |        };
 |  |        };
 | 
											
												
													
														|  | -      getVisitList(cleanDeep(params)).then((res) => {
 |  | 
 | 
											
												
													
														|  | 
 |  | +      getWaitVisitList(cleanDeep(params)).then((res) => {
 | 
											
												
													
														|  |          if (res.code == 200) {
 |  |          if (res.code == 200) {
 | 
											
												
													
														|  |            this.tableList = res.data.rows;
 |  |            this.tableList = res.data.rows;
 | 
											
												
													
														|  |            this.rules.total = res.data.total;
 |  |            this.rules.total = res.data.total;
 |