From d80fe249f2126a7339107a513e3935229c0c7f1b Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Mon, 14 Jul 2025 09:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A6=BB=E8=81=8C=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=85=A5=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/staff.js              |  8 ++++
 src/views/attendance/param/index.vue |  2 +-
 src/views/system/staff/index.vue     | 70 ++++++++++++++++++++++------
 3 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/src/api/system/staff.js b/src/api/system/staff.js
index 09ec8e8..1abdb19 100644
--- a/src/api/system/staff.js
+++ b/src/api/system/staff.js
@@ -68,3 +68,11 @@ export function clearAllStaff() {
   })
 }
 
+
+export function reEmployment(id) {
+  return request({
+    url: '/system/staff/reEmployment/' + id,
+    method: 'post'
+  })
+}
+
diff --git a/src/views/attendance/param/index.vue b/src/views/attendance/param/index.vue
index ad6fde2..52ea409 100644
--- a/src/views/attendance/param/index.vue
+++ b/src/views/attendance/param/index.vue
@@ -111,7 +111,7 @@
           <el-input v-model="form.paramValue" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="说明" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" disabled/>
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
 <!--        <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
diff --git a/src/views/system/staff/index.vue b/src/views/system/staff/index.vue
index d2afc21..c447dbf 100644
--- a/src/views/system/staff/index.vue
+++ b/src/views/system/staff/index.vue
@@ -150,6 +150,11 @@
 
       <el-table-column label="部门" align="center" fixed="left"  width="90"  prop="deptName" />
       <el-table-column label="员工编码" align="center"  width="90"  prop="code" />
+      <el-table-column label="员工岗位" align="center" prop="jobCode">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.job_info" :value="scope.row.jobCode"/>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="编号" align="center" prop="code" /> -->
       <el-table-column label="身份证号" align="center" prop="idCard" width="180"/>
       <el-table-column label="性别" align="center" prop="sex">
@@ -221,6 +226,7 @@
             size="mini"
             type="text"
             icon="el-icon-info"
+            v-if="scope.row.status!=-1"
             @click="handleDetail(scope.row)"
             v-hasPermi="['system:staff:detail']"
           >查看详情</el-button>
@@ -228,6 +234,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="scope.row.status!=-1"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:staff:edit']"
           >修改</el-button>
@@ -243,6 +250,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="scope.row.status!=-1"
             @click="handleDelay(scope.row)"
             v-hasPermi="['system:staff:delay']"
           >工资延期</el-button>
@@ -254,6 +262,14 @@
             @click="handleJobStatus(scope.row)"
             v-hasPermi="['system:staff:jobStatus']"
           >离职</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status==-1"
+            icon="el-icon-edit"
+            @click="reEmployment(scope.row)"
+            v-hasPermi="['system:staff:reEmployment']"
+          >重新入职</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -380,13 +396,38 @@
           </el-form-item>
         </el-col>
       </el-row>
-
         <el-row>
+          <el-col :span="12">
+          <el-form-item label="所属公司：" prop="companyName">
+            <el-select v-model="form.companyName" placeholder="请选择公司">
+              <el-option
+                v-for="dict in dict.type.sys_company"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位：" prop="jobCode">
+              <el-select v-model="form.jobCode" placeholder="请选择岗位">
+                <el-option
+                  v-for="dict in dict.type.job_info"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="是否负责人：" prop="isLeader">
               <el-select v-model="form.isLeader" placeholder="请选择是不是负责人" clearable>
@@ -507,18 +548,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-          <el-form-item label="所属公司：" prop="companyName">
-            <el-select v-model="form.companyName" placeholder="请选择公司">
-              <el-option
-                v-for="dict in dict.type.sys_company"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          </el-col>
+          
           <el-col :span="12">
             <el-form-item label="备注：" prop="remarks">
               <el-input v-model="form.remarks" placeholder="请输入备注" />
@@ -870,7 +900,7 @@
 
 
 <script>
-import { listStaff, getStaff, delStaff, addStaff, updateStaff, clearAllStaff } from '@/api/system/staff'
+import { listStaff, getStaff, delStaff, addStaff, updateStaff, clearAllStaff,reEmployment } from '@/api/system/staff'
 import {  getDetailByUser,updateDetail } from "@/api/system/staffDetail";
 import { listAllDepts } from '@/api/system/dept';
 import { listAllOptions } from '@/api/personnelMatters/subsidyInformation';
@@ -880,7 +910,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Staff",
-  dicts: ['sys_user_sex', 'sys_level','sys_yes_no','sys_worker_status','sys_contract','sys_company','time_clock'],
+  dicts: ['sys_user_sex', 'sys_level','sys_yes_no','sys_worker_status','sys_contract','sys_company','time_clock','job_info'],
   components: { Treeselect },
   data() {
     return {
@@ -1229,6 +1259,16 @@ export default {
         this.title = "离职对话框";
       });
     },
+    reEmployment(row){
+      reEmployment(row.userId).then(response => {
+        if(response.data.code==200){
+          this.$modal.msgSuccess("重新入职成功");
+          this.getList();
+        }else{
+          this.$modal.msgError(response.data.msg);
+        }
+      });
+    },
     //员工全额工资对话框
     handleDelay(row){
       this.reset();