新增人事管理查询离职、退休人员

oa-ui/src/assets/styles/index.scss

@@ -76,7 +76,12 @@ div:focus {
 .block {
   display: block;
 }
-
+.flex{
+  display: flex;
+}
+.align-center{
+  align-items: center;
+}
 .pointer {
   cursor: pointer;
 }
@@ -136,7 +141,9 @@ aside {
 .text-center {
   text-align: center
 }
-
+.text-right{
+  text-align: right
+}
 .sub-navbar {
   height: 50px;
   line-height: 50px;

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-16 09:46:32
+ * @LastEditTime: 2024-12-16 14:50:12
 -->
 <template>
   <div class="main">
@@ -62,14 +62,14 @@
         <el-descriptions-item label="预结算额" :span="3">
           <table border="1" style="width:100%">
             <tr style="background-color:#f8f8f9" v-if="workList.length != 0">
-              <td>工作简述</td>
-              <td>工作内容</td>
-              <td>比例尺/等级</td>
-              <td>数量</td>
-              <td>单价</td>
-              <td>单位</td>
-              <td>系数</td>
-              <td>金额</td>
+              <td style="min-width:50px">工作简述</td>
+              <td style="min-width:50px">工作内容</td>
+              <td style="min-width:50px">比例尺/等级</td>
+              <td style="min-width:50px">数量</td>
+              <td style="min-width:50px">单价</td>
+              <td style="min-width:50px">单位</td>
+              <td style="min-width:50px">系数</td>
+              <td style="min-width:50px">金额</td>
               <td style="min-width: 150px;">备注</td>
             </tr>
             <tr v-for="work in workList">

oa-ui/src/views/oa/staff/index.vue

@@ -66,6 +66,18 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
               v-hasPermi="['system:user:export']">导出</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="text" plain size="mini" @click="lookOnTheJob()"
+              v-hasPermi="['system:user:edit']">查看正式员工</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="text" plain size="mini" @click="lookResign()"
+              v-hasPermi="['system:user:edit']">查看离职人员</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="text" plain size="mini" @click="lookRetire()"
+              v-hasPermi="['system:user:edit']">查看退休人员</el-button>
+          </el-col>
           <el-col :span="1.5">
             <div style="text-align:right;font-size:14px;line-height:28px;">共{{ total }}条数据</div>
           </el-col>
@@ -103,7 +115,7 @@
             :show-overflow-tooltip="true" sortable :sort-method="sortPostLevel">
             <template slot-scope="scope">
               {{ selectDictLabel(dict.type.sys_user_postlevel, scope.row.postLevel) +
-      selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
+                selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
             </template>
           </el-table-column>
           <el-table-column label="职务" align="center" key="postNames" prop="postNames" v-if="columns[17].visible"
@@ -113,9 +125,9 @@
             <template slot-scope="scope">
               {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
             </template>
-          </el-table-column>          
+          </el-table-column>
           <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[18].visible"
-          :formatter="formatterCertificates" />
+            :formatter="formatterCertificates" />
           <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
             v-if="columns[10].visible" sortable="custom" />
           <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
@@ -496,10 +508,13 @@ export default {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows;
-        // this.userList.forEach(user => {
-        //   this.getPostByUser(user)
-        // })
         this.total = response.total;
+        if (this.queryParams.status != 1 && this.queryParams.status != 2) {
+          this.userList = this.userList.filter(user =>
+            user.status != '1' && user.status != '2'
+          )
+          this.total = this.userList.length;
+        }
         this.loading = false;
       }
       );
@@ -611,13 +626,6 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加用户";
-      // getUser().then(response => {
-      //   this.postOptions = response.posts;
-      //   this.roleOptions = response.roles;
-      //   this.open = true;
-      //   this.title = "添加用户";
-      //   this.form.password = this.initPassword;
-      // });
     },
     // 查看人员详情按钮
     handleView(row) {
@@ -659,6 +667,18 @@ export default {
         this.form.password = "";
       });
     },
+    lookOnTheJob() {
+      this.queryParams.status = ''
+      this.getList();
+    },
+    lookResign() {
+      this.queryParams.status = 1
+      this.getList();
+    },
+    lookRetire() {
+      this.queryParams.status = 2
+      this.getList();
+    },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {