修改

src/api/presonnel/employee/data.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listHistoryData(query) {
   return request({
-    url: '/admin-api/presonnel/employee/history/page',
+    url: '/admin-api/personnel/employee/history/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listHistoryData(query) {
 // 查询详细
 export function getHistoryData(dictCode) {
   return request({
-    url: '/admin-api/presonnel/employee/history/get?id=' + dictCode,
+    url: '/admin-api/personnel/employee/history/get?id=' + dictCode,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getHistoryData(dictCode) {
 // 新增
 export function addHistoryData(data) {
   return request({
-    url: '/admin-api/presonnel/employee/history/create',
+    url: '/admin-api/personnel/employee/history/create',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addHistoryData(data) {
 // 修改
 export function updateHistoryData(data) {
   return request({
-    url: '/admin-api/presonnel/employee/history/update',
+    url: '/admin-api/personnel/employee/history/update',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateHistoryData(data) {
 // 删除
 export function delHistoryData(dictCode) {
   return request({
-    url: '/admin-api/presonnel/employee/history/delete?id=' + dictCode,
+    url: '/admin-api/personnel/employee/history/delete?id=' + dictCode,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delHistoryData(dictCode) {
 // 导出
 export function exportHistoryData(query) {
   return request({
-    url: '/admin-api/presonnel/employee/history/delete',
+    url: '/admin-api/personnel/employee/history/delete',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/presonnel/employee/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listEmployee(query) {
   return request({
-    url: '/presonnel/employee/page',
+    url: '/personnel/employee/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listEmployee(query) {
 // 查询详细
 export function getEmployee(dictId) {
   return request({
-    url: '/presonnel/employee/get?id=' + dictId,
+    url: '/personnel/employee/get?id=' + dictId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getEmployee(dictId) {
 // 新增
 export function addEmployee(data) {
   return request({
-    url: '/presonnel/employee/create',
+    url: '/personnel/employee/create',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addEmployee(data) {
 // 修改
 export function updateEmployee(data) {
   return request({
-    url: '/presonnel/employee/update',
+    url: '/personnel/employee/update',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateEmployee(data) {
 // 删除
 export function delEmployee(dictId) {
   return request({
-    url: '/presonnel/employee/delete?id=' + dictId,
+    url: '/personnel/employee/delete?id=' + dictId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delEmployee(dictId) {
 // 导出
 export function exportEmployee(query) {
   return request({
-    url: '/presonnel/employee/export-excel',
+    url: '/personnel/employee/export-excel',
     method: 'get',
     params: query,
     responseEmployee: 'blob'

src/api/personnel/relations/index.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listContract(query) {
+  return request({
+    url: '/personnel/relations/contract/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询详细
+export function getContract(dictId) {
+  return request({
+    url: '/personnel/relations/contract/get?id=' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增
+export function addContract(data) {
+  return request({
+    url: '/personnel/relations/contract/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function updateContract(data) {
+  return request({
+    url: '/personnel/relations/contract/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function delContract(dictId) {
+  return request({
+    url: '/personnel/relations/contract/delete?id=' + dictId,
+    method: 'delete'
+  })
+}
+
+// 导出
+export function exportContract(query) {
+  return request({
+    url: '/personnel/relations/contract/export-excel',
+    method: 'get',
+    params: query,
+    responseContract: 'blob'
+  })
+}

src/api/presonnel/relations/data.js

@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询列表
-export function listHistoryData(query) {
-  return request({
-    url: '/admin-api/presonnel/employee/history/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询详细
-export function getHistoryData(dictCode) {
-  return request({
-    url: '/admin-api/presonnel/employee/history/get?id=' + dictCode,
-    method: 'get'
-  })
-}
-
-// 新增
-export function addHistoryData(data) {
-  return request({
-    url: '/admin-api/presonnel/employee/history/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改
-export function updateHistoryData(data) {
-  return request({
-    url: '/admin-api/presonnel/employee/history/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除
-export function delHistoryData(dictCode) {
-  return request({
-    url: '/admin-api/presonnel/employee/history/delete?id=' + dictCode,
-    method: 'delete'
-  })
-}
-
-// 导出
-export function exportHistoryData(query) {
-  return request({
-    url: '/admin-api/presonnel/employee/history/delete',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/presonnel/relations/index.js

@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询列表
-export function listEmployee(query) {
-  return request({
-    url: '/presonnel/employee/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询详细
-export function getEmployee(dictId) {
-  return request({
-    url: '/presonnel/employee/get?id=' + dictId,
-    method: 'get'
-  })
-}
-
-// 新增
-export function addEmployee(data) {
-  return request({
-    url: '/presonnel/employee/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改
-export function updateEmployee(data) {
-  return request({
-    url: '/presonnel/employee/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除
-export function delEmployee(dictId) {
-  return request({
-    url: '/presonnel/employee/delete?id=' + dictId,
-    method: 'delete'
-  })
-}
-
-// 导出
-export function exportEmployee(query) {
-  return request({
-    url: '/presonnel/employee/export-excel',
-    method: 'get',
-    params: query,
-    responseEmployee: 'blob'
-  })
-}

src/api/system/user.js

@@ -5,7 +5,7 @@ import { praseStrEmpty } from "@/utils/ruoyi";
 export function listUser(query) {
   return request({
     // url: '/system/user/page',
-    url: '/presonnel/employee/page',
+    url: '/personnel/employee/page',
     method: 'get',
     params: query
   })

src/router/index.js

@@ -228,9 +228,9 @@ export const constantRoutes = [
     hidden: true,
     children: [{
       path: 'historyData/:Id(\\d+)',
-      component: (resolve) => require(['@/views/presonnel/employee/data'], resolve),
+      component: (resolve) => require(['@/views/personnel/employee/data'], resolve),
       name: 'EmployeeHistoryData',
-      meta: { title: '员工信息修改记录', icon: '', activeMenu: '/presonnel/employee' }
+      meta: { title: '员工信息修改记录', icon: '', activeMenu: '/personnel/employee' }
     }
     ]
   },

src/views/oa/renew/edit.vue

@@ -171,7 +171,7 @@ export default {
         renewReason: undefined,
 
         workPerformance: undefined,
-        files: undefined,
+        fileIdList: undefined,
         remarks: undefined,
         peopleList: '',
       },
@@ -310,7 +310,6 @@ export default {
           this.nikeNamelist = [];
         }
         this.tasks = response.data.auditRecordList?response.data.auditRecordList:[];
-        
       });
     },
     /** 查询部门列表 */

src/views/presonnel/employee/data.vue

@@ -208,7 +208,7 @@
   </div>
 </template>
 <script>
-import { listHistoryData, getHistoryData, delHistoryData, exportHistoryData } from "@/api/presonnel/employee/data";
+import { listHistoryData, getHistoryData, delHistoryData, exportHistoryData } from "@/api/personnel/employee/data";
 import { DICT_TYPE } from '@/utils/dict'
 
 export default {

src/views/presonnel/employee/index.vue

@@ -12,10 +12,6 @@
           <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -25,11 +21,11 @@
     <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="['system:dict:create']">新增</el-button>
+                   v-hasPermi="['personnel:employee:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:dict:export']">导出</el-button>
+                   v-hasPermi="['personnel:employee:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -57,11 +53,11 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:dict:update']">修改</el-button>
+                     v-hasPermi="['personnel:employee:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
+                     v-hasPermi="['personnel:employee:delete']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-                     v-hasPermi="['system:dict:detail']">详情</el-button>
+                     v-hasPermi="['personnel:employee:detail']">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -388,7 +384,7 @@
 </template>
 
 <script>
-import { listEmployee, getEmployee, delEmployee, addEmployee, updateEmployee, exportEmployee } from "@/api/presonnel/employee/index";
+import { listEmployee, getEmployee, delEmployee, addEmployee, updateEmployee, exportEmployee } from "@/api/personnel/employee/index";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listDept } from "@/api/system/dept";
@@ -616,3 +612,65 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.widget-wrapper>.widget-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.x-grid-col-6 {
+  width: 50%;
+}
+
+.x-grid-col-12 {
+  width: 100%;
+}
+
+.fx-field {
+  line-height: 20px;
+  padding: 7px 12px 12px;
+  position: relative;
+}
+
+.fx-field .field-label {
+  word-wrap: break-word;
+  color: #141e31;
+  display: flex;
+  font-weight: 600;
+  line-height: 20px;
+  padding: 5px 0;
+  position: relative;
+  word-break: break-word;
+}
+
+.fx-field .field-label .field-required {
+  color: #eb5050;
+  margin-left: -6px;
+  position: relative;
+}
+
+.fx-field .field-label .field-name {
+  overflow: hidden;
+}
+
+.field-component {
+  word-wrap: break-word;
+  background: #f5f6f8;
+  border-radius: 2px;
+  color: #141e31;
+  font-size: 14px;
+  line-height: 20px;
+  min-height: 32px;
+  padding: 6px 8px;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+ul {
+  padding-left: 0px !important;
+}
+
+.el-tag+.el-tag {
+  margin-left: 10px;
+}
+</style>

src/views/personnel/relations/index.vue

@@ -0,0 +1,573 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="员工姓名" prop="employeeName">
+        <el-input v-model="queryParams.employeeName" placeholder="续签人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="部门" prop="deptId">
+        <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions"
+          :normalizer="normalizer" placeholder="选择部门" />
+      </el-form-item>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="手机号" prop="employeePhone">
+        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="审批状态" clearable style="width: 250px">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+            :label="dict.label" :value="parseInt(dict.value)" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <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="['system:dict:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['system:dict:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList">
+      <el-table-column label="员工姓名" align="center" prop="name" min-width="80" />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
+      <el-table-column label="职位" align="center" prop="position" min-width="100" />
+      <el-table-column label="员工手机号" align="center" prop="employeePhone" min-width="100" />
+      <el-table-column label="合同开始日期" align="center" prop="contractStartDate" min-width="100" />
+      <el-table-column label="合同结束日期" align="center" prop="contractEndDate" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" min-width="100">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dict:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dict:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
+            v-hasPermi="['system:dict:detail']">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="员工姓名" prop="employeeName">
+              <el-input v-model="form.employeeName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="display: none;">
+            <el-form-item label="员工ID">
+              <el-input v-model="form.employeeId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="部门">
+              <el-input v-model="form.deptName" placeholder='部门' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="职位">
+              <el-input v-model="form.position" placeholder='职位' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input v-model="form.employeePhone" placeholder='手机号' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开始日期" prop="contractStartDate">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="form.renewContractStartDate" type="date" placeholder="选择日期"
+                style="width: 100%;">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结束日期" prop="contractEndDate">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="form.renewContractEndDate" type="date" placeholder="选择日期"
+                style="width: 100%;">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="合同期限(月)" prop="contractDeadline">
+              <el-input v-model="form.contractDeadline" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder='续签合同期限'></el-input>
+            </el-form-item>
+          </el-col>
+         
+          <el-col :span="24">
+            <el-form-item label="附件">
+              <el-upload :action="fileUrl" :headers="headers" :file-list="files" :on-success="handleFileSuccessCite"
+                :before-upload="beforeUploadFile" :on-remove="handleRemove">
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
+    <!-- 详情对话框 -->
+    <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
+      <div class="widget-wrapper">
+    <div class="widget-list">
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <span class="field-required">*</span>
+          <div class="field-name">员工姓名</div>
+        </div>
+        <div class="field-component">
+          <span>{{ form.employeeName }}</span>
+        </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <div class="field-name">部门</div>
+        </div>
+        <div class="field-component">
+          <span>{{ form.deptName }}</span>
+        </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <div class="field-name">职位</div>
+        </div>
+        <div class="field-component">
+          <span>{{ form.position }}</span>
+        </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <div class="field-name">手机号</div>
+        </div>
+        <div class="field-component">
+          <span>{{ form.employeePhone }}</span>
+        </div>
+      </div>
+      
+
+
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <span class="field-required">*</span>
+          <div class="field-name">开始日期</div>
+        </div>
+        <div class="field-component">
+          <span>{{ form.contractStartDate }}</span>
+        </div>
+      </div>
+
+
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <span class="field-required">*</span>
+          <div class="field-name">结束日期</div>
+        </div>
+        <div class="field-component">
+          <span>{{ form.contractEndDate }}</span>
+        </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <span class="field-required">*</span>
+          <div class="field-name">合同期限</div>
+        </div>
+        <div class="field-component">
+          <span>{{ form.contractDeadline }}</span>
+        </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <div class="field-name">附件</div>
+        </div>
+        <div class="field-component">
+          <div v-for="(item, index) in form.fileList" :key="index">
+            <a :href="item.url" target="_blank" :title="item.name" style="color: #5094d5;">{{ item.name }}</a>
+          </div>
+        </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <div class="field-name">备注</div>
+        </div>
+        <div class="field-component">
+          <span :title="form.birthday">{{ form.remarks }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listContract, getContract, delContract, addContract, updateContract, exportContract } from "@/api/personnel/relations/index";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listDept } from "@/api/system/dept";
+import { DICT_TYPE } from '@/utils/dict'
+import { getBaseHeader } from "@/utils/request";
+export default {
+  name: "SystemDictType",
+  components: {
+    Treeselect,
+  },
+  data() {
+    return {
+      files: [],
+       // 设置上传的请求头部
+       headers: getBaseHeader(),
+      // 上传的地址
+      fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
+      posOptions: [],
+      // 部门列表
+      deptOptions: [], // 部门属性结构
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      openDetail: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        employeeName: undefined,
+        deptId: undefined,
+        postId: undefined,
+        employeePhone: undefined,
+        creator: undefined,
+        createTime: [],
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        employeeName: [
+          { required: true, message: "请选择" }
+        ],
+        contractStartDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        contractEndDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        contractDeadline: [
+          { required: true, message: "请输入合同期限", trigger: "blur" }
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getListDept();
+  },
+  methods: {
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      let fileIds = [];
+      for (let i in fileList) {
+        let id = fileList[i].response.data.id;
+        fileIds.push(id);
+      }
+      this.form.fileIdList = fileIds;
+    },
+    beforeUploadFile(file) {
+      console.log(file);
+      const size = file.size / 1024 / 1024;
+      console.log(size);
+      if (size > 5) {
+        this.$message.error("文件大小不能超过5MB！");
+        return false;
+      }
+    },
+    handleFileSuccessCite(res, file, fileList) {
+      console.log(file, fileList);
+      console.log("------", "==========");
+      console.log("res = ", res);
+
+      let fileIds = [];
+      for (let i in fileList) {
+        let response = fileList[i].response;
+        if (response.errno && response.errno != "0") {
+          this.$message.error("该文件上传失败,已被移除,请重新上传!");
+          // 上传失败移除该 file 对象
+          fileList.splice(i, 1);
+        } else {
+          let id = fileList[i].response.data.id;
+          fileIds.push(id);
+        }
+      }
+      this.form.fileIdList = fileIds;
+    },
+    /** 查询部门列表 */
+    getListDept() {
+      listDept().then(response => {
+        this.deptOptions = this.handleTree(response.data, "id");
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      listContract(this.queryParams).then(response => {
+        this.typeList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        employeeName: undefined,
+        employeeId: undefined,
+        deptName: undefined,
+        position: undefined,
+        employeePhone:undefined,
+
+        contractStartDate: undefined,
+        contractEndDate: undefined,
+        contractDeadline: undefined,
+        fileIdList: undefined,
+        remarks: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.reset();
+      const id = row.id;
+      getContract(id).then(response => {
+        this.form = response.data;
+        this.openDetail = true;
+        this.title = "详情";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getContract(id).then(response => {
+        let files = response.data.fileList;
+        if (files) {
+          this.files = [];
+          for (let i in files) {
+            let url = files[i].url;
+            let name = files[i].name;
+            let id = files[i].id;
+
+            this.files.push({
+              name: name,
+              url: url,
+              response: { error: "0", data: { url: url, id: id } },
+            });
+          }
+        }
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateContract(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addContract(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除字典编号为"' + ids + '"的数据项?').then(function () {
+        return delContract(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return exportContract(params);
+      }).then(response => {
+        this.$download.excel(response, '.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.widget-wrapper>.widget-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.x-grid-col-6 {
+  width: 50%;
+}
+
+.x-grid-col-12 {
+  width: 100%;
+}
+
+.fx-field {
+  line-height: 20px;
+  padding: 7px 12px 12px;
+  position: relative;
+}
+
+.fx-field .field-label {
+  word-wrap: break-word;
+  color: #141e31;
+  display: flex;
+  font-weight: 600;
+  line-height: 20px;
+  padding: 5px 0;
+  position: relative;
+  word-break: break-word;
+}
+
+.fx-field .field-label .field-required {
+  color: #eb5050;
+  margin-left: -6px;
+  position: relative;
+}
+
+.fx-field .field-label .field-name {
+  overflow: hidden;
+}
+
+.field-component {
+  word-wrap: break-word;
+  background: #f5f6f8;
+  border-radius: 2px;
+  color: #141e31;
+  font-size: 14px;
+  line-height: 20px;
+  min-height: 32px;
+  padding: 6px 8px;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+ul {
+  padding-left: 0px !important;
+}
+
+.el-tag+.el-tag {
+  margin-left: 10px;
+}
+</style>

src/views/presonnel/relations/data.vue

@@ -1,281 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-table v-loading="loading" :data="dataList" >
-      <el-table-column label="员工ID" align="center" prop="id" />
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="部门" align="center" prop="deptName" />
-      <el-table-column label="职位" align="center" prop="position" />
-      <el-table-column label="员工编号" align="center" prop="employeeNumber" />
-      <el-table-column label="入职时间" align="center" prop="entryDate" />
-      <el-table-column label="员工状态" align="center" prop="employeeStatus">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.employeeStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前可用年假" align="center" prop="remainingAnnualLeave"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-                     v-hasPermi="['system:dict:detail']">详情</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-     <!-- 详情对话框 -->
-     <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
-      <div class="widget-wrapper">
-        <div class="widget-list" v-loading="loading">
-          <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工姓名</div>
-        </div>
-        <div class="field-component">
-          <span :title="form.name">{{ form.name }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工ID</div>
-        </div>
-        <div class="field-component">
-          <span :title="form.id">{{ form.id }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工部门</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.deptName }}</span>
-        </div>
-      </div>
-    
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工职位</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.position }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工编号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.employeeNumber }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">入职时间</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.entryDate }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">试用期期</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.probationEndDate }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工状态</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.employeeStatus }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">电子邮箱</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.email }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">身份证号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.idCardNumber }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">性别</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.gender }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">最高学历</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.educationLevel }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">手机号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.phone }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">毕业院校</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.graduationSchool }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">毕业时间</div>
-        </div>
-        <div class="field-component">
-          <span >{{ form.graduationDate }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">银行卡号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.bankCardNumber }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">银行卡</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.bankCardName }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">年假基数</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.baseAnnualLeave }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">剩余年假</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.remainingAnnualLeave }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">离职时间</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.departureDate }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">离职原因</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.resignationReason }}</span>
-        </div>
-      </div>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { listHistoryData, getHistoryData, delHistoryData, exportHistoryData } from "@/api/presonnel/employee/data";
-import { DICT_TYPE } from '@/utils/dict'
-
-export default {
-  name: "SystemDictData",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      dataList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      openDetail: false,
-      // 表单参数
-      form: {},
-    };
-  },
-  created() {
-    const dictId = this.$route.params && this.$route.params.Id;
-    this.getType(dictId);
-    this.getTypeList();
-  },
-  methods: {
-    /** 查询字典数据列表 */
-    getList() {
-      this.loading = true;
-      listHistoryData(this.queryParams).then(response => {
-        this.dataList = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-     /** 详情按钮操作 */
-     handleDetail(row) {
-      const id = row.id;
-      getHistoryData(id).then(response => {
-        this.form = response.data;
-        this.openDetail = true;
-        this.title = "详情";
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id;
-      this.$modal.confirm('是否确认删除字典编码为"' + ids + '"的数据项?').then(function() {
-          return delHistoryData(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-          this.exportLoading = true;
-          return exportHistoryData(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '字典数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/presonnel/relations/index.vue

@@ -1,618 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="员工名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入字典名称" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="员工编号" prop="employeeNumber">
-        <el-input v-model="queryParams.employeeNumber" placeholder="请输入" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="员工状态" prop="employeeStatus">
-        <el-select v-model="queryParams.employeeStatus" placeholder="员工状态" clearable style="width: 240px">
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item> -->
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <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="['system:dict:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:dict:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList">
-      <el-table-column label="员工ID" align="center" prop="id" />
-      <el-table-column label="姓名" align="center" :show-overflow-tooltip="true">
-        <template v-slot="scope">
-          <router-link :to="'/employee/historyData/' + scope.row.id" class="link-type">
-            <span>{{ scope.row.name }}</span>
-          </router-link>
-        </template>
-      </el-table-column>
-      <el-table-column label="部门" align="center" prop="deptName" />
-      <el-table-column label="职位" align="center" prop="position" />
-      <el-table-column label="员工编号" align="center" prop="employeeNumber" />
-      <el-table-column label="入职时间" align="center" prop="entryDate" />
-      
-      <el-table-column label="员工状态" align="center" prop="employeeStatus">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.employeeStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前可用年假" align="center" prop="remainingAnnualLeave"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:dict:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
-          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-                     v-hasPermi="['system:dict:detail']">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-     <!-- 添加或修改对话框 -->
-     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="员工姓名" prop="name">
-              <el-input v-model="form.name" placeholder="请输入姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="员工ID">
-              <el-input v-model="form.id" placeholder="请输入员工ID" />
-            </el-form-item>
-          </el-col>
-          
-          <el-col :span="24">
-            <el-form-item label="员工部门" prop="deptId">
-              <treeselect :default-expand-level="1" v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="员工职位" prop="position">
-              <el-input v-model="form.position" placeholder="请选择职位" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="员工编号" prop="employeeNumber">
-              <el-input v-model="form.employeeNumber" placeholder="请输入员工编号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="入职时间" prop="entryDate">
-              <el-date-picker value-format="yyyy-MM-dd" v-model="form.entryDate" type="date" placeholder="选择日期"
-                style="width: 100%;">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="试用期期" prop="probationEndDate">
-              <el-date-picker value-format="yyyy-MM-dd" v-model="form.probationEndDate" type="date" placeholder="选择日期"
-                style="width: 100%;">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-         
-          <el-col :span="12">
-            <el-form-item label="员工状态" prop="employeeStatus">
-              <el-select v-model="form.employeeStatus" placeholder="请选择员工状态" clearable  style="width: 100%;">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.PROMOTION_ACTIVITY_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入电子邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="身份证号" prop="idCardNumber">
-              <el-input v-model="form.idCardNumber" placeholder="请输身份证号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="性别" prop="gender">
-              <el-select v-model="form.gender" placeholder="性别" clearable  style="width: 100%;">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="最高学历" prop="educationLevel">
-              <el-input v-model="form.educationLevel" placeholder="最高学历" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="手机号" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          
-        
-          <el-col :span="12">
-            <el-form-item label="毕业院校" prop="graduationSchool">
-              <el-input v-model="form.graduationSchool" placeholder="毕业院校" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="毕业时间" prop="graduationDate">
-              <el-date-picker value-format="yyyy-MM-dd" v-model="form.graduationDate" type="date" placeholder="选择日期"
-                style="width: 100%;">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="银行卡号" prop="bankCardNumber">
-              <el-input v-model="form.bankCardNumber" placeholder="银行卡号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="银行卡" prop="bankCardName">
-              <el-input v-model="form.bankCardName" placeholder="银行卡名称" />
-            </el-form-item>
-          </el-col>
-         
-          <el-col :span="12">
-            <el-form-item label="年假基数" prop="baseAnnualLeave">
-              <el-input v-model="form.baseAnnualLeave" placeholder="年假基准天数" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="剩余年假" prop="remainingAnnualLeave">
-              <el-input v-model="form.remainingAnnualLeave" placeholder="剩余年假天数" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="离职时间" prop="departureDate">
-              <el-date-picker value-format="yyyy-MM-dd" v-model="form.departureDate" type="date" placeholder="选择日期"
-                style="width: 100%;">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="离职原因" prop="resignationReason">
-              <el-input v-model="form.resignationReason" type="textarea" placeholder="请输入离职原因"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </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>
-     <!-- 详情对话框 -->
-     <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
-      <div class="widget-wrapper">
-        <div class="widget-list" v-loading="loading">
-          <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工姓名</div>
-        </div>
-        <div class="field-component">
-          <span :title="form.name">{{ form.name }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工ID</div>
-        </div>
-        <div class="field-component">
-          <span :title="form.id">{{ form.id }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工部门</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.deptName }}</span>
-        </div>
-      </div>
-    
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工职位</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.position }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工编号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.employeeNumber }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">入职时间</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.entryDate }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">试用期期</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.probationEndDate }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">员工状态</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.employeeStatus }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">电子邮箱</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.email }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">身份证号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.idCardNumber }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">性别</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.gender }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">最高学历</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.educationLevel }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">手机号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.phone }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">毕业院校</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.graduationSchool }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">毕业时间</div>
-        </div>
-        <div class="field-component">
-          <span >{{ form.graduationDate }}</span>
-        </div>
-      </div>
-
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">银行卡号</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.bankCardNumber }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">银行卡</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.bankCardName }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">年假基数</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.baseAnnualLeave }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">剩余年假</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.remainingAnnualLeave }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">离职时间</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.departureDate }}</span>
-        </div>
-      </div>
-      <div class="fx-field x-grid-col-12">
-        <div class="field-label">
-          <div class="field-name">离职原因</div>
-        </div>
-        <div class="field-component">
-          <span>{{ form.resignationReason }}</span>
-        </div>
-      </div>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listEmployee, getEmployee, delEmployee, addEmployee, updateEmployee, exportEmployee } from "@/api/presonnel/employee/index";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { listDept } from "@/api/system/dept";
-import { CommonStatusEnum } from '@/utils/constants'
-import { getDictDatas, DICT_TYPE } from '@/utils/dict'
-
-export default {
-  name: "SystemDictType",
-  components: {
-    Treeselect,
-  },
-  data() {
-    return {
-      // 部门列表
-      deptOptions: [], // 部门属性结构
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      openDetail:false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        name: undefined,
-        employeeNumber: undefined,
-        employeeStatus: undefined,
-        // createTime: []
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "员工姓名不能为空", trigger: "blur" }
-        ],
-        id: [
-          { required: true, message: "员工ID不能为空", trigger: "blur" }
-        ],
-        employeeStatus: [
-          { required: true, message: "员工状态不能为空", trigger: "blur" }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phone: [
-          {
-            pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ],
-      },
-
-      // 枚举
-      CommonStatusEnum: CommonStatusEnum,
-      // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
-    };
-  },
-  created() {
-    this.getList();
-    this.getListDept();
-  },
-  methods: {
-     /** 查询部门列表 */
-     getListDept() {
-      listDept().then(response => {
-        this.deptOptions = this.handleTree(response.data, "id");
-      });
-    },
-    /** 转换部门数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.children
-      };
-    },
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      listEmployee(this.queryParams).then(response => {
-        this.typeList = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        name: undefined,
-        id: undefined,
-        deptId: undefined,
-        position:undefined,
-        employeeNumber: undefined,
-
-        entryDate: undefined,
-        probationEndDate: undefined,
-        employeeStatus: CommonStatusEnum.ENABLE,
-        email: undefined,
-        idCardNumber: undefined,
-
-        gender: CommonStatusEnum.ENABLE,
-        educationLevel: undefined,
-        phone: undefined,
-        graduationSchool: undefined,
-        graduationDate: undefined,
-
-        bankCardNumber: undefined,
-        bankCardName: undefined,
-        baseAnnualLeave: undefined,
-        remainingAnnualLeave: undefined,
-        departureDate: undefined,
-
-        resignationReason: undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加";
-    },
-    
-      /** 详情按钮操作 */
-      handleDetail(row) {
-      this.reset();
-      const id = row.id;
-      getEmployee(id).then(response => {
-        this.form = response.data;
-        this.openDetail = true;
-        this.title = "详情";
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id;
-      getEmployee(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            updateEmployee(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addEmployee(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + ids + '"的数据项?').then(function() {
-          return delEmployee(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      // 执行导出
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-        this.exportLoading = true;
-        return exportEmployee(params);
-      }).then(response => {
-        this.$download.excel(response, '.xls');
-        this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
-};
-</script>