From 6c0b67172bc799fa4d3f9891ce9da5261a3de43f Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:45:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/user/selectuser.vue |  245 ++++++++++++++++++++++++------------------------
 1 files changed, 124 insertions(+), 121 deletions(-)

diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index a061894..5e0d2e3 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -1,139 +1,142 @@
-<template>
-  <div id="mainDiv">
-    <el-header :height="headerHeight">
-      <el-row>
+<template>
+  <div id="mainDiv">
+    <el-header :height="headerHeight">
+      <el-row>
         <el-col :span="8">
           <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" />
           <el-button type="primary" @click="search">查询</el-button>
-        </el-col>
-      </el-row>
-    </el-header>
-    <el-main>
+        </el-col>
+      </el-row>
+    </el-header>
+    <el-main>
       <el-table
         ref="multipleTable"
         :data="list"
         row-key="prop1"
         width="50%"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChange"
         @row-dblclick="rowDblclick"
-      >
-        <el-table-column type="selection" :reserve-selection="false" width="55" />
-        <el-table-column v-if="show" prop="empId" label="员工Id" />
-        <el-table-column prop="empNumb" label="员工编号" />
-        <el-table-column prop="empName" label="姓名" />
-        <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-        <el-table-column v-if="show" prop="deptId" label="部门Id" />
-        <el-table-column prop="deptName" label="护卫点" />
-        <el-table-column v-if="show" prop="jobId" label="岗位Id" />
-        <el-table-column prop="jobName" label="岗位" />
-        <el-table-column prop="empTypeName" label="员工类别" />
-        <el-table-column prop="sexName" label="性别" width="50" />
-      </el-table>
-      <!--
-          page.sync 当前页
-          limit.sync 每页显示数量 只能是5,10,20,30,50
-          pagination 翻页的事件
-           -->
+      >
+        <el-table-column type="selection" :reserve-selection="false" width="55" />
+        <el-table-column v-if="show" prop="empId" label="员工Id" />
+        <el-table-column prop="empNumb" label="员工编号" />
+        <el-table-column prop="empName" label="姓名" />
+        <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+        <el-table-column v-if="show" prop="deptId" label="部门Id" />
+        <el-table-column prop="deptName" label="护卫点" />
+        <el-table-column v-if="show" prop="jobId" label="岗位Id" />
+        <el-table-column prop="jobName" label="岗位" />
+        <el-table-column prop="empTypeName" label="员工类别" />
+        <el-table-column prop="sexName" label="性别" width="50" />
+      </el-table>
+      <!--
+          page.sync 当前页
+          limit.sync 每页显示数量 只能是5,10,20,30,50
+          pagination 翻页的事件
+           -->
       <pagination
         v-show="total>0"
         :total="total"
         :page.sync="pagination.num"
-        :limit.sync="pagination.size"
+        :limit.sync="pagination.size"
         @pagination="search"
-      />
-      <el-button type="primary" @click="sureChoose">确定</el-button>
-      <el-button type="danger" @click="cancleChoose">取消</el-button>
-    </el-main>
-  </div>
-</template>
-<script>
-// 引用翻页组件
-import Pagination from '@/components/Pagination'
-export default {
-  components: {
-    Pagination
-  },
-  props: {
-    multipleselect: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      show: false,
-      headerHeight: '70px',
-      deptTree: [],
-      selection: [],
-      multipleSelection: [],
-      total: 0, // 总数量
-      queryParams: {}, // 查询参数
-      sort: {}, // 排序
-      pagination: { // 分页参数
-        size: 5,
-        num: 1
-      },
-      list: [], // 给table显示的数据
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      }
-    }
-  },
-  mounted() {
-    this.search()
-  },
-  methods: {
-    // 翻页方法
+      />
+      <el-button type="primary" @click="sureChoose">确定</el-button>
+      <el-button type="danger" @click="cancleChoose">取消</el-button>
+    </el-main>
+  </div>
+</template>
+<script>
+// 引用翻页组件
+import Pagination from '@/components/Pagination'
+export default {
+  components: {
+    Pagination
+  },
+  props: {
+    multipleselect: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      show: false,
+      headerHeight: '70px',
+      deptTree: [],
+      selection: [],
+      multipleSelection: [],
+      total: 0, // 总数量
+      queryParams: {
+        empNumb: ''
+      }, // 查询参数
+      sort: {}, // 排序
+      pagination: { // 分页参数
+        size: 20,
+        num: 1
+      },
+      list: [], // 给table显示的数据
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      }
+    }
+  },
+  mounted() {
+    this.search()
+  },
+  methods: {
+    // 翻页方法
     search() {
       this.queryParams.empName = this.queryParams.empNumb
-      this.queryParams.deptName = this.queryParams.empNumb
-      this.fetch({
-        ...this.queryParams,
-        ...this.sort
-      })
-    },
-    fetch(params = {}) {
-      var that = this
-      params.pageSize = this.pagination.size
-      params.pageNum = this.pagination.num
-      this.$get('hr/empBaseInfo/list', {
-        ...params
-      }).then((r) => {
-        const data = r.data.data
-        that.total = data.total
-        that.list = data.rows
-      })
-    },
+      this.queryParams.deptName = this.queryParams.empNumb
+      this.queryParams.delFlag = 0
+      this.fetch({
+        ...this.queryParams,
+        ...this.sort
+      })
+    },
+    fetch(params = {}) {
+      var that = this
+      params.pageSize = this.pagination.size
+      params.pageNum = this.pagination.num
+      this.$get('hr/empBaseInfo/list', {
+        ...params
+      }).then((r) => {
+        const data = r.data.data
+        that.total = data.total
+        that.list = data.rows
+      })
+    },
     handleSelectionChange(selection) {
-      if (!this.multipleselect) {
-        if (selection.length > 1) {
-          this.$refs.multipleTable.clearSelection()
-          this.$refs.multipleTable.toggleRowSelection(selection.pop())
-        }
-      }
-      this.multipleSelection = selection
-    },
-    sureChoose() {
-      this.$emit('selectedUser', this.multipleSelection)
-      this.$refs.multipleTable.clearSelection()
-    },
-    cancleChoose() {
-      this.$emit('cancleChooseUser')
-      this.$refs.multipleTable.clearSelection()
-    },
-    rowDblclick(row, column, event) {
-      this.$refs.multipleTable.toggleRowSelection(row, true)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-  .link_button {
-    color: #169BD5;
-  }
-
-  .del_button {
-    color: #D9001B;
-  }
+      if (!this.multipleselect) {
+        if (selection.length > 1) {
+          this.$refs.multipleTable.clearSelection()
+          this.$refs.multipleTable.toggleRowSelection(selection.pop())
+        }
+      }
+      this.multipleSelection = selection
+    },
+    sureChoose() {
+      this.$emit('selectedUser', this.multipleSelection)
+      this.$refs.multipleTable.clearSelection()
+    },
+    cancleChoose() {
+      this.$emit('cancleChooseUser')
+      this.$refs.multipleTable.clearSelection()
+    },
+    rowDblclick(row, column, event) {
+      this.$refs.multipleTable.toggleRowSelection(row, true)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .link_button {
+    color: #169BD5;
+  }
+
+  .del_button {
+    color: #D9001B;
+  }
 </style>

--
Gitblit v1.8.0