员工信息改版

src/api/personnelMatters/subsidyInformation.js

@@ -0,0 +1,86 @@
+import request from '@/utils/request'
+
+// 查询补助管理列表
+export function listSubsidyInfo(query) {
+  return request({
+    url: '/personnelMatters/subsidyInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询补助管理详细
+export function getSubsidyInfo(id) {
+  return request({
+    url: '/personnelMatters/subsidyInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增补助管理
+export function addSubsidyInfo(data) {
+  return request({
+    url: '/personnelMatters/subsidyInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改补助管理
+export function updateSubsidyInfo(data) {
+  return request({
+    url: '/personnelMatters/subsidyInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除补助管理
+export function delSubsidyInfo(id) {
+  return request({
+    url: '/personnelMatters/subsidyInfo/' + id,
+    method: 'delete'
+  })
+}
+
+export function listAllOptions(){
+  return request({
+    url: '/personnelMatters/subsidyInfo/getOption',
+    method: 'post'
+  })
+}
+
+
+export function validatorAmount (rule, value, callback){
+  if (!value) {
+    return callback(new Error('补助金额不能为空'));
+  }
+    value = parseInt(value);
+    if (!Number.isInteger(value)) {
+      callback(new Error('请输入数字值'));
+    } else {
+      if (value < 0) {
+        callback(new Error('补助金额不能小于0'));
+      } else {
+        callback();
+      }
+    }
+};
+
+
+export function validatorName (rule, value, callback){
+  
+  request({
+    url: '/personnelMatters/subsidyInfo/checkName',
+    method: 'post',
+    data: {"name":value}
+  }).then(response => {
+   if(response.data){
+      callback(new Error('当前补助已经存在'));
+   }else{
+      callback();
+   }
+  });
+};
+
+

src/api/system/staffDetail.js

@@ -26,3 +26,12 @@ export function updateDetail(data) {
     data: data
   })
 }
+
+
+// 查询员工详情列表
+export function getDetailByUser(id) {
+  return request({
+    url: '/system/staffDetail/byUser/'+id,
+    method: 'get',
+  })
+}

src/views/personnelMatters/subsidyInformation/index.vue

@@ -0,0 +1,188 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['personnelMatters:subsidyInformation:add']"
+        >新增</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="subsidyList" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="补助名称" align="center" prop="name" />
+      <el-table-column label="补助金额" align="center" prop="value" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['personnelMatters:subsidyInformation:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['personnelMatters:subsidyInformation:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改补助管理对话框 -->
+    <el-dialog :title="title" v-dialog-drag :visible.sync="open" width="350px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="98px">
+        <el-form-item label="补助名称：" prop="name">
+          <el-input v-model="form.name" placeholder="请输入补助名称" />
+        </el-form-item>
+        <el-form-item label="补助金额：" prop="value">
+          <el-input v-model="form.value" placeholder="请输入补助金额" >
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注：" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSubsidyInfo, getSubsidyInfo, delSubsidyInfo, addSubsidyInfo, updateSubsidyInfo, validatorAmount, validatorName } from "@/api/personnelMatters/subsidyInformation";
+
+export default {
+  name: "Subsidy",
+  dicts: [ 'sys_level'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 补助管理表格数据
+      subsidyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      xl: true,
+      ht: true,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "补助名称不能为空", trigger: "blur" },
+          { validator: validatorName, message: '当前补助已存在', trigger: 'blur' }
+        ],
+        value: [
+          { required: true, message: "补助金额不能为空", trigger: "blur" },
+          { validator: validatorAmount, trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询补助管理列表 */
+    getList() {
+      this.loading = true;
+      listSubsidyInfo(this.queryParams).then(response => {
+        this.subsidyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        name: null,
+        value: null,
+        remarks: null,
+      };
+      this.resetForm("form");
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加补助管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getSubsidyInfo(row.id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改补助管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSubsidyInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSubsidyInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除补助为"' + row.name + '"的数据项？').then(function() {
+        return delSubsidyInfo(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
+
+
+  }
+};
+</script>

src/views/system/staff/index.vue

@@ -42,16 +42,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="履历：" prop="experience">
+      <!-- <el-form-item label="履历：" prop="experience">
         <el-input
           v-model="queryParams.experience"
           placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="所属公司：" prop="companyName">
-        <el-select v-model="queryParams.companyName" placeholder="请选择在职状态" clearable>
+        <el-select v-model="queryParams.companyName" placeholder="请选择所属公司" clearable>
           <el-option
             v-for="dict in dict.type.sys_company"
             :key="dict.value"
@@ -132,38 +132,50 @@
     <el-table v-loading="loading" :data="staffList" >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="姓名" align="center" fixed="left" width="90" prop="name" />
-      <el-table-column label="部门" align="center" fixed="left" width="90"  prop="deptName" />
+      
-      <el-table-column label="编号" align="center" prop="code" />
+      <el-table-column label="所属公司" align="center" fixed="left" prop="companyName" >
-      <el-table-column label="身份证号" align="center" prop="idCard" width="100"/>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_company" :value="scope.row.companyName"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="部门" align="center" fixed="left"  width="90"  prop="deptName" />
+      <!-- <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">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
         </template>
       </el-table-column>
       <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="电话" align="center" prop="phone" width="110"/>
-      <el-table-column label="住址" align="center" prop="address" />
+      <el-table-column label="住址" align="center" show-overflow-tooltip prop="address" />
+      <el-table-column label="毕业学校" align="center" show-overflow-tooltip prop="school" />
+      <el-table-column label="专业" align="center" prop="major" />
       <el-table-column label="学历" align="center" prop="level">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_level" :value="scope.row.level"/>
         </template>
       </el-table-column>
-      <el-table-column label="专业" align="center" prop="major" />
+      <el-table-column label="开户行" align="center" show-overflow-tooltip prop="bank" />
-      <el-table-column label="毕业学校" align="center" prop="school" />
+      <el-table-column label="银行卡号" align="center" show-overflow-tooltip prop="bankNumber" width="90"/>
-      <el-table-column label="银行卡号" align="center" prop="bankNumber" width="90"/>
+      
-      <el-table-column label="开户行" align="center" prop="bank" />
       <el-table-column label="入职日期" align="center" prop="employmentDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.employmentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="试用期限" align="center" prop="workerTerm"/>
+      <el-table-column label="试用期限" align="center" prop="workerTerm">
+        <template slot-scope="scope">
+          <span>{{ scope.row.workerTerm }}月</span>
+        </template>
+      </el-table-column>
       <el-table-column label="在职状态" align="center" prop="status" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_worker_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="转正日期" align="center" prop="regularDate" width="100">
+      <!-- <el-table-column label="转正日期" align="center" prop="regularDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.regularDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -172,38 +184,32 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.wagesRatioDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="离职日期" align="center" prop="quitDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.quitDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="合同-起" align="center" prop="contractStart" width="100">
+      <el-table-column label="合同-起止时间" align="center" prop="contractStart" width="200">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.contractStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.contractStart, '{y}-{m}-{d}') }}至{{ parseTime(scope.row.contractEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="合同-止" align="center" prop="contractEnd" width="100">
+      <el-table-column label="工龄" align="center" prop="seniority" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.contractEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ scope.row.seniority }}年</span>
         </template>
       </el-table-column>
-      <el-table-column label="工龄" align="center" prop="seniority" />
       <el-table-column label="社保" align="center" prop="socialType" />
       <el-table-column label="加班费" align="center" prop="isOvertimePay" />
       <el-table-column label="住宿标识" align="center" prop="zsFlag" />
-      <el-table-column label="保密合同" align="center" prop="secrecy" />
+      <!-- <el-table-column label="保密合同" align="center" prop="secrecy" /> -->
       <el-table-column label="工伤" align="center" prop="injury" />
       <el-table-column label="雇主险" align="center" prop="insurance" />
-      <el-table-column label="履历" align="center" prop="experience" />
+      <!-- <el-table-column label="履历" align="center" prop="experience" /> -->
       <el-table-column label="介绍人" align="center" prop="introducer" />
       <el-table-column label="打卡" align="center" prop="clockIn" />
-      <el-table-column label="所属公司" align="center" prop="companyName" >
+      <!-- <el-table-column label="备注" align="center" prop="remarks" /> -->
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_company" :value="scope.row.companyName"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" fixed="right" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -259,17 +265,117 @@
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="128px">
         <el-row>
-          <el-col :span="12">
+          <el-container>
-            <el-form-item label="姓名：" prop="name">
+            <el-container>
-              <el-input v-model="form.name" placeholder="请输入姓名" />
+              <el-aside style="width: 50%; background-color: white; padding: 0px; margin-bottom: 0px;">
-            </el-form-item>
+                <el-row>
-          </el-col>
+                  <el-row>
-          <el-col :span="12">
+                    <el-col :span="24">
-            <el-form-item label="身份证号：" prop="idCard">
+                      <el-form-item label="姓名：" prop="name">
-              <el-input v-model="form.idCard" placeholder="请输入身份证号" />
+                          <el-input v-model="form.name" placeholder="请输入姓名" />
-            </el-form-item>
+                      </el-form-item>
-          </el-col>
+                    </el-col>
-        </el-row>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="身份证号：" prop="idCard">
+                        <el-input v-model="form.idCard" placeholder="请输入身份证号" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="电话：" prop="phone">
+                        <el-input v-model="form.phone" placeholder="请输入电话" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-row>
+              </el-aside>
+              <el-container>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="头像：" align="center" prop="imageUrl">
+                      <el-upload
+                        class="avatar-uploader"
+                        :action="url +'/common/upload/avatar'"
+                        auto-upload
+                        :show-file-list="false"
+                        :on-success="handleAvatarSuccess"
+                        :before-upload="beforeAvatarUpload">
+                        <img v-if="form.imageUrl" :src="form.imageUrl" class="avatar">
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      </el-upload>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-container>
+            </el-container>
+          </el-container>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="住址：" prop="address">
+            <el-input v-model="form.address" placeholder="请输入住址" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item  label="打卡位置：" prop="timeClock">
+            <el-select v-model="form.timeClock" placeholder="选择打卡机" clearable >
+              <el-option
+                v-for="dict in dict.type.time_clock"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+      <el-col :span="12">
+          <el-form-item label="毕业学校：" prop="school">
+            <el-input v-model="form.school" placeholder="请输入毕业学校" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="专业：" prop="major">
+            <el-input v-model="form.major" placeholder="请输入专业" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="学历：" prop="level">
+            <el-select v-model="form.level" placeholder="请选择学历">
+              <el-option
+                v-for="dict in dict.type.sys_level"
+                :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="introducer">
+            <el-input v-model="form.introducer" placeholder="请输入介绍人" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="开户行：" prop="bank">
+            <el-input v-model="form.bank" placeholder="请输入开户行" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="银行卡号：" prop="bankNumber">
+            <el-input v-model="form.bankNumber" placeholder="请输入银行卡号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
@@ -277,69 +383,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否领导：" prop="isLeader">
+            <el-form-item label="是否负责人：" prop="isLeader">
-              <el-select v-model="form.isLeader" placeholder="请选择是不是领导" clearable>
+              <el-select v-model="form.isLeader" placeholder="请选择是不是负责人" clearable>
                 <el-option label="是" value="是" />
                 <el-option label="否" value="否" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="电话：" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="住址：" prop="address">
-              <el-input v-model="form.address" placeholder="请输入住址" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="学历：" prop="level">
-              <el-select v-model="form.level" placeholder="请选择学历">
-                <el-option
-                  v-for="dict in dict.type.sys_level"
-                  :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="school">
-              <el-input v-model="form.school" placeholder="请输入毕业学校" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="专业：" prop="major">
-              <el-input v-model="form.major" placeholder="请输入专业" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="介绍人：" prop="introducer">
-              <el-input v-model="form.introducer" placeholder="请输入介绍人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="银行卡号：" prop="bankNumber">
-              <el-input v-model="form.bankNumber" placeholder="请输入银行卡号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开户行：" prop="bank">
-              <el-input v-model="form.bank" placeholder="请输入开户行" />
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="入职日期：" prop="employmentDate">
@@ -353,7 +404,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="试用期限：" prop="workerTerm">
-              <el-input v-model="form.workerTerm" placeholder="请输入试用期限" />
+              <el-input v-model="form.workerTerm" placeholder="请输入试用期限" >
+                <template slot="append">月</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -381,33 +434,15 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="加班费：" prop="isOvertimePay">
+            <el-form-item label="是否打卡：" prop="clockIn">
-              <el-select v-model="form.isOvertimePay" placeholder="请选择有加班费" clearable>
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="打卡：" prop="clockIn">
               <el-select v-model="form.clockIn" placeholder="请选择打卡" clearable>
                 <el-option label="是" value="是" />
                 <el-option label="否" value="否" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
-            <el-form-item label="保密合同：" prop="secrecy">
+            <el-form-item label="是否住宿：" prop="zsFlag">
-              <el-select v-model="form.secrecy" placeholder="请选择保密合同" clearable>
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="住宿标识：" prop="zsFlag">
               <el-select v-model="form.zsFlag" placeholder="请选择住宿标识" clearable>
                 <el-option label="是" value="是" />
                 <el-option label="否" value="否" />
@@ -417,7 +452,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="工伤：" prop="injury">
+            <el-form-item label="单工伤：" prop="injury">
               <el-select v-model="form.injury" placeholder="请选择工伤" clearable>
                 <el-option label="是" value="是" />
                 <el-option label="否" value="否" />
@@ -434,14 +469,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="是否新农合：" prop="socialSubsidy">
-              <el-select v-model="form.socialSubsidy" placeholder="请选择是否新农合" clearable>
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="社保：" prop="socialType">
               <el-select v-model="form.socialType" placeholder="请选择社保" clearable>
@@ -451,29 +478,27 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
-            <el-form-item label="合同期限：" prop="contractType">
+            <el-form-item label="社保补助：" prop="socialSubsidy">
-              <el-select v-model="form.contractType" placeholder="请选择合同期限">
+              <el-select v-model="form.socialSubsidy" placeholder="请选择是否新农合" clearable>
-                <el-option
+                <el-option label="享有" value="是" />
-                  v-for="dict in dict.type.sys_contract"
+                <el-option label="不享有" value="否" />
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
-            <el-form-item label="全额工资日期：" prop="wagesRatioDate">
+        <el-row>
-              <el-date-picker clearable style="width: 200px;"
+          <el-col :span="24">
-                              v-model="form.wagesRatioDate"
+          <el-form-item label="享有补贴：">
-                              type="date"
+            <el-select v-model="form.subsidyList" multiple placeholder="请选择福利补贴" style="width: 100%;">
-                              value-format="yyyy-MM-dd"
+              <el-option
-                              placeholder="请选择合同-止">
+                v-for="subsidy in subsidyOptions"
-              </el-date-picker>
+                :key="subsidy.key"
-            </el-form-item>
+                :label="subsidy.value"
+                :value="subsidy.key"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -586,22 +611,193 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+  <!-- 员工详情 -->
+    <el-dialog v-dialog-drag :title="infoTitle" :visible.sync="openInfo" width="80%" append-to-body :close-on-click-modal="false">
+      <el-form ref="infoForm" :model="infoForm" :rules="infoRules" label-width="98px">
+        <el-divider content-position="left">基本详情</el-divider>
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="基本工资" prop="basicSalary">
+              <el-input v-model="infoForm.basicSalary" placeholder="基本工资" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="岗位工资" prop="jobsSalary">
+              <el-input v-model="infoForm.jobsSalary" placeholder="岗位工资" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="日薪" prop="dailyWage">
+              <el-input v-model="infoForm.dailyWage" placeholder="日薪" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="其他补助" prop="otherSubsidies">
+              <el-input v-model="infoForm.otherSubsidies" placeholder="其他补助" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="固定补助" prop="fixedAllowance">
+              <el-input v-model="infoForm.fixedAllowance" placeholder="固定补助" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="其他扣款" prop="deductions">
+              <el-input v-model="infoForm.deductions" placeholder="其他扣款" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="left">个税抵扣详情</el-divider>
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="子女教育" prop="childrenEducation">
+              <el-input v-model="infoForm.childrenEducation" placeholder="子女教育" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="继续教育" prop="adultEducation">
+              <el-input v-model="infoForm.adultEducation" placeholder="继续教育" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="住房贷款" prop="housingLoans">
+              <el-input v-model="infoForm.housingLoans" placeholder="住房贷款">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="住房租金" prop="housingRents">
+              <el-input v-model="infoForm.housingRents" placeholder="住房租金" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="赡养老人" prop="supportTheOld">
+              <el-input v-model="infoForm.supportTheOld" placeholder="赡养老人" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="大病医疗" prop="treatmentForSeriousDisease">
+              <el-input v-model="infoForm.treatmentForSeriousDisease" placeholder="大病医疗" >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="left">补助详情</el-divider>
+        <el-row>
+          <el-col :span="4" v-for="(val,key) in infoForm.extendeds" :key="key">
+            <el-form-item :label="key">
+              <el-input :value="val" disabled >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="left">其他详情</el-divider>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="本年累计已发工资">
+              <el-input v-model="infoForm.totalWages" disabled  >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="本年累计专项附加扣除">
+              <el-input v-model="infoForm.specialDeduction" disabled  >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="本年累计已缴个税" >
+              <el-input v-model="infoForm.aggregatePersonalIncomeTax" disabled >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model="infoForm.remarks" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitInfoForm">确 定</el-button>
+        <el-button @click="cancelInfo">取 消</el-button>
+      </div>
+    </el-dialog>
+
+
   </div>
 </template>
 
+
+<style>
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 150px;
+    height: 137px;
+    line-height: 137px;
+    text-align: center;
+  }
+  .avatar {
+    width: 150px;
+    height: 137px;
+    display: block;
+  }
+</style>
+
+
 <script>
 import { listStaff, getStaff, delStaff, addStaff, updateStaff, clearAllStaff } from '@/api/system/staff'
+import {  getDetailByUser,updateDetail } from "@/api/system/staffDetail";
 import { listAllDepts } from '@/api/system/dept';
+import { listAllOptions } from '@/api/personnelMatters/subsidyInformation';
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 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'],
+  dicts: ['sys_user_sex', 'sys_level','sys_yes_no','sys_worker_status','sys_contract','sys_company','time_clock'],
   components: { Treeselect },
   data() {
     return {
+      url: process.env.VUE_APP_BASE_URL,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -612,10 +808,14 @@ export default {
       staffList: [],
       //部门列表
       deptOptions: [],
+      //补贴列表
+      subsidyOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      openInfo: false,
+      infoTitle: "员工详情信息",
       //员工离职
       openWorker: false,
       //全额,离职，转正显示标识
@@ -660,6 +860,11 @@ export default {
       },
       // 表单参数
       form: {},
+      //详情form表单
+      infoForm:{},
+      infoRules: {
+       
+      },
       // 表单校验
       rules: {
         name: [
@@ -713,14 +918,47 @@ export default {
         companyName: [
           { required: true, message: "所属公司不能为空", trigger: "blur" },
         ],
+        imageUrl:[
+          { required: true, message: "请上传员工头像", trigger: "blur" },
+        ],
+        timeClock: [
+          { required: true, message: "打卡机不能为空", trigger: "blur" }
+        ],
       }
     };
   },
   created() {
     this.getList();
     this.getDeptList();
+    this.getSubsidyList();
   },
   methods: {
+      //上传头像
+      handleAvatarSuccess(res, file) {
+        this.form.imageUrl = res.url;
+        this.form.fileId = res.fileId;
+      },
+      //上传前检查头像格式
+      beforeAvatarUpload(file) {
+        const isJPG = file.type === 'image/jpeg';
+        const isLt5M = file.size / 1024 / 1024 < 5;
+
+        if (!isJPG) {
+          this.$message.error('上传头像图片只能是 JPG 格式!');
+        }
+        if (!isLt5M) {
+          this.$message.error('上传头像图片大小不能超过 5MB!');
+        }
+        return isJPG && isLt5M;
+      },
+    /**获取补贴 */
+    getSubsidyList(){
+      listAllOptions().then(response => {
+        this.subsidyOptions = response.data;
+      });
+      
+    },
+
     /** 获取部门 */
     getDeptList(){
       listAllDepts().then(response => {
@@ -779,6 +1017,10 @@ export default {
         status: null,
         socialSubsidy: null,
         companyName: null,
+        imageUrl:null,
+        fileId:null,
+        timeClock:null,
+        subsidyList:null
       };
       this.resetForm("form");
     },
@@ -920,15 +1162,7 @@ export default {
         }
       });
     },
-    //查看详情
+    
-    handleDetail(row){
-      this.$router.push({
-        path: "/system/staffDetail",
-        query: {
-          staffId: row.userId
-        }
-      });
-    },
     //公积金导入
     uploadAccumulationFund(){
       this.uploadFund.title = "五险一金导入";
@@ -958,6 +1192,38 @@ export default {
     },
 
 
+    //查看详情
+    handleDetail(row){
+      getDetailByUser(row.userId).then(response => {
+        this.infoForm = response.data;
+        this.openInfo = true;
+      });
+    },
+    //关闭详情
+    cancelInfo(){
+      this.openInfo = false;
+      this.resetInfo();
+    },
+    resetInfo(){
+      this.infoForm={};
+    },
+
+     /** 提交按钮 */
+     submitInfoForm() {
+      this.$refs["infoForm"].validate(valid => {
+        if (valid) {
+          updateDetail(this.infoForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.openInfo = false;
+          });
+        }
+      });
+    },
+
+    
+
+
+
   }
 };
 </script>

src/views/system/staffDetail/index.vue

@@ -6,13 +6,16 @@
       <el-table-column label="日薪" align="center" prop="dailyWage" />
       <el-table-column label="时薪" align="center" prop="hoursSalary" />
       <el-table-column label="全勤奖" align="center" prop="fullFrequentlySubsidies" />
-      <el-table-column label="学历补助" align="center" prop="levelOfEducationSubsidies" />
+      <el-table-column v-for="(val,key) in detailList[0].extendeds" :key="key" :label="key">
+          <span>{{ val }}</span>
+      </el-table-column>
+      <!-- <el-table-column label="学历补助" align="center" prop="levelOfEducationSubsidies" />
       <el-table-column label="合同补助" align="center" prop="contractSubsidies" />
       <el-table-column label="工龄补助" align="center" prop="senioritySubsidies" />
       <el-table-column label="社保补助" align="center" prop="socialSecuritySubsidies" />
       <el-table-column label="中班补助" align="center" prop="middleSubsidies" />
       <el-table-column label="夜班补助" align="center" prop="nightShiftSubsidies" />
-      <el-table-column label="夜餐补助" align="center" prop="dinnerSubsidies" />
+      <el-table-column label="夜餐补助" align="center" prop="dinnerSubsidies" /> -->
       <el-table-column label="职务津贴" align="center" prop="fixedAllowance" />
       <el-table-column label="其他补助" align="center" prop="otherSubsidies" />
       <el-table-column label="早餐消费" align="center" prop="breakfastExpend" />