12/15 21:15 报名考级列表

src/router/notKeepAliveList.js

@@ -24,5 +24,6 @@ export default [
   // '/operateManager/HumanResources'
   '/business/attendanceList',
   '/business/returnVisitList',
+  '/business/levelManager',
 
 ]

src/views/levelManager/levelManager.vue

@@ -6,18 +6,21 @@
     </h2>
     <div class="m-core">
       <!-- 搜索标题 -->
-      <el-form :inline="true"
+      <save-form :inline="true"
                class="searchForm"
-               v-model.trim="searchForm">
-        <el-form-item>
+               ref='searchForm'
+               @submit="onSearch"
+               @reset="onReSet"
+               :model="searchForm">
+        <el-form-item prop="name">
           <el-input v-model.trim="searchForm.name"
                     placeholder="请输入姓名"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="orderNo">
           <el-input v-model.trim="searchForm.orderNo"
                     placeholder="请输入订单编号"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="transNo">
           <el-input v-model.trim="searchForm.transNo"
                     placeholder="请输入交易流水号"></el-input>
         </el-form-item>
@@ -26,7 +29,7 @@
                     @keyup.enter.native="city"
                     placeholder="请输入城市名"></el-input>
         </el-form-item> -->
-        <el-form-item>
+        <el-form-item prop="organId">
           <el-select v-model.trim="searchForm.organId"
                      filterable
                      clearable
@@ -37,7 +40,7 @@
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item >
           <el-select class="multiple"
                      v-model.trim="searchForm.status"
                      filterable
@@ -49,7 +52,7 @@
                        label="已缴费"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="orderDate">
           <el-date-picker v-model.trim="orderDate"
                           style="width:410px;"
                           type="daterange"
@@ -63,14 +66,14 @@
     }"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSearch"
+          <el-button native-type="submit"
                      type="danger">搜索</el-button>
-          <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
+          <el-button native-type="reset" type="primary">重置</el-button>
           <el-button @click="onExport"
                      v-permission="'export/degreeRegistration/825'"
                      type="primary">导出</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
         报考总人数：{{ totalNumber }}人
         <i style="width: 10px; display: inline-block"></i>
@@ -79,7 +82,7 @@
       <div class="tableWrap">
         <el-table :data="tableList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          >
+
           <el-table-column width="90px"
                            align="center"
                            prop="id"
@@ -163,7 +166,9 @@
                     </template>
           </el-table-column>-->
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination
+        sync
+        :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
@@ -234,23 +239,26 @@ export default {
       });
     },
     onSearch () {
-      let pageInfo = this.pageInfo;
-      pageInfo.page = 1;
+      this.pageInfo.page = 1;
       this.getList();
     },
     onReSet () {
       // 重置搜索
+
       this.orderDate = null;
-      this.searchForm = {
-        orderNo: null,
-        transNo: null,
-        city: null,
-        status: null,
-        startTime: null,
-        organId: null,
-        endTime: null,
-      };
-      this.getList();
+      // this.searchForm = {
+      //   orderNo: null,
+      //   transNo: null,
+      //   city: null,
+      //   status: null,
+      //   startTime: null,
+      //   organId: null,
+      //   endTime: null,
+      // };
+         this.$refs.searchForm.resetFields()
+        //  this.$set(this.searchForm,'status','pay')
+      // this.searchForm.status = 'pay'
+      this.onSearch();
     },
     getList () {
       let searchForm = this.searchForm;
@@ -382,4 +390,4 @@ export default {
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
 }
-</style>
+</style>

src/views/returnVisitManager/returnVisitList.vue

@@ -134,7 +134,32 @@
                width="700px"
                destroy-on-close
                :visible.sync="detailVisible">
-      <el-form :inline="true"
+         <descriptions :column="2" v-if="activeRow">
+      <descriptions-item label="老师姓名:">{{
+        activeRow.teacherName
+      }}</descriptions-item>
+      <descriptions-item label="所属分部:">{{
+        activeRow.organName
+      }}</descriptions-item>
+      <descriptions-item label="角色:">{{
+       activeRow.visiterType | visiterType
+      }}</descriptions-item>
+      <descriptions-item label="学生姓名:">{{
+        activeRow.studentName
+      }}岁</descriptions-item>
+      <descriptions-item label="回访类型:">{{
+        activeRow.type
+      }}</descriptions-item>
+      <descriptions-item label="回访目的:">{{
+       activeRow.purpose
+      }}</descriptions-item>
+      <descriptions-item label="回访情况:" :span="6">{{ activeRow.overview }}</descriptions-item>
+      <descriptions-item label="家长反馈" :span="6">{{ activeRow.feedback }}</descriptions-item>
+    </descriptions>
+
+
+
+      <!-- <el-form :inline="true"
                v-if="activeRow"
                ref='visitForm'>
         <el-form-item label="老师姓名">
@@ -167,26 +192,26 @@
                       prop='feedback'>
           <p class="label">{{activeRow.feedback}}</p>
         </el-form-item>
-      </el-form>
+      </el-form> -->
     </el-dialog>
   </div>
 </template>
 <script>
-import { visitChiose } from '@/utils/searchArray'
-import pagination from '@/components/Pagination/index'
-import { getEmployeeOrgan } from '@/api/buildTeam'
-import { getVisitList } from './api.js'
-import cleanDeep from 'clean-deep'
+import { visitChiose } from "@/utils/searchArray";
+import pagination from "@/components/Pagination/index";
+import { getEmployeeOrgan } from "@/api/buildTeam";
+import { getVisitList } from "./api.js";
+import cleanDeep from "clean-deep";
 export default {
   components: { pagination },
-  data () {
+  data() {
     return {
       searchForm: {
-        teacher: '',
-        organId: '',
-        visiterType: '',
-        type: '',
-        purpose: ''
+        teacher: "",
+        organId: "",
+        visiterType: "",
+        type: "",
+        purpose: "",
       },
       type: [],
       timer: [],
@@ -197,62 +222,62 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       tableList: [],
       detailVisible: false,
-      activeRow: null
-    }
+      activeRow: null,
+    };
   },
-  mounted () {
-    getEmployeeOrgan().then(res => {
+  mounted() {
+    getEmployeeOrgan().then((res) => {
       if (res.code == 200) {
         this.organList = res.data;
       }
-    })
-    this.getList()
+    });
+    this.getList();
   },
-  activated () {
-    this.getList()
+  activated() {
+    this.getList();
   },
   methods: {
-    handleChange (val) {
-      this.searchForm.type = val[0]
-      this.searchForm.purpose = val[1]
+    handleChange(val) {
+      this.searchForm.type = val[0];
+      this.searchForm.purpose = val[1];
     },
-    search () {
+    search() {
       this.rules.page = 1;
-      this.getList()
+      this.getList();
     },
-    onReSet () {
-      this.type = []
-      this.timer = []
+    onReSet() {
+      this.type = [];
+      this.timer = [];
       this.searchForm = {
-        teacher: '',
-        organId: '',
-        visiterType: '',
-        type: '',
-        purpose: ''
-      }
-      this.search()
+        teacher: "",
+        organId: "",
+        visiterType: "",
+        type: "",
+        purpose: "",
+      };
+      this.search();
     },
-    getList () {
+    getList() {
       // cleanDeep
 
       this.searchForm.page = this.rules.page;
-      this.searchForm.rows = this.rules.limit
-      getVisitList(cleanDeep(this.searchForm)).then(res => {
+      this.searchForm.rows = this.rules.limit;
+      getVisitList(cleanDeep(this.searchForm)).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
-          this.rules.total = res.data.total
+          this.rules.total = res.data.total;
         }
-      })
+      });
     },
-    lookDetail (row) {
+    lookDetail(row) {
       this.activeRow = row;
       this.detailVisible = true;
     },
-    changeTimer (val) {
+    changeTimer(val) {
       if (val && val.length > 0) {
         this.searchForm.startTime = this.timer[0];
         this.searchForm.endTime = this.timer[1];
@@ -260,16 +285,16 @@ export default {
         this.searchForm.startTime = null;
         this.searchForm.endTime = null;
       }
-    }
+    },
   },
   watch: {
-    detailVisible (val) {
+    detailVisible(val) {
       if (!val) {
-        this.activeRow = null
+        this.activeRow = null;
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .msg {