修改

src/api/personnel/holiday/index.js

@@ -12,7 +12,7 @@ export function listHoliday(query) {
 // 查询详细
 export function getHoliday(dictId) {
   return request({
-    url: '/personnel/holiday/annual-leave/get/get?id=' + dictId,
+    url: '/personnel/holiday/annual-leave/get?id=' + dictId,
     method: 'get'
   })
 }

src/views/personnel/holiday/index.vue

@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="职位" prop="position">
         <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
-          <el-option v-for="item in postOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name">
           </el-option>
         </el-select>
       </el-form-item>
@@ -21,13 +21,13 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="holidayList">
-      <el-table-column label="员工" align="center" prop="entryName" min-width="100" />
+      <el-table-column label="员工" align="center" prop="name" min-width="100" />
       <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="entryDate" min-width="150" />
-      <el-table-column label="员工状态" align="center" prop="status" min-width="100">
+      <el-table-column label="员工状态" align="center" prop="employeeStatus" min-width="100">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.EMPLOYEE_STATUS" :value="scope.row.employeeStatus" />
         </template>
       </el-table-column>
       <el-table-column label="基准天数" align="center" prop="baseAnnualLeave" min-width="100" />
@@ -83,8 +83,8 @@
           <div class="field-name">员工状态</div>
         </div>
         <div class="field-component">
-          <span :title="form.employeeTypeName">
-            <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="form.employeeType"/>
+          <span :title="form.employeeStatus">
+            <dict-tag :type="DICT_TYPE.EMPLOYEE_STATUS" :value="form.employeeStatus"/>
           </span>
         </div>
       </div>
@@ -122,6 +122,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { listHoliday, getHoliday } from "@/api/personnel/holiday/index";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -171,6 +172,11 @@ export default {
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      listSimplePosts().then(response => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
     },
     /** 转换部门数据结构 */
     normalizer(node) {
@@ -199,7 +205,7 @@ export default {
         entryName: undefined,
         deptId: undefined,
         position: undefined,
-        employeeType: undefined,
+        employeeStatus: undefined,
         gender: undefined,
         birthday: undefined,
         contactNumber: undefined,

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

@@ -19,8 +19,8 @@
         <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"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -60,7 +60,7 @@
       <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="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -301,7 +301,7 @@ export default {
         deptId: undefined,
         position: undefined,
         employeePhone: undefined,
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },

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

@@ -23,8 +23,8 @@
               type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']" />
           </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -64,7 +64,7 @@
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
       <el-table-column label="入职日期" align="center" prop="entryDate" min-width="100" />
       <el-table-column label="转正日期" align="center" prop="conversionDate" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建人" align="center" prop="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -340,7 +340,7 @@ export default {
         position: undefined,
         employeePhone: undefined,
         conversionDate: [],
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },

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

@@ -36,8 +36,8 @@
           placeholder="入职日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -86,7 +86,7 @@
       </el-table-column>
       <el-table-column label="联系电话" align="center" prop="contactNumber" min-width="100" />
       <el-table-column label="入职日期" align="center" prop="entryDate" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建人" align="center" prop="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -405,7 +405,7 @@ export default {
         gender: undefined,
         contactNumber: undefined,
         entryDate: undefined,
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },

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

@@ -19,8 +19,8 @@
         <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"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -60,7 +60,7 @@
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
       <el-table-column label="续签开始日期" align="center" prop="renewContractStartDate" min-width="100" />
       <el-table-column label="续签结束日期" align="center" prop="renewContractEndDate" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建人" align="center" prop="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -365,7 +365,7 @@ export default {
         deptId: undefined,
         position: undefined,
         employeePhone: undefined,
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },

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

@@ -25,8 +25,8 @@
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -66,7 +66,7 @@
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
       <el-table-column label="入职日期" align="center" prop="entryDate" min-width="100" />
       <el-table-column label="离职日期" align="center" prop="turnoverDate" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建人" align="center" prop="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -307,7 +307,7 @@ export default {
         position: undefined,
         employeePhone: undefined,
         turnoverDate: [],
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },