fix

src/components/Pagination/index.vue

@@ -61,6 +61,7 @@ export default {
   computed: {
     currentPage: {
       get () {
+        console.log(this.page)
         return this.page
       },
       set (val) {
@@ -80,12 +81,16 @@ export default {
     if (this.sync) {
       const searchs = new Searchs(this.$route.fullPath)
       const active = searchs.get()
-      for (const key in active.page) {
-        if (active.page.hasOwnProperty(key)) {
-          const item = active.page[key];
-          this.$emit('update:' + key, item)
-        }
-      }
+      // for (const key in active.page) {
+      //   if (active.page.hasOwnProperty(key)) {
+      //     const item = active.page[key];
+      //     this[key] = item
+      //     // this.$emit('update:' + key, item)
+      //   }
+      // }
+      this.$emit('update:page', active.page.page)
+      this.$emit('currentPage', active.page.page)
+      // this.page = active.page.page
     }
   },
   methods: {

src/components/save-form/index.vue

@@ -20,13 +20,15 @@ export default {
   mounted() {
     const searchs = new Searchs(this.$route.fullPath)
     this.searchs = searchs
-    const active = searchs.get()
-    for (const key in active.form) {
-      if (active.form.hasOwnProperty(key)) {
-        const item = active.form[key]
-        this.model[key] = item
+    this.$nextTick(() => {
+      const active = searchs.get()
+      for (const key in active.form) {
+        if (active.form.hasOwnProperty(key)) {
+          const item = active.form[key]
+          this.model[key] = item
+        }
       }
-    }
+    })
   },
   methods: {
     validate(FC) {

src/router/notKeepAliveList.js

@@ -1,3 +1,4 @@
 export default [
-  '/setSilder/save-form'
+  '/setSilder/save-form',
+  '/operateManager/HumanResources'
 ]

src/views/HumanResources/index.vue

@@ -9,15 +9,16 @@
            v-permission="'employeeInfo/insert'"
            @click="openTypes('create')">添加</div>
       <!-- 搜索标题 -->
-      <el-form :inline="true"
-               class="searchForm"
-               v-model.trim="searchForm">
-        <el-form-item>
+      <saveform :inline="true"
+                ref="searchForm"
+                class="searchForm"
+               :model.sync="searchForm">
+        <el-form-item prop="userNameOrIdOrMobile">
           <el-input placeholder="姓名手机号"
                     v-model.trim="searchForm.userNameOrIdOrMobile"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="sourceFrom">
           <el-select v-model.trim="searchForm.sourceFrom"
                      clearable
                      filterable
@@ -28,7 +29,7 @@
                        value="转介绍"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="status">
           <el-select v-model.trim="searchForm.status"
                      clearable
                      filterable
@@ -47,7 +48,7 @@
                        value="DIMISSION"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="position">
           <el-select v-model.trim="searchForm.position"
                      clearable
                      filterable
@@ -60,7 +61,7 @@
                        value="TEACHING"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="organId">
           <el-select v-model.trim="searchForm.organId"
                      placeholder='请选择分部'
                      clearable
@@ -72,7 +73,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="subjectIds"
+        <el-form-item prop="subjectId"
                       :label-width="formLabelWidth">
           <el-select v-model.trim="searchForm.subjectId"
                      clearable
@@ -95,7 +96,7 @@
             end-placeholder="更新结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="operator">
           <el-input placeholder="归属管理HR"
                     v-model.trim="searchForm.operator"
                     clearable></el-input>
@@ -107,7 +108,7 @@
                      type="primary"
                      style="background-color: #409EFF;border-color: #409EFF;">重置</el-button>
         </el-form-item>
-      </el-form>
+      </saveform>
       <div class="tableWrap">
         <el-table :data="tableList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -294,6 +295,7 @@
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
+                    sync
                     @pagination="getList" />
       </div>
     </div>
@@ -304,6 +306,7 @@
                @close="onFormClose('ruleForm')"
                width="1050px">
       <hrform :detail.sync="rowDetail"
+              v-if="typeStatus"
               :organList="organList"
               :subjectList="subjectList"
               :close="onFormClose"
@@ -336,6 +339,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import saveform from '@/components/save-form'
 import dayjs from 'dayjs'
 import hrform from './form'
 // import store from '@/store'
@@ -367,7 +371,7 @@ const initSearch = {
   dates: []
 }
 export default {
-  components: { pagination, hrform },
+  components: { pagination, hrform, saveform },
   name: "helpCategory",
   data () {
     return {
@@ -495,15 +499,18 @@ export default {
       })
     },
     search () {
-      this.pageInfo = {
-        ...this.pageInfo,
-        page: 1
-      }
-      this.getList()
+      this.$refs.searchForm.validate(valid => {
+        this.pageInfo = {
+          ...this.pageInfo,
+          page: 1
+        }
+        this.getList()
+      })
     },
     onReSet () {
-      this.searchForm = { ...initSearch }
+      this.$refs.searchForm.resetFields()
       this.getList()
+
     },
     onTypeSubmit (formName) {
       // 添加数据