Преглед на файлове

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

余思翰 преди 5 месеца
родител
ревизия
80f8a85ca0
променени са 3 файла, в които са добавени 51 реда и са изтрити 24 реда
  1. 9
    2
      oa-ui/src/assets/styles/index.scss
  2. 9
    9
      oa-ui/src/views/flowable/form/budget/budgetInfo.vue
  3. 33
    13
      oa-ui/src/views/oa/staff/index.vue

+ 9
- 2
oa-ui/src/assets/styles/index.scss Целия файл

76
 .block {
76
 .block {
77
   display: block;
77
   display: block;
78
 }
78
 }
79
-
79
+.flex{
80
+  display: flex;
81
+}
82
+.align-center{
83
+  align-items: center;
84
+}
80
 .pointer {
85
 .pointer {
81
   cursor: pointer;
86
   cursor: pointer;
82
 }
87
 }
136
 .text-center {
141
 .text-center {
137
   text-align: center
142
   text-align: center
138
 }
143
 }
139
-
144
+.text-right{
145
+  text-align: right
146
+}
140
 .sub-navbar {
147
 .sub-navbar {
141
   height: 50px;
148
   height: 50px;
142
   line-height: 50px;
149
   line-height: 50px;

+ 9
- 9
oa-ui/src/views/flowable/form/budget/budgetInfo.vue Целия файл

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

+ 33
- 13
oa-ui/src/views/oa/staff/index.vue Целия файл

66
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
66
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
67
               v-hasPermi="['system:user:export']">导出</el-button>
67
               v-hasPermi="['system:user:export']">导出</el-button>
68
           </el-col>
68
           </el-col>
69
+          <el-col :span="1.5">
70
+            <el-button type="text" plain size="mini" @click="lookOnTheJob()"
71
+              v-hasPermi="['system:user:edit']">查看正式员工</el-button>
72
+          </el-col>
73
+          <el-col :span="1.5">
74
+            <el-button type="text" plain size="mini" @click="lookResign()"
75
+              v-hasPermi="['system:user:edit']">查看离职人员</el-button>
76
+          </el-col>
77
+          <el-col :span="1.5">
78
+            <el-button type="text" plain size="mini" @click="lookRetire()"
79
+              v-hasPermi="['system:user:edit']">查看退休人员</el-button>
80
+          </el-col>
69
           <el-col :span="1.5">
81
           <el-col :span="1.5">
70
             <div style="text-align:right;font-size:14px;line-height:28px;">共{{ total }}条数据</div>
82
             <div style="text-align:right;font-size:14px;line-height:28px;">共{{ total }}条数据</div>
71
           </el-col>
83
           </el-col>
103
             :show-overflow-tooltip="true" sortable :sort-method="sortPostLevel">
115
             :show-overflow-tooltip="true" sortable :sort-method="sortPostLevel">
104
             <template slot-scope="scope">
116
             <template slot-scope="scope">
105
               {{ selectDictLabel(dict.type.sys_user_postlevel, scope.row.postLevel) +
117
               {{ selectDictLabel(dict.type.sys_user_postlevel, scope.row.postLevel) +
106
-      selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
118
+                selectDictLabel(dict.type.sys_user_salarylevel, scope.row.salaryLevel) }}
107
             </template>
119
             </template>
108
           </el-table-column>
120
           </el-table-column>
109
           <el-table-column label="职务" align="center" key="postNames" prop="postNames" v-if="columns[17].visible"
121
           <el-table-column label="职务" align="center" key="postNames" prop="postNames" v-if="columns[17].visible"
113
             <template slot-scope="scope">
125
             <template slot-scope="scope">
114
               {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
126
               {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
115
             </template>
127
             </template>
116
-          </el-table-column>          
128
+          </el-table-column>
117
           <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[18].visible"
129
           <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[18].visible"
118
-          :formatter="formatterCertificates" />
130
+            :formatter="formatterCertificates" />
119
           <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
131
           <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
120
             v-if="columns[10].visible" sortable="custom" />
132
             v-if="columns[10].visible" sortable="custom" />
121
           <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
133
           <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
496
       this.loading = true;
508
       this.loading = true;
497
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
509
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
498
         this.userList = response.rows;
510
         this.userList = response.rows;
499
-        // this.userList.forEach(user => {
500
-        //   this.getPostByUser(user)
501
-        // })
502
         this.total = response.total;
511
         this.total = response.total;
512
+        if (this.queryParams.status != 1 && this.queryParams.status != 2) {
513
+          this.userList = this.userList.filter(user =>
514
+            user.status != '1' && user.status != '2'
515
+          )
516
+          this.total = this.userList.length;
517
+        }
503
         this.loading = false;
518
         this.loading = false;
504
       }
519
       }
505
       );
520
       );
611
       this.reset();
626
       this.reset();
612
       this.open = true;
627
       this.open = true;
613
       this.title = "添加用户";
628
       this.title = "添加用户";
614
-      // getUser().then(response => {
615
-      //   this.postOptions = response.posts;
616
-      //   this.roleOptions = response.roles;
617
-      //   this.open = true;
618
-      //   this.title = "添加用户";
619
-      //   this.form.password = this.initPassword;
620
-      // });
621
     },
629
     },
622
     // 查看人员详情按钮
630
     // 查看人员详情按钮
623
     handleView(row) {
631
     handleView(row) {
659
         this.form.password = "";
667
         this.form.password = "";
660
       });
668
       });
661
     },
669
     },
670
+    lookOnTheJob() {
671
+      this.queryParams.status = ''
672
+      this.getList();
673
+    },
674
+    lookResign() {
675
+      this.queryParams.status = 1
676
+      this.getList();
677
+    },
678
+    lookRetire() {
679
+      this.queryParams.status = 2
680
+      this.getList();
681
+    },
662
     /** 重置密码按钮操作 */
682
     /** 重置密码按钮操作 */
663
     handleResetPwd(row) {
683
     handleResetPwd(row) {
664
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
684
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {

Loading…
Отказ
Запис