Explorar o código

人资管理,入职管理、离职管理

ZaiZai %!s(int64=2) %!d(string=hai) anos
pai
achega
39d4e0d3a5

+ 36 - 0
src/api/modules/people/salary.js

@@ -0,0 +1,36 @@
+import {httpApi} from "../../request/httpApi";
+
+export default {
+    //薪酬管理分页
+    async page(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-control/userpayinfo/page',
+            method: 'get',
+            params: form
+        }, msg);
+    },
+    //员工合同、入职、离职的删除
+    async remove(form) {
+        return httpApi({
+            url: '/api/blade-control/usercontractinfo/remove',
+            method: 'post',
+            params: form
+        }, false);
+    },
+    //导入薪酬管理
+    async importUserpay(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-control/userpayinfo/import-userpay',
+            method: 'post',
+            data: form
+        }, msg);
+    },
+    //导出模板
+    async exportTemplate(form, msg = true) {
+        return httpApi({
+            url: '/api/blade-control/userpayinfo/export-template',
+            method: 'get',
+            params: form
+        }, msg);
+    },
+}

+ 4 - 4
src/views/people/contract/index.vue

@@ -85,12 +85,12 @@ const pageChange = ({current, size}) => {
 //表格参数
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'userId', name: '姓名'},
-    {key: 'createDept', name: '部门'},
+    {key: 'userName', name: '姓名'},
+    {key: 'deptName', name: '部门'},
     {key: 'startDate', name: '合同开始时间'},
     {key: 'endDate', name: '合同结束时间'},
-    {key: 'conType', name: '合同类型'},
-    {key: 'fileUrl', name: '合同附件'},
+    {key: 'conTypeName', name: '合同类型'},
+    {key: 'conFileName', name: '合同附件'},
     {key: 'action', name: '操作', align: 'center', fixed: 'right'},
 ]
 

+ 4 - 4
src/views/people/dimission.vue

@@ -109,12 +109,12 @@ const pageChange = ({current, size}) => {
 //表格参数
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'userId', name: '姓名'},
-    {key: 'createDept', name: '部门'},
-    {key: 'key1', name: '职位'},
+    {key: 'userName', name: '姓名'},
+    {key: 'deptName', name: '部门'},
+    {key: 'postName', name: '职位'},
     {key: 'endDate', name: '离职日期'},
     {key: 'desc', name: '离职原因'},
-    {key: 'fileUrl', name: '离职登记表'},
+    {key: 'conFileName', name: '离职登记表'},
     {key: 'action', name: '操作', width: '150'}
 ]
 

+ 2 - 2
src/views/people/entry.vue

@@ -106,8 +106,8 @@ const pageChange = ({current, size}) => {
 //表格参数
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'userId', name: '姓名'},
-    {key: 'fileUrl', name: '职位入职登记表'},
+    {key: 'userName', name: '姓名'},
+    {key: 'conFileName', name: '职位入职登记表'},
     {key: 'startDate', name: '入职时间'},
     {key: 'action', name: '操作', width: '150'}
 ]

+ 87 - 86
src/views/people/salary.vue

@@ -1,96 +1,97 @@
-
 <template>
-  <HcCard>
-    <template #header>
-      <div class="w-36 ml-2">
+    <HcCard>
+        <template #header>
+            <div class="w-36 ml-2">
                 <el-select v-model="searchForm.peoplename" block clearable placeholder="员工姓名" size="large">
                     <el-option v-for="item in peopleoption" :label="item.name" :value="item.key"/>
                 </el-select>
-      </div>
-      <div class="w-36 ml-2">
-        <el-date-picker v-model="searchForm.month" class="block" size="large" type="month" @change="datePickerChange"  placeholder="选择月份" />
-      </div>
-      <div class="ml-4">
+            </div>
+            <div class="w-36 ml-2">
+                <el-date-picker v-model="searchForm.month" class="block" size="large" type="month" @change="datePickerChange" placeholder="选择月份"/>
+            </div>
+            <div class="ml-4">
                 <el-button type="primary" @click="searchClick" size="large">
                     <HcIcon name="search-2"/>
                     <span>搜索</span>
                 </el-button>
-       </div>
-      <div class="ml-2">
+            </div>
+            <div class="ml-2">
                 <el-button size="large" @click="resetClick">
                     <HcIcon name="close-circle"/>
                     <span>重置</span>
                 </el-button>
-        </div>
-    </template>
-    <template  #extra>
-        <el-button type="primary" @click="downloadXlsx" size="large">
-                    <HcIcon name="download-2"/>
-                    <span>下载模板</span>
-         </el-button>
-         <el-button type="primary" @click="toImportTempClick" size="large" class="ml-2">
-                    <HcIcon name="folder-upload"/>
-                    <span>导入数据</span>
-         </el-button>
-    </template>
-    <HcTable :column="tableColumn" :datas="tableData" >
-        
-      </HcTable>
-      <template #action>
+            </div>
+        </template>
+        <template #extra>
+            <el-button type="primary" @click="downloadXlsx" size="large">
+                <HcIcon name="download-2"/>
+                <span>下载模板</span>
+            </el-button>
+            <el-button type="primary" @click="toImportTempClick" size="large" class="ml-2">
+                <HcIcon name="folder-upload"/>
+                <span>导入数据</span>
+            </el-button>
+        </template>
+        <HcTable :column="tableColumn" :datas="tableData">
+
+        </HcTable>
+        <template #action>
             <HcPages :pages="searchForm" @change="pageChange"></HcPages>
