请假，入职，离职租户字典调整

src/api/system/tenantDict/data.js

@@ -17,14 +17,6 @@ export function getData(dictCode) {
   })
 }
 
-// 根据字典类型查询字典数据信息
-export function getDicts(dictType) {
-  return request({
-    url: '/system/tenant/dict-data/simple-list' + dictType,
-    method: 'get'
-  })
-}
-
 // 新增字典数据
 export function addData(data) {
   return request({
@@ -68,3 +60,20 @@ export function listSimpleDictDatas() {
     method: 'get',
   })
 }
+
+
+// 根据字典类型获取所有开启状态的数据列表(新增,修改下拉框)
+export function getOpenDicts(dictType) {
+  return request({
+    url: '/system/tenant/dict-data/list-all-simple?dictType=' + dictType,
+    method: 'get',
+  })
+}
+
+// 根据字典类型获取所有状态的数据列表(列表查询下拉框)
+export function getAllDicts(dictType) {
+  return request({
+    url: '/system/tenant/dict-data/list-all?dictType=' + dictType,
+    method: 'get',
+  })
+}

src/views/oa/business/DataList.vue

@@ -72,7 +72,7 @@
       <el-table-column label="开始日期" align="center" prop="startDate" min-width="100" />
       <el-table-column label="结束日期" align="center" prop="endDate" min-width="100" />
       <el-table-column label="出差天数" align="center" prop="day" min-width="100" />
-      <el-table-column label="预估费用" align="center" prop="estimatedCost" min-width="100" />
+      <el-table-column label="预估费用(元)" align="center" prop="estimatedCost" min-width="100" />
       <el-table-column label="申请人" align="center" prop="applyEmployeeName" min-width="80" />
       <el-table-column label="申请时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">

src/views/oa/entry/DataList.vue

@@ -15,7 +15,7 @@
       </el-form-item>
       <el-form-item label="员工类型" prop="employeeType">
         <el-select v-model="queryParams.employeeType" placeholder="员工类型" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+          <el-option v-for="dict in employeeTypeListAll" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
       <el-form-item label="性别" prop="gender">
@@ -98,6 +98,7 @@
 </template>
 
 <script>
+import { getAllDicts } from "@/api/system/tenantDict/data";
 import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/entry"
 import detail from "./detail.vue";
@@ -115,6 +116,7 @@ export default {
   },
   data() {
     return {
+      employeeTypeListAll:[],
       detailLoading:false,
         postOptions: [],
       id:'',
@@ -163,6 +165,9 @@ export default {
         this.postOptions = [];
         this.postOptions.push(...response.data);
       });
+      getAllDicts('tenant_employee_type').then(response => {
+        this.employeeTypeListAll = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {

src/views/oa/entry/edit.vue

@@ -16,7 +16,7 @@
       </el-form-item>
       <el-form-item label="员工类型" prop="employeeType">
         <el-select v-model="form.employeeType" placeholder="请选择" style="width: 100%;">
-          <el-option v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="item.value" :label="item.label"
+          <el-option v-for="item in employeeTypeListOpen" :key="item.value" :label="item.label"
             :value="item.value">
           </el-option>
         </el-select>
@@ -117,6 +117,7 @@
 </template>
 
 <script>
+import { getOpenDicts } from "@/api/system/tenantDict/data";
 import { listSimplePosts } from "@/api/system/post";
 import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/entry"
 import {getDate} from "@/utils/dateUtils";
@@ -144,7 +145,7 @@ export default {
   },
   data() {
     return {
-
+      employeeTypeListOpen:[],
       fullscreenLoading:false,
       tasks:[],
       loading:false,
@@ -353,6 +354,9 @@ export default {
       listDept(this.queryParams).then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      getOpenDicts('tenant_employee_type').then(response => {
+        this.employeeTypeListOpen = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {

src/views/oa/leave/DataList.vue

@@ -20,7 +20,7 @@
       <el-form-item label="请假类型" prop="leaveType">
         <el-select v-model="queryParams.leaveType" placeholder="请选择"
         style="width: 250px">
-        <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value"/>
+        <el-option v-for="dict in leaveTypeList" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="开始日期" prop="startDate">
@@ -95,6 +95,7 @@
 </template>
 
 <script>
+import { getAllDicts } from "@/api/system/tenantDict/data";
 import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/leave"
 import detail from "./detail.vue";
@@ -112,6 +113,7 @@ export default {
   },
   data() {
     return {
+      leaveTypeList:[],
       detailLoading:false,
         postOptions: [],
       id:'',
@@ -160,6 +162,9 @@ export default {
         this.postOptions = [];
         this.postOptions.push(...response.data);
       });
+      getAllDicts('tenant_leave_type').then(response => {
+        this.leaveTypeList = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {

src/views/oa/leave/edit.vue

@@ -16,7 +16,7 @@
       <el-form-item label="请假类型" prop="leaveType">
         <el-select v-model="form.leaveType" filterable allow-create default-first-option placeholder="请选择"
           style="width: 100%;">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in leaveTypeList" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="开始日期" prop="startDate">
@@ -125,7 +125,8 @@
 </template>
 
 <script>
-import { getDetail, create, reCommit, save, deleteById, closeById } from "@/api/oa/leave"
+import { getOpenDicts } from "@/api/system/tenantDict/data";
+import { getDetail, create, reCommit, save, deleteById, closeById } from "@/api/oa/leave";
 import { getDate } from "@/utils/dateUtils";
 import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
@@ -150,6 +151,7 @@ export default {
   },
   data() {
     return {
+      leaveTypeList:[],
       fullscreenLoading: false,
       tasks: [],
       loading: false,
@@ -362,6 +364,9 @@ export default {
       listDept(this.queryParams).then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      getOpenDicts('tenant_leave_type').then(response => {
+        this.leaveTypeList = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {

src/views/oa/turnover/edit.vue

@@ -28,7 +28,7 @@
       <el-form-item label="离职原因" prop="turnoverReason">
         <el-select v-model="form.turnoverReason" filterable allow-create default-first-option placeholder="请选择离职原因"
           style="width: 100%;">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TURNOVER_REASON)" :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in turnoverReasonListOpen" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
 
@@ -101,6 +101,7 @@
 </template>
 
 <script>
+import { getOpenDicts } from "@/api/system/tenantDict/data";
 import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/turnover"
 import {getDate} from "@/utils/dateUtils";
 import { getEmployeeInfo } from "@/api/system/user";
@@ -127,6 +128,7 @@ export default {
   },
   data() {
     return {
+      turnoverReasonListOpen:[],
       fullscreenLoading:false,
       tasks:[],
       loading:false,
@@ -302,6 +304,9 @@ export default {
       listDept(this.queryParams).then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      getOpenDicts('tenant_turnover_reason').then(response => {
+        this.turnoverReasonListOpen = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {

src/views/personnel/attendance/business/index.vue

@@ -76,7 +76,7 @@
       <el-table-column label="开始日期" align="center" prop="startDate" min-width="100" />
       <el-table-column label="结束日期" align="center" prop="endDate" min-width="100" />
       <el-table-column label="出差天数" align="center" prop="day" min-width="100" />
-      <el-table-column label="预估费用" align="center" prop="estimatedCost" min-width="100" />
+      <el-table-column label="预估费用(元)" align="center" prop="estimatedCost" min-width="100" />
       <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">

src/views/personnel/attendance/leave/index.vue

@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item label="请假类型" prop="leaveType">
         <el-select v-model="queryParams.leaveType" placeholder="请选择" style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value"
+          <el-option v-for="dict in leaveTypeListAll" :key="dict.value"
             :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -137,7 +137,7 @@
             <el-form-item label="请假类型" prop="leaveType">
               <el-select v-model="form.leaveType" filterable allow-create default-first-option placeholder="请选择"
                 style="width: 100%;">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value"
+                <el-option v-for="dict in leaveTypeListOpen" :key="dict.value"
                   :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -317,6 +317,7 @@
 </template>
 
 <script>
+import { getAllDicts,getOpenDicts } from "@/api/system/tenantDict/data";
 import { listSimplePosts } from "@/api/system/post";
 import { getEmployeeInfo } from "@/api/system/user";
 import { listLeave, getLeave, delLeave, addLeave, updateLeave, exportLeave } from "@/api/personnel/attendance/leave/index";
@@ -334,6 +335,8 @@ export default {
   },
   data() {
     return {
+      leaveTypeListOpen:[],
+      leaveTypeListAll:[],
       files: [],
       // 设置上传的请求头部
       headers: getBaseHeader(),
@@ -509,6 +512,12 @@ export default {
         this.postOptions = [];
         this.postOptions.push(...response.data);
       });
+      getOpenDicts('tenant_leave_type').then(response => {
+        this.leaveTypeListOpen = response.data;
+      })
+      getAllDicts('tenant_leave_type').then(response => {
+        this.leaveTypeListAll = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {

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

@@ -17,7 +17,7 @@
       </el-form-item>
       <el-form-item label="员工类型" prop="employeeType">
         <el-select v-model="queryParams.employeeType" placeholder="员工类型" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="parseInt(dict.value)"
+          <el-option v-for="dict in employeeTypeListAll" :key="parseInt(dict.value)"
             :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
@@ -142,7 +142,7 @@
           <el-col :span="12">
             <el-form-item label="员工类型" prop="employeeType">
               <el-select v-model="form.employeeType" placeholder="请选择" style="width: 100%;">
-                <el-option v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="item.value"
+                <el-option v-for="item in employeeTypeListOpen" :key="item.value"
                   :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -357,6 +357,7 @@
 </template>
 
 <script>
+import { getAllDicts,getOpenDicts } from "@/api/system/tenantDict/data";
 import { listSimplePosts } from "@/api/system/post";
 import { listEntry, getEntry, delEntry, addEntry, updateEntry, exportEntry } from "@/api/personnel/relations/entry/index";
 import Treeselect from "@riophae/vue-treeselect";
@@ -371,6 +372,8 @@ export default {
   },
   data() {
     return {
+      employeeTypeListAll:[],
+      employeeTypeListOpen:[],
       files: [],
       // 设置上传的请求头部
       headers: getBaseHeader(),
@@ -504,6 +507,12 @@ export default {
         this.postOptions = [];
         this.postOptions.push(...response.data);
       });
+      getOpenDicts('tenant_employee_type').then(response => {
+        this.employeeTypeListOpen = response.data;
+      })
+      getAllDicts('tenant_employee_type').then(response => {
+        this.employeeTypeListAll = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {

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

@@ -138,7 +138,7 @@
             <el-form-item label="离职原因" prop="turnoverReason">
         <el-select v-model="form.turnoverReason" filterable allow-create default-first-option placeholder="请选择离职原因"
           style="width: 100%;">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TURNOVER_REASON)" :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in turnoverReasonList" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
           </el-col>
@@ -257,6 +257,7 @@
 </template>
 
 <script>
+import { getOpenDicts } from "@/api/system/tenantDict/data";
 import { listSimplePosts } from "@/api/system/post";
 import { getEmployeeInfo } from "@/api/system/user";
 import { listTurnover, getTurnover, delTurnover, addTurnover, updateTurnover, exportTurnover } from "@/api/personnel/relations/turnover/index";
@@ -274,6 +275,7 @@ export default {
   },
   data() {
     return {
+      turnoverReasonList:[],
       files: [],
       // 设置上传的请求头部
       headers: getBaseHeader(),
@@ -401,6 +403,9 @@ export default {
         this.postOptions = [];
         this.postOptions.push(...response.data);
       });
+      getOpenDicts('tenant_turnover_reason').then(response => {
+        this.turnoverReasonList = response.data;
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {