Merge remote-tracking branch 'origin/master'

src/api/sys/UserInfoService.js

@@ -0,0 +1,35 @@
+import request from '@/utils/httpRequest'
+
+export default class UserInfoService {
+  save (param) {
+    return request({
+      url: `/sys/userInfo/save`,
+      method: 'post',
+      data: param
+    })
+  }
+
+  remove (id) {
+    return request({
+      url: '/sys/userInfo/remove',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+
+  getUserInfoById (id) {
+    return request({
+      url: `/sys/userInfo/getUserInfoById`,
+      method: 'get',
+      params: {id: id}
+    })
+  }
+
+  list (param) {
+    return request({
+      url: `/sys/userInfo/list`,
+      method: 'get',
+      params: param
+    })
+  }
+}

src/views/modules/sys/userInfo/UserInfoList.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="page">
+    <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <!-- 搜索框-->
+      <el-form-item label="姓名" prop="name">
+        <el-input size="small" v-model="searchForm.name" placeholder="请输入用户姓名" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item label="移动电话" prop="mobilePhone">
+        <el-input size="small" v-model="searchForm.mobilePhone" placeholder="请输入移动电话" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+        <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <div class="bg-white top">
+      <vxe-toolbar :refresh="{query: refreshList}" import export print custom>
+        <template #buttons>
+          <el-button v-if="hasPermission('sys:project:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-if="hasPermission('sys:project:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.workClientTable && $refs.workClientTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+        </template>
+      </vxe-toolbar>
+      <div style="height: calc(100% - 80px);">
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="auto"
+          :loading="loading"
+          size="small"
+          ref="workClientTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change="sortChangeHandle"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="checkbox"  width="40px"></vxe-column>
+          <vxe-column width="100px"  title="工号" field="jobNo">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('sys:project:edit')" @click="view(scope.row.id)">{{scope.row.jobNo}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('sys:project:view')"  @click="view(scope.row.id)">{{scope.row.jobNo}}</el-link>
+              <span v-else>{{scope.row.jobNo}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column width="100px"  title="姓名" field="name">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('sys:project:edit')" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('sys:project:view')"  @click="view(scope.row.id)">{{scope.row.name}}</el-link>
+              <span v-else>{{scope.row.name}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column width="200px"  title="身份证号" field="idCard" ></vxe-column>
+          <vxe-column width="100px"  title="部门" field="department" ></vxe-column>
+          <vxe-column width="100px"  title="岗位" field="position" ></vxe-column>
+          <vxe-column width="100px"  title="最高学历" field="highestEducation" ></vxe-column>
+          <vxe-column width="100px"  title="员工状态" field="userStatus" ></vxe-column>
+          <vxe-column width="100px" title="入职时间" field="entryDate" > </vxe-column>
+
+          <vxe-column title="操作" width="200px" fixed="right" align="center">
+            <template  slot-scope="scope">
+              <el-button v-if="hasPermission('sys:work_client:view')" type="text" icon="el-icon-view" size="small" @click="view(scope.row.id)">查看</el-button>
+              <el-button v-if="hasPermission('sys:work_client:edit') " type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('sys:work_client:del') " type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+    </div>
+    <!-- 弹窗, 新增 / 修改 -->
+    <UserInfoForm  ref="userInfoForm" @refreshDataList="refreshList"></UserInfoForm>
+  </div>
+</template>
+
+<script>
+  import UserInfoForm from './UserInfoForm'
+  import UserInfoService from '@/api/sys/UserInfoService'
+  import OfficeService from '@/api/sys/OfficeService'
+
+  export default {
+    data () {
+      return {
+        searchForm: {
+          name: '',
+          mobilePhone: ''
+        },
+        filterText: '',
+        dataList: [],
+        officeTreeData: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        loading: false
+      }
+    },
+    components: {
+      UserInfoForm
+    },
+    userInfoService: null,
+    officeService: null,
+    created () {
+      this.userInfoService = new UserInfoService()
+      this.officeService = new OfficeService()
+    },
+    activated () {
+      this.refreshTree()
+      this.refreshList()
+    },
+    methods: {
+      filterNode (value, data) {
+        if (!value) return true
+        return data.name.indexOf(value) !== -1
+      },
+      renderContent (h, { node, data, store }) {
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.userInfoService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          'itemType': '1',
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      refreshTree () {
+        this.officeService.treeData().then(({data}) => {
+          this.officeTreeData = data
+        })
+      },
+      // 当前页
+      currentChangeHandle ({ currentPage, pageSize }) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.refreshList()
+      },
+      // 新增
+      add () {
+        this.$refs.userInfoForm.init('add', '')
+      },
+      // 修改
+      edit (id) {
+        id = id || this.$refs.userTable.getCheckboxRecords().map(item => {
+          return item.id
+        })[0]
+        this.$refs.userInfoForm.init('edit', id)
+      },
+      // 查看
+      view (id) {
+        this.$refs.userInfoForm.init('view', id)
+      },
+      // 删除
+      del (id) {
+        let ids = id || this.$refs.userTable.getCheckboxRecords().map(item => {
+          return item.id
+        }).join(',')
+        this.$confirm(`确定删除所选项吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.loading = true
+          this.userInfoService.delete(ids).then(({data}) => {
+            this.loading = false
+            this.$message.success({dangerouslyUseHTMLString: true,
+              message: data})
+            this.refreshList()
+          }).catch(() => {
+            this.loading = false
+          })
+        })
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      }
+    }
+  }
+</script>