-      </template>
-            <!--导入数据弹窗-->
-            <HcDialog bgColor="#ffffff" widths="34rem" isToBody  :show="importModal" title="导入数据" @close="importModalClose" footer isRowFooter>
-                        <el-form label-position="top" label-width="auto" :model="formModel" size="large">
-                            <el-form-item label="请选择导入薪酬所时间属范围:">
-                              <el-date-picker
-                                v-model="formModel.time"
-                                type="daterange"
-                                start-placeholder="起始时间"
-                                end-placeholder="结束时间"
-                                :default-time="defaultTime"
-                              />
-                          </el-form-item>
-                        </el-form>
-                    <template #rightRowFooter>
-                      <!-- <el-button type="primary" @click="toImportTempClick" size="large" class="ml-2">
-                                  <HcIcon name="folder-upload"/>
-                                  <span>上传excel</span>
-                      </el-button> -->
-                      <HcUploadFile
-                            ref="HcUploadFileRef"
-                                :options="UploadFileOptions"
-                                @progress="HcUploadFileProgress"
-                                @success="HcUploadFileSuccess"
-                                @change="HcUploadFileChange"
-                            >
-                               <el-button type="primary"  size="large" class="ml-2">
-                                      <HcIcon name="folder-upload"/>
-                                      <span>上传excel</span>
-                                 </el-button>
-                      </HcUploadFile>
-                      <el-button type="primary" @click="importModalClose" size="large" class="ml-2">
-                                  <HcIcon name="close-circle"/>
-                                  <span>取消</span>
-                      </el-button>
-                    </template>
-             </HcDialog>
-  </HcCard>
+        </template>
+        <!--导入数据弹窗-->
+        <HcDialog bgColor="#ffffff" widths="34rem" isToBody :show="importModal" title="导入数据"
+                  @close="importModalClose" footer isRowFooter>
+            <el-form label-position="top" label-width="auto" :model="formModel" size="large">
+                <el-form-item label="请选择导入薪酬所时间属范围:">
+                    <el-date-picker
+                        v-model="formModel.time"
+                        type="daterange"
+                        start-placeholder="起始时间"
+                        end-placeholder="结束时间"
+                        :default-time="defaultTime"
+                    />
+                </el-form-item>
+            </el-form>
+            <template #rightRowFooter>
+                <!-- <el-button type="primary" @click="toImportTempClick" size="large" class="ml-2">
+                            <HcIcon name="folder-upload"/>
+                            <span>上传excel</span>
+                </el-button> -->
+                <HcUploadFile
+                    ref="HcUploadFileRef"
+                    :options="UploadFileOptions"
+                    @progress="HcUploadFileProgress"
+                    @success="HcUploadFileSuccess"
+                    @change="HcUploadFileChange"
+                >
+                    <el-button type="primary" size="large" class="ml-2">
+                        <HcIcon name="folder-upload"/>
+                        <span>上传excel</span>
+                    </el-button>
+                </HcUploadFile>
+                <el-button type="primary" @click="importModalClose" size="large" class="ml-2">
+                    <HcIcon name="close-circle"/>
+                    <span>取消</span>
+                </el-button>
+            </template>
+        </HcDialog>
+    </HcCard>
 </template>
 
 <script setup>
-import {ref, watch} from  'vue'
+import {ref, watch} from 'vue'
 import dayjs from "dayjs"
 import 'dayjs/locale/zh-cn'
 import {useRouter} from 'vue-router'
 import {getTokenHeader} from "~src/api/request/header";
+
 const router = useRouter()
 
 //下拉日期选择
 const datePickerChange = (val) => {
- console.log(val,'val');
- const toDayJs = dayjs(val);
- searchForm.value.month = toDayJs.format('YYYY-MM')
+    console.log(val, 'val');
+    const toDayJs = dayjs(val);
+    searchForm.value.month = toDayJs.format('YYYY-MM')
 
 }
 const tableColumn = [
@@ -119,15 +120,15 @@ const tableColumn = [
 
 ]
 const tableData = ref([
-    {name: '名称1',id:1},
-    {name: '名称2', },
-    {name: '名称3', }
+    {name: '名称1', id: 1},
+    {name: '名称2',},
+    {name: '名称3',}
 ])
 const searchForm = ref({
     name: '',
     current: 1, size: 20, total: 0
 })
-const peopleoption=ref([
+const peopleoption = ref([
     {name: '张三', key: '1'},
     {name: '李四', key: '2'},
 ])
@@ -153,21 +154,21 @@ const resetClick = () => {
     searchForm.value = {current: 1, size: 20, total: 0}
 }
 const defaultTime = ref([
-  new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1, 23, 59, 59),
+    new Date(2000, 1, 1, 0, 0, 0),
+    new Date(2000, 2, 1, 23, 59, 59),
 ])
 //导入数据弹窗
-const importModal=ref(false)
-const importModalClose=()=>{
-  importModal.value=false
+const importModal = ref(false)
+const importModalClose = () => {
+    importModal.value = false
 }
-const formModel=ref({})
+const formModel = ref({})
 //下载模板
-const downloadXlsx=()=>{
+const downloadXlsx = () => {
 
 }
-const toImportTempClick=()=>{
-  importModal.value=true
+const toImportTempClick = () => {
+    importModal.value = true
 
 }
 //上传配置
@@ -181,13 +182,13 @@ const HcUploadFileProgress = (res) => {
     console.log('文件上传进度', res)
 }
 
-const HcUploadFileRef=ref(null)
+const HcUploadFileRef = ref(null)
 // 文件上传成功的回调
 const HcUploadFileSuccess = (res) => {
     HcUploadFileRef.value?.setModalShow(false);
-    importModal.value=false
+    importModal.value = false
     getTableData()
-   
+
 }
 
 // 文件全部上传成功
@@ -196,4 +197,4 @@ const HcUploadFileChange = () => {
 }
 </script>
 <style lang='scss' scoped>
-</style>
+</style>