修改

src/views/pointManage/pointList.vue

@@ -3,18 +3,20 @@
 
         <!-- 查询和其他操作 -->
         <div class="filter-container">
-            <el-select v-model="listQuery.companyId" clearable placeholder="请选择公司主体" style="top: -4px;width: 200px;">
+            <el-input clearable class="filter-item" style="width: 200px;" placeholder="员工姓名"
+                v-model="listQuery.userName"></el-input>
+            <el-select v-model="listQuery.companyId" clearable placeholder="公司主体" class="filter-item" style="width: 200px;">
                 <el-option :key="item.companyId" v-for="item in companyTypeList" :label="item.companyName" :value="item.companyId">
                 </el-option>
             </el-select>
-            <el-select v-model="listQuery.deptId" clearable placeholder="请选择部门" style="top: -4px;width: 200px;">
+            <el-select v-model="listQuery.deptId" clearable placeholder="部门名称" class="filter-item" style="width: 200px;">
                 <el-option :key="item.type" v-for="item in depTypeList" :label="item.deptName" :value="item.deptId">
                 </el-option>
             </el-select>
-            <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入员工姓名"
-                v-model="listQuery.userName"></el-input>
-            <el-date-picker class="filter-item" value-format="yyyy-MM-dd" v-model="listQuery.createTime" type="date" placeholder="选择生成时间">
-            </el-date-picker>
+            <el-select v-model="listQuery.staffStatus" clearable placeholder="员工状态" class="filter-item" style="width: 200px;">
+                <el-option :key="item.dictValue" v-for="item in staffStatusList" :label="item.dictLabel" :value="item.dictValue">
+                </el-option>
+            </el-select>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
             <el-button class="filter-item" type="primary"  :loading="downloadLoading" v-waves icon="el-icon-download" @click="handleDownload">导出</el-button>
 
@@ -31,11 +33,16 @@
 
             <el-table-column align="center" min-width="200px" label="公司主体" prop="companyName">
             </el-table-column>
-
             <el-table-column align="center" min-width="200px" label="部门" prop="deptName">
             </el-table-column>
+            <el-table-column align="center" min-width="120px" label="入职时间" prop="realEntryDate">
+            </el-table-column>
+            <el-table-column align="center" min-width="120px" label="出生日期" prop="staffbirthday">
+            </el-table-column>
             <el-table-column align="center" min-width="80px" label="积分" prop="integral">
             </el-table-column>
+            <el-table-column align="center" min-width="80px" label="员工状态" prop="staffStatusName">
+            </el-table-column>
             <el-table-column align="center" label="操作" min-width="100px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button type="primary" size="small" @click="handleView(scope.row, false)">查看</el-button>
@@ -107,7 +114,7 @@
 </style>
   
 <script>
-import { getPointList, getItemPointList, pointRulesTypeList } from "@/api/pointManage";
+import { getPointList, getItemPointList } from "@/api/pointManage";
 import { companyTypeList, depTypeList,dataTypeList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
@@ -118,6 +125,7 @@ export default {
     directives: { waves },
     data() {
         return {
+            staffStatusList: [],
             companyTypeList: [
                 
             ],
@@ -143,7 +151,7 @@ export default {
                 companyId: '',
                 deptId: '',
                 userName: '',
-                createTime: '',
+                staffStatus: '',
             },
             itemListQuery: {
                 page: 1,
@@ -157,9 +165,15 @@ export default {
     created() {
         this.getCompanyTypeList();
         this.getDepTypeList(); 
+        this.getStaffStatusList();
         this.getList();
     },
     methods: {
+        getStaffStatusList(){
+            dataTypeList({dictType:'staff_status'}).then(response => {
+                this.staffStatusList = response.data.data;
+            })
+        },
         handleDownload() {
             window.location.href = process.env.BASE_API + '/mall-integral/export/user/page?companyId=' + this.listQuery.companyId + '&deptId=' + this.listQuery.deptId + '&userName=' + this.listQuery.userName + '&createTime=' + this.listQuery.createTime;
         },