Merge remote-tracking branch 'origin/master'

src/router/modules/base.js

@@ -348,7 +348,13 @@ export default [
                 path: '/people/contract',
                 name: 'people-contract',
                 meta: {title: '员工合同'},
-                component: () => import('~src/views/people/contract.vue')
+                component: () => import('~src/views/people/contract/index.vue')
+            },
+            {
+                path: '/people/contract-info',
+                name: 'people-contract-info',
+                meta: {title: '员工合同信息'},
+                component: () => import('~src/views/people/contract/info.vue')
             },
             {
                 path: '/people/salary',

src/router/modules/token.js

@@ -46,6 +46,7 @@ export default [
     'people-archive',
     'people-archive-info',
     'people-contract',
+   ' people-contract-info',
     'people-salary',
     'people-entry',
     'people-dimission',

src/views/people/archive/index.vue

@@ -21,9 +21,6 @@
         </div>
     </template>
     <HcTable :column="tableColumn" :datas="tableData" >
-            <template #name="{row}">
-                        <div class="text-link text-blue">{{row?.name}}</div>
-            </template>
             <template #action="{row, index}">
        
                   <el-button hc-btn type="primary" size="small"  @click="editRowClick(row)">编辑</el-button>

src/views/people/archive/info.vue

@@ -1,6 +1,9 @@
 <!--  -->
 <template>
    <HcCard>
+    <template #header>
+        员工档案信息编辑
+    </template>
     <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left" label-width="auto" size="large">
                 <el-row :gutter="20">
                     <el-col :span="8">
@@ -10,42 +13,54 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="年龄:" prop="location">
-                            <el-input v-model="formModel.idNumber" placeholder=""/>
+                            <el-input v-model="formModel.age" placeholder=""/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="手机号:">
-                            <el-select v-model="formModel.top" class="block" placeholder="请选择" size="large">
-                                <el-option v-for="item in topMenuoptions" :key="item.value" :label="item.label" :value="item.value"/>
+                            <el-select v-model="formModel.phone" class="block" placeholder="请选择" size="large">
+                                <el-input v-model="formModel.phone" placeholder=""/>
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="身份证姓名:">
+                        <el-form-item label="身份证号码:">
                             <el-input v-model="formModel.deptId" placeholder=""/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="性别:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-select v-model="formModel.sex" clearable placeholder="请选择" style="width: 100%;">
+                                <el-option
+                                label="男"
+                                value="1"
+                                />
+                                <el-option
+                                label="女"
+                                value="2"
+                                />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="民族:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-input v-model="formModel.nation" placeholder=""/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="身份证号码:" prop="type">
-                            <el-radio-group v-model="formModel.type">
-                                <el-radio :label="3">菜单</el-radio>
-                                <el-radio :label="6">按钮</el-radio>
-                            </el-radio-group>
+                            <el-input v-model="formModel.idNumber" placeholder=""/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="出生日期:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                        <el-form-item label="出生日期:" >
+                            <el-date-picker
+                            v-model="formModel.birthday"
+                            type="date"
+                            placeholder=""
+                            disabled
+                            style="width: 100%;"
+                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -60,47 +75,101 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="入职时间:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-date-picker
+                            v-model="formModel.entryTime"
+                            type="date"
+                            placeholder=""
+                            style="width: 100%;"
+                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同类型:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-input v-model="formModel.contactType" placeholder="" disabled/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="员工身份证（人像）:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <!-- <el-input v-model="formModel.deptId" placeholder=""/> -->
+                            <HcUploadFile
+                            ref="HcUploadFileRef"
+                                :options="UploadFileOptions"
+                                @progress="HcUploadFileProgress"
+                                @success="HcUploadFileSuccess"
+                                @change="HcUploadFileChange"
+                            >
+                            <el-button size="large" type="primary" hc-btn>
+                                <HcIcon name="upload-cloud-2"/>
+                                <span>上传图像</span>
+                            </el-button>
+                            <span class="hc-form-file-pdf" v-show="infoData?.originalName">
+                              {{ infoData?.originalName }}
+                            </span>
+                        </HcUploadFile>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="司龄:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-input v-model="formModel.deptId" placeholder="" disabled/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同开始日期:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-date-picker
+                            v-model="formModel.startTime"
+                            type="date"
+                            placeholder=""
+                            style="width: 100%;"
+                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="员工身份证（国徽）:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <HcUploadFile
+                            ref="HcUploadFileRef"
+                                :options="UploadFileOptions"
+                                @progress="HcUploadFileProgress"
+                                @success="HcUploadFileSuccess"
+                                @change="HcUploadFileChange"
+                            >
+                                <el-button size="large" type="primary" hc-btn>
+                                    <HcIcon name="upload-cloud-2"/>
+                                    <span>上传图像</span>
+                                </el-button>
+                                <span class="hc-form-file-pdf" v-show="infoData?.originalName">
+                                {{ infoData?.originalName }}
+                                </span>
+                             </HcUploadFile>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="职位:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-input v-model="formModel.deptName" placeholder="" disabled/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同结束日期:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-date-picker
+                            v-model="formModel.startTime"
+                            type="date"
+                            placeholder=""
+                            style="width: 100%;"
+                            disabled
+                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="婚姻状况:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                             <el-select v-model="formModel.marriage" clearable placeholder="请选择" style="width: 100%;">
+                                  <el-option
+                                label="已婚"
+                                value="1"
+                                />
+                                <el-option
+                                label="未婚"
+                                value="2"
+                             />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -120,22 +189,29 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="部门:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-input v-model="formModel.deptId" placeholder="" disabled/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="合同附件:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-link type="primary" :href="formModel.pdflink">附件.pdf</el-link>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="学历:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-select v-model="formModel.education" class="m-2" placeholder="请选择" size="large" style="width: 100%;">
+                                <el-option
+                                v-for="item in educationalOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                                />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="直属主管:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-input v-model="formModel.deptId" placeholder="" disabled/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -150,7 +226,16 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="政治面貌:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-select v-model="formModel.political" clearable placeholder="请选择" style="width: 100%;">
+                                  <el-option
+                                label="党员"
+                                value="1"
+                                />
+                                <el-option
+                                label="非党员"
+                                value="2"
+                             />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -165,7 +250,16 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="员工状态:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-select v-model="formModel.staus" clearable placeholder="请选择" style="width: 100%;">
+                                  <el-option
+                                label="在职"
+                                value="1"
+                                />
+                                <el-option
+                                label="离职"
+                                value="2"
+                             />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -180,12 +274,34 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="员工类型:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <el-select v-model="formModel.type" class="m-2" placeholder="请选择" size="large" style="width: 100%;">
+                                <el-option
+                                v-for="item in typeOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                                />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="员工照片:">
-                            <el-input v-model="formModel.deptId" placeholder=""/>
+                            <HcUploadFile
+                            ref="HcUploadFileRef"
+                                :options="UploadFileOptions"
+                                @progress="HcUploadFileProgress"
+                                @success="HcUploadFileSuccess"
+                                @change="HcUploadFileChange"
+                            >
+                                <el-button size="large" type="primary" hc-btn>
+                                    <HcIcon name="upload-cloud-2"/>
+                                    <span>上传图像</span>
+                                </el-button>
+                                <span class="hc-form-file-pdf" v-show="infoData?.originalName">
+                                {{ infoData?.originalName }}
+                                </span>
+                        </HcUploadFile>
+                          
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -195,12 +311,83 @@
 
 <script setup>
 import {ref, watch} from  'vue'
-
+import {getTokenHeader} from "~src/api/request/header";
+import {getObjValue} from "js-fast-way"
 
 const formRef = ref(null)
 const formModel = ref({})
 const formRules = {
     
+}
+//学历
+const educationalOptions=ref([
+    {
+        value: '1',
+        label: '小学/初中',
+    },
+    {
+        value: '2',
+        label: '高中',
+    },
+    {
+        value: '3',
+        label: '专科',
+    },
+    {
+        value: '4',
+        label: '本科',
+    },
+    {
+        value: '5',
+        label: '硕士',
+    },
+    {
+        value: '6',
+        label: '博士',
+    },
+])
+//员工类型
+const typeOptions=ref([
+    {
+        value: '1',
+        label: '全职'
+    },
+    {
+        value: '2',
+        label: '兼职',
+    },
+    {
+        value: '3',
+        label: '劳务派遣',
+    },
+    {
+        value: '4',
+        label: '实习',
+    },
+])
+//上传配置
+const UploadFileOptions = {
+    //此处设置header
+    headers: getTokenHeader(),
+}
+
+// 文件上传进度
+const HcUploadFileProgress = (res) => {
+    console.log('文件上传进度', res)
+}
+const infoData=ref({})
+const HcUploadFileRef=ref(null)
+// 文件上传成功的回调
+const HcUploadFileSuccess = (res) => {
+    const { originalName } = getObjValue(res.resData)
+    infoData.value.originalName = originalName
+    HcUploadFileRef.value?.setModalShow(false);
+   
+}
+
+// 文件全部上传成功
+const HcUploadFileChange = () => {
+    console.log('文件全部上传成功')
 }
 </script>
 <style lang='scss' scoped>

src/views/people/contract.vue

@@ -1,10 +0,0 @@
-<!--  -->
-<template>
-  <div >444</div>
-</template>
-
-<script setup>
-import {ref, watch} from  'vue'
-</script>
-<style lang='scss' scoped>
-</style>

src/views/people/contract/index.vue

@@ -0,0 +1,108 @@
+
+<template>
+  <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="ml-4">
+                <el-button type="primary" @click="searchClick" size="large">
+                    <HcIcon name="search-2"/>
+                    <span>搜索</span>
+                </el-button>
+       </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="editRowClick" size="large">
+                    <HcIcon name="add"/>
+                    <span>新增合同信息</span>
+         </el-button>
+    </template>
+    <HcTable :column="tableColumn" :datas="tableData" >
+            <template #action="{row, index}">
+       
+                  <el-button hc-btn type="primary" size="small"  @click="editRowClick(row)">编辑</el-button>
+                  <el-button hc-btn type="primary" size="small">删除</el-button>
+           
+            </template>
+      </HcTable>
+      <template #action>
+            <HcPages :pages="searchForm" @change="pageChange"></HcPages>
+      </template>
+  </HcCard>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+
+import {useRouter} from 'vue-router'
+
+const router = useRouter()
+
+
+const tableColumn = [
+    {key: 'name', name: '姓名'},
+    {key: 'department', name: '部门'},
+    {key: 'key4', name: '合同开始时间'},
+    {key: 'key5', name: '合同结束时间'},
+    {key: 'key6', name: '合同类型'},
+    {key: 'key7', name: '合同附件'},
+    {key: 'action', name: '操作'}
+
+]
+const tableData = ref([
+    {name: '名称1',id:1},
+    {name: '名称2', },
+    {name: '名称3', }
+])
+const searchForm = ref({
+    name: '',
+    current: 1, size: 20, total: 0
+})
+const peopleoption=ref([
+    {name: '张三', key: '1'},
+    {name: '李四', key: '2'},
+])
+//分页被点击
+const pageChange = ({current, size}) => {
+    searchForm.value.current = current
+    searchForm.value.size = size
+    getTableData()
+}
+
+const getTableData = () => {
+
+}
+
+//搜索
+const searchClick = () => {
+    searchForm.value.current = 1;
+    getTableData()
+}
+
+//重置搜索表单
+const resetClick = () => {
+    searchForm.value = {current: 1, size: 20, total: 0}
+}
+//编辑档案信息
+const editRowClick = (row) => {
+    router.push({
+        name: 'people-contract-info',
+        query: {
+            id: row.id,
+            type: 'edit'
+        }
+    })
+}
+
+</script>
+<style lang='scss' scoped>
+</style>

src/views/people/contract/info.vue

@@ -0,0 +1,140 @@
+<!--  -->
+<template>
+  <HcCard>
+    <template #header>
+       员工合同信息
+    </template>
+    <div class="content_box">
+      <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left" label-width="auto" size="large">
+             
+                 
+             <el-form-item label="姓名:" prop="name">
+                <el-select v-model="formModel.name" placeholder="请选择用户" size="large" style="width: 100%;">
+                                    <el-option
+                                    v-for="item in peopleOptions"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                    />
+                  </el-select>
+             </el-form-item>
+             <el-form-item label="合同类型:" prop="name">
+                <el-select v-model="formModel.contarctType"  placeholder="请选择" size="large" style="width: 100%;">
+                                    <el-option
+                                    v-for="item in contatctOptions"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                    />
+                  </el-select>
+             </el-form-item>
+             <el-form-item label="合同开始日期:">
+                            <el-date-picker
+                            v-model="formModel.startTime"
+                            type="date"
+                            placeholder=""
+                            style="width: 100%;"
+                             />
+              </el-form-item>
+              <el-form-item label="合同结束日期:">
+                            <el-date-picker
+                            v-model="formModel.endTime"
+                            type="date"
+                            placeholder=""
+                            style="width: 100%;"
+                             />
+              </el-form-item>
+              <el-form-item label="合同附件:">
+                            <HcUploadFile
+                            ref="HcUploadFileRef"
+                                :options="UploadFileOptions"
+                                @progress="HcUploadFileProgress"
+                                @success="HcUploadFileSuccess"
+                                @change="HcUploadFileChange"
+                                drop
+                                style="width: 100%;"
+                            >
+                            <div class="accept-tip">支持的文件格式：图片(png、jpg、jpeg)、 Excel(xls、xlsx) PDF 、Word(doc、docx)</div>
+                            <div class=" text-bold" v-show="infoData?.originalName">
+                               附件名称： {{ infoData?.originalName }}
+                            </div>
+                            
+                             </HcUploadFile>
+                             
+                </el-form-item>
+       
+        
+      </el-form>
+    </div>
+    <template #action>
+      <div class="action_box">
+        <el-button type="primary" size="large">
+                    <HcIcon name="save"/>
+                    <span>保存</span>
+        </el-button>
+        <el-button type="primary" size="large" @click="goBackClick">
+                    <HcIcon name="arrow-go-back"/>
+                    <span>取消</span>
+         </el-button>
+      </div>
+    </template>
+  </HcCard>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+import {useRouter} from 'vue-router'
+import {getTokenHeader} from "~src/api/request/header";
+import {getObjValue} from "js-fast-way"
+
+const router = useRouter()
+
+
+const formRef = ref(null)
+const formModel = ref({})
+const formRules = {
+    
+}
+const contatctOptions=ref([])
+const peopleOptions=ref([])
+
+
+//上传配置
+const UploadFileOptions = {
+    //此处设置header
+    headers: getTokenHeader(),
+}
+
+// 文件上传进度
+const HcUploadFileProgress = (res) => {
+    console.log('文件上传进度', res)
+}
+const infoData=ref({})
+const HcUploadFileRef=ref(null)
+// 文件上传成功的回调
+const HcUploadFileSuccess = (res) => {
+    const { originalName } = getObjValue(res.resData)
+    infoData.value.originalName = originalName
+    HcUploadFileRef.value?.setModalShow(false);
+   
+}
+
+// 文件全部上传成功
+const HcUploadFileChange = () => {
+    console.log('文件全部上传成功')
+}
+//取消并返回
+const goBackClick = () => {
+    router.back()
+}
+</script>
+<style lang='scss' scoped>
+.action_box{
+  text-align: center;
+}
+.content_box{
+  width: 60%;
+  text-align: center;
+  margin: 0 auto;
+}
+</style>