修改

src/api/personnel/employee/data.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listHistoryData(query) {
   return request({
-    url: '/admin-api/personnel/employee/history/page',
+    url: '//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/personnel/employee/history/get?id=' + dictCode,
+    url: '//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/personnel/employee/history/create',
+    url: '//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/personnel/employee/history/update',
+    url: '//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/personnel/employee/history/delete?id=' + dictCode,
+    url: '//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/personnel/employee/history/delete',
+    url: '//personnel/employee/history/delete',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/personnel/relations/entry/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listEntry(query) {
   return request({
-    url: '/presonnel/relations/entry/page',
+    url: '/personnel/relations/entry/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listEntry(query) {
 // 查询详细
 export function getEntry(dictId) {
   return request({
-    url: '/presonnel/relations/entry/get?id=' + dictId,
+    url: '/personnel/relations/entry/get?id=' + dictId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getEntry(dictId) {
 // 新增
 export function addEntry(data) {
   return request({
-    url: '/presonnel/relations/entry/create',
+    url: '/personnel/relations/entry/create',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addEntry(data) {
 // 修改
 export function updateEntry(data) {
   return request({
-    url: '/presonnel/relations/entry/update',
+    url: '/personnel/relations/entry/update',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateEntry(data) {
 // 删除
 export function delEntry(dictId) {
   return request({
-    url: '/presonnel/relations/entry/delete?id=' + dictId,
+    url: '/personnel/relations/entry/delete?id=' + dictId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delEntry(dictId) {
 // 导出
 export function exportEntry(query) {
   return request({
-    url: '/presonnel/relations/entry/export-excel',
+    url: '/personnel/relations/entry/export-excel',
     method: 'get',
     params: query,
     responseEntry: 'blob'

src/api/system/user.js

@@ -4,8 +4,8 @@ import { praseStrEmpty } from "@/utils/ruoyi";
 // 查询用户列表
 export function listUser(query) {
   return request({
-    // url: '/system/user/page',
-    url: '/personnel/employee/page',
+    url: '/system/user/page',
+    // url: '/personnel/employee/page',
     method: 'get',
     params: query
   })

src/views/personnel/employee/data.vue

@@ -228,6 +228,11 @@ export default {
       openDetail: false,
       // 表单参数
       form: {},
+      queryParams : {
+        pageNo: 1,
+        pageSize: 10,
+        id: ''
+      },
     };
   },
   created() {
@@ -237,13 +242,9 @@ export default {
   methods: {
     /** 查询字典数据列表 */
     getList(dataId) {
+      this.queryParams.id = dataId;
       this.loading = true;
-      let queryParams = {
-        pageNo: 1,
-        pageSize: 10,
-        id: dataId,
-      };
-      listHistoryData(queryParams).then(response => {
+      listHistoryData(this.queryParams).then(response => {
         this.dataList = response.data.list;
         this.total = response.data.total;
         this.loading = false;

src/views/personnel/employee/index.vue

@@ -2,14 +2,14 @@
   <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-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-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -73,13 +73,13 @@
               <el-input v-model="form.name" placeholder="请输入姓名" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="员工ID">
               <el-input v-model="form.id" placeholder="请输入员工ID" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="员工部门" prop="deptId">
               <treeselect :default-expand-level="1" v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
             </el-form-item>
@@ -407,7 +407,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 字典表格数据
+      // 员工表格数据
       typeList: [],
       // 弹出层标题
       title: "",
@@ -451,11 +451,6 @@ export default {
           }
         ],
       },
-
-      // 枚举
-      CommonStatusEnum: CommonStatusEnum,
-      // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
     };
   },
   created() {
@@ -499,18 +494,17 @@ export default {
     reset() {
       this.form = {
         name: undefined,
-        id: undefined,
         deptId: undefined,
         position:undefined,
         employeeNumber: undefined,
 
         entryDate: undefined,
         probationEndDate: undefined,
-        employeeStatus: CommonStatusEnum.ENABLE,
+        employeeStatus: undefined,
         email: undefined,
         idCardNumber: undefined,
 
-        gender: CommonStatusEnum.ENABLE,
+        gender: undefined,
         educationLevel: undefined,
         phone: undefined,
         graduationSchool: undefined,
@@ -586,7 +580,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除员工编号为"' + ids + '"的数据项?').then(function() {
           return delEmployee(ids);
         }).then(() => {
           this.getList();

src/views/personnel/relations/contract/index.vue

@@ -44,11 +44,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="['personnel:relations:create']">新增</el-button>
+          v-hasPermi="['relations:contract: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="['personnel:relations:export']">导出</el-button>
+          v-hasPermi="['relations:contract:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -74,11 +74,10 @@
       <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="['personnel:relations:update']">修改</el-button>
+            v-hasPermi="['relations:contract:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['personnel:relations:delete']">删除</el-button>
-          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-            v-hasPermi="['personnel:relations:detail']">详情</el-button>
+            v-hasPermi="['relations:contract:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -101,7 +100,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="部门">
               <el-input v-model="form.deptName" placeholder='部门' disabled></el-input>
             </el-form-item>
@@ -132,7 +131,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同期限(月)" prop="contractDeadline">
+            <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>
@@ -247,11 +246,14 @@
     </div>
   </div>
     </el-dialog>
+    <PeopleSelect ref="peopleSelect" type="single" :isCheck="true" :open="singlePeopleOpen"
+    @cancel="singlePeopleOpen = false" @submit="submitSingle"></PeopleSelect>
   </div>
 </template>
 
 <script>
 import { listContract, getContract, delContract, addContract, updateContract, exportContract } from "@/api/personnel/relations/contract/index";
+import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listDept } from "@/api/system/dept";
@@ -260,6 +262,7 @@ import { getBaseHeader } from "@/utils/request";
 export default {
   name: "SystemDictType",
   components: {
+    PeopleSelect,
     Treeselect,
   },
   data() {
@@ -285,6 +288,7 @@ export default {
       // 弹出层标题
       title: "",
       // 是否显示弹出层
+      singlePeopleOpen: false,
       open: false,
       openDetail: false,
       // 查询参数
@@ -323,6 +327,16 @@ export default {
     this.getListDept();
   },
   methods: {
+    //打开选人弹窗
+    openSingle() {
+      this.singlePeopleOpen = true;
+    },
+    submitSingle(userNamelist, nikeNamelist,userIdList) {
+      console.log(userNamelist);
+      this.form.employeeName = nikeNamelist.join();
+      this.form.employeeId = userIdList.join();
+      this.singlePeopleOpen = false;
+    },
     handleRemove(file, fileList) {
       console.log(file, fileList);
       let fileIds = [];

src/views/personnel/relations/entry/index.vue

@@ -61,11 +61,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="['personnel:relations:create']">新增</el-button>
+          v-hasPermi="['relations:entry: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="['personnel:relations:export']">导出</el-button>
+          v-hasPermi="['relations:entry:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -100,11 +100,10 @@
       <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="['personnel:relations:update']">修改</el-button>
+            v-hasPermi="['relations:entry:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['personnel:relations:delete']">删除</el-button>
-          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
-            v-hasPermi="['personnel:relations:detail']">详情</el-button>
+            v-hasPermi="['relations:entry:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>