From 67dc6a05fcd0944cb03b17d669bc911e5fcb60aa Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 2 Dec 2022 13:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=BA=E5=91=98=E5=AE=B6?=
 =?UTF-8?q?=E5=BA=AD=E6=88=90=E5=91=98=E7=9B=B8=E5=85=B3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/people/peopledata.js                  |  31 +-
 src/api/personnel/post.js                     |   3 +-
 src/api/systemaccredit/systemhrapi.js         | 122 +++
 src/views/hr/newhr/addpeople.vue              |  32 +-
 src/views/hr/newhr/doubleemployees.vue        | 200 ++++-
 src/views/hr/newhr/emergencycontact.vue       | 192 ++++-
 src/views/hr/newhr/employmentrelationship.vue |  44 +-
 src/views/hr/newhr/familymembers.vue          | 224 ++++-
 src/views/hr/newhr/people.vue                 |  29 +-
 src/views/hr/newhr/peoplecont.vue             | 113 ++-
 src/views/hr/newhr/peopleinfor.vue            | 774 +++++++++++++++++-
 src/views/hr/newhr/personneleducation.vue     |  63 +-
 src/views/hr/newhr/workhistory.vue            | 164 +++-
 13 files changed, 1931 insertions(+), 60 deletions(-)

diff --git a/src/api/people/peopledata.js b/src/api/people/peopledata.js
index b0d4213..49131c4 100644
--- a/src/api/people/peopledata.js
+++ b/src/api/people/peopledata.js
@@ -1,12 +1,12 @@
 //性别
 const   sexData=[
             {
-            id:1,
-            tittle:'男'
+                id:1,
+                tittle:'男'
             },
             {
-            id:2,
-            tittle:'女'
+                id:2,
+                tittle:'女'
             },
         ];
 // 用工关系选择列表
@@ -294,7 +294,25 @@ const positiongrade = [
         tittle:'三级'
     }
 ];
-
+//学位
+const academicDegree =[
+    {
+        id:1,
+        title:'无'
+    },
+    {
+        id:2,
+        title:'学士'
+    },
+    {
+        id:3,
+        title:'硕士'
+    },
+    {
+        id:4,
+        title:'博士'
+    },
+];
 //注册定义的方法
 export const peopleMethod= {
     sexData,
@@ -305,7 +323,8 @@ export const peopleMethod= {
     politicsList,
     educationList,
     employmentType,
-    positiongrade
+    positiongrade,
+    academicDegree
 };
 
 
diff --git a/src/api/personnel/post.js b/src/api/personnel/post.js
index 65d6170..090e4c2 100644
--- a/src/api/personnel/post.js
+++ b/src/api/personnel/post.js
@@ -355,4 +355,5 @@ export const newAddPeopleCont = (data) => {
     method: 'post',
     data: data
   })
-}
\ No newline at end of file
+}
+
diff --git a/src/api/systemaccredit/systemhrapi.js b/src/api/systemaccredit/systemhrapi.js
index f2a8118..2b69ab3 100644
--- a/src/api/systemaccredit/systemhrapi.js
+++ b/src/api/systemaccredit/systemhrapi.js
@@ -68,4 +68,126 @@ export const getPersonneleDucationlist = (data) => {
         method: 'post',
         data: data
     })
+}
+
+//获取工作履历列表
+export const getWorkHistoryList = (data) => {
+    return request({
+        url: '/staff/workhistorylist',
+        method: 'post',
+        data: data
+    })
+}
+
+//获取集团工作履历列表
+export const getInsiDeworkHistoryList = (data) => {
+    return request({
+        url: '/staff/getinsideworkhistorylist',
+        method: 'post',
+        data: data
+    })
+}
+
+//获取资料完整度
+export const getDataIntegrity = (data) => {
+    return request({
+        url: '/staff/get_peo_data_integrity',
+        method: 'post',
+        data: data
+    })
+}
+
+//编辑人员行政组织
+export const editManOrgCont = (data) => {
+    return request({
+        url: '/staff/edit_man_org_cont',
+        method: 'post',
+        data: data
+    })
+}
+
+//编辑人员基本信息
+export const editManPeopleCont = (data) => {
+    return request({
+        url: '/staff/edit_manmain_cont',
+        method: 'post',
+        data: data
+    })
+}
+
+//添加紧急联系人
+export const addEmercyCall = (data) => {
+    return request({
+        url: '/staff/addemercycall',
+        method: 'post',
+        data: data
+    })
+}
+//编辑紧急联系人状态
+export const editEmercyCallState = (data) => {
+    return request({
+        url: '/staff/editemercycallstate',
+        method: 'post',
+        data: data
+    })
+}
+//编辑紧急联系人信息
+export const editEmercyCallCont = (data) => {
+    return request({
+        url: '/staff/editemercycall',
+        method: 'post',
+        data: data
+    })
+}
+
+//添加双职工
+export const AddDoubleWorker = (data) => {
+    return request({
+        url: '/staff/adddoubleworker',
+        method: 'post',
+        data: data
+    })
+}
+//编辑双职工信息
+export const EditDoubleWorker = (data) => {
+    return request({
+        url: '/staff/eidtdoubleworker',
+        method: 'post',
+        data: data
+    })
+}
+//编辑双职工信息
+export const editDoubleWorkerState = (data) => {
+    return request({
+        url: '/staff/eidtdoubleworkerstate',
+        method: 'post',
+        data: data
+    })
+}
+
+//添加家庭成员
+export const addFamilyMembers = (data) => {
+    return request({
+        url: '/staff/addfamilymembers',
+        method: 'post',
+        data: data
+    })
+}
+
+//编辑家庭成员
+export const editFamilyMembers = (data) => {
+    return request({
+        url: '/staff/editfamilymembers',
+        method: 'post',
+        data: data
+    })
+}
+
+//编辑家庭成员
+export const editFamilyMembersState = (data) => {
+    return request({
+        url: '/staff/editfamilymemberssatte',
+        method: 'post',
+        data: data
+    })
 }
\ No newline at end of file
diff --git a/src/views/hr/newhr/addpeople.vue b/src/views/hr/newhr/addpeople.vue
index eb2e4df..5b8c9cb 100644
--- a/src/views/hr/newhr/addpeople.vue
+++ b/src/views/hr/newhr/addpeople.vue
@@ -212,16 +212,6 @@
                                                 :props="propsdepart"
                                                 filterable>
                                             </el-cascader>
-
-                                            <!-- <el-select filterable v-model="addNewPeopleCont.adminorg" clearable placeholder="请选择" @change="orgChange">
-                                                <el-option
-                                                    v-for="item in GovthreeList2"
-                                                    :key="item.id"
-                                                    :label="item.tittle"
-                                                    :value="item.id"
-                                                    >
-                                                </el-option>
-                                            </el-select> -->
                                             <el-popover
                                                 :visible-arrow="true"
                                                 placement="bottom"
@@ -604,7 +594,7 @@
 
 </template>
 <script>
-import { govthree, positionlist,archiveslist,teamcontlist,orgThreeList,positionlistIsMe,dutieslist } from "@/api/personnel/post";
+import { govthree, positionlist,archiveslist,teamcontlist,orgThreeList,positionlistIsMe,dutieslist,newAddPeopleCont } from "@/api/personnel/post";
 import { peopleMethod,getNtoMonth,judgeArray } from "@/api/people/peopledata";
 import { calculationDate } from "@/api/time/dateval"
 export default {
@@ -820,6 +810,26 @@ export default {
             
 
             sendTo = true
+            if(sendTo){
+                const res = await newAddPeopleCont(this.addNewPeopleCont);
+                if(res.code == 0){
+                    this.$confirm('新增成功！是否继续添加？', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.initData();
+                    }).catch(() => {
+                        this.closeAddPeople();       
+                    });
+                }else{
+                    this.$message({
+                        type: 'warning',
+                        message: res.msg,
+                        showClose: true
+                    })
+                }
+            }
             console.log("提交数据---------->",sendTo,this.addNewPeopleCont)
             this.$forceUpdate()
         },
diff --git a/src/views/hr/newhr/doubleemployees.vue b/src/views/hr/newhr/doubleemployees.vue
index 5701dc3..07998d7 100644
--- a/src/views/hr/newhr/doubleemployees.vue
+++ b/src/views/hr/newhr/doubleemployees.vue
@@ -60,16 +60,103 @@
                 </template>
             </el-col>
         </el-row>
+
+        <!--添加-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="showBoxCont.addBox" title="添加信息" :before-close="closeAddDialog"  width="40%">
+            <el-form ref="addForm" :model="addCont" :rules="addRules" label-width="120px" class="demo-ruleForm">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model="addCont.name"  placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobilephone">
+                    <el-input v-model="addCont.mobilephone"  placeholder="请输入信息电话"></el-input>
+                </el-form-item>
+                <el-form-item label="所在公司" prop="company">
+                    <el-input v-model="addCont.company"  placeholder="请输入所在公司"></el-input>
+                </el-form-item>
+                <el-form-item label="所在部门" prop="department">
+                    <el-input v-model="addCont.department"  placeholder="请输入所在部门"></el-input>
+                </el-form-item>
+                <el-form-item label="职务" prop="position">
+                    <el-input v-model="addCont.position"  placeholder="请输入职务"></el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer "> 
+                    <el-button size="small" type="primary" @click="addContsubmit" :loading="showBoxCont.addBoxIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeAddDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+        <!--编辑-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="showBoxCont.editBox" title="编辑信息" :before-close="closeEditDialog"  width="40%">
+            <el-form ref="editForm" :model="editCont" :rules="addRules" label-width="120px" class="demo-ruleForm">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model="editCont.name"  placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobilephone">
+                    <el-input v-model="editCont.mobilephone"  placeholder="请输入信息电话"></el-input>
+                </el-form-item>
+                <el-form-item label="所在公司" prop="company">
+                    <el-input v-model="editCont.company"  placeholder="请输入所在公司"></el-input>
+                </el-form-item>
+                <el-form-item label="所在部门" prop="department">
+                    <el-input v-model="editCont.department"  placeholder="请输入所在部门"></el-input>
+                </el-form-item>
+                <el-form-item label="职务" prop="position">
+                    <el-input v-model="editCont.position"  placeholder="请输入职务"></el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer "> 
+                    <el-button size="small" type="primary" @click="editContsubmit" :loading="showBoxCont.editBoxIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeEditDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+
+
     </el-scrollbar>
 </template>
 <script>
-import { getDoubleWorkerList } from "@/api/systemaccredit/systemhrapi"
+import { getDoubleWorkerList,AddDoubleWorker,EditDoubleWorker,editDoubleWorkerState } from "@/api/systemaccredit/systemhrapi"
 export default {
     name:"emergencycontact",
     props:['userKey'],
     data() {
         return {
             emergencyContactList:[], //双职工
+            showBoxCont:{
+                addBox:false,
+                addBoxIsTrue:false,
+                editBox:false,
+                editBoxIsTrue:false,
+                delBox:false,
+                delBoxIsTrue:false,
+            },
+            addCont:{
+                id:"",
+                name:"",
+                company:"",
+                department:"",
+                position:"",
+                mobilephone:""
+            }, //添加双职工数据
+            addRules:{
+                name: [{ required: true, message: '必填', trigger: 'blur' }],
+                mobilephone: [
+                    { required: true, message: '必填', trigger: 'blur' },
+                    { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
+                    {
+                        pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+                        message: "请输入正确的手机号码", 
+                        trigger: "blur"
+                    },
+                ],
+                company: [{ required: true, message: '必填', trigger: 'blur' }],
+                department: [{ required: true, message: '必填', trigger: 'blur' }]
+            }, //添加双职工验证
+            editCont:{}, //编辑双职工信息
         }
     },
     created(){
@@ -79,7 +166,58 @@ export default {
     methods:{
         //编辑基本信息
         showAddBase(val){
-            console.log("编辑基本信息--------->",val)  
+            console.log("编辑基本信息--------->",val) 
+            this.addCont.id = val 
+            this.showBoxCont.addBox = true
+        },
+        //添加数据处理
+        async addContsubmit(){
+            console.log("添加数据处理--------->",this.addCont) 
+            this.showBoxCont.addBoxIsTrue = true;
+            this.$refs.addForm.validate(async valid => {
+                if (valid) {
+                    let res = await AddDoubleWorker(this.addCont)
+                    if(res.code == 0){
+                        this.$confirm('新增成功！是否继续添加？', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            this.showBoxCont.addBoxIsTrue = false;
+                            this.initData();
+                            this.getEmergencyContact();
+                            this.$forceUpdate()
+                        }).catch(() => {
+                            this.showBoxCont.addBoxIsTrue = false;
+                            this.getEmergencyContact();
+                            this.$forceUpdate();
+                            this.closeAddDialog();       
+                        });
+                    }
+                }else {
+                    this.showBoxCont.addBoxIsTrue = false;
+                    return false;
+                }
+            });
+        },
+        //关闭添加双职工弹窗
+        closeAddDialog(){
+            this.showBoxCont.addBox = false;
+            this.showBoxCont.addBoxIsTrue = false;
+            this.initData();
+            // this.initForm();
+        },
+        //初始化添加数据
+        initData(){
+            this.$refs.addForm.resetFields();
+            this.addCont={
+                // id:"",
+                name:"",
+                company:"",
+                department:"",
+                position:"",
+                mobilephone:""
+            }
         },
         //获取双职工信息
         async getEmergencyContact(){
@@ -93,10 +231,66 @@ export default {
         //编辑
         async showEditBase(val){
             console.log("编辑--------->",val)  
+            this.editCont={
+                id:val.id.toString(),
+                name:val.name,
+                company:val.company,
+                department:val.department,
+                position:val.position,
+                mobilephone:val.tel
+            }
+            this.showBoxCont.editBox = true
+        },
+        //提交编辑数据
+        async editContsubmit(){
+            this.showBoxCont.editBoxIsTrue = true;
+            this.$refs.editForm.validate(async valid => {
+                // console.log("提交编辑数据提交数据---------------2--",valid)
+                if (valid) {
+                    let res = await EditDoubleWorker(this.editCont)
+                    if(res.code == 0){
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            showClose: true
+                        })
+                        this.getEmergencyContact();
+                        this.closeEditDialog();
+                        this.$forceUpdate();
+                    }
+                }else {
+                    this.showBoxCont.editBoxIsTrue = false;
+                    return false;
+                }
+            });
+        },
+        //关闭编辑弹窗
+        closeEditDialog(){
+            this.showBoxCont.editBox = false;
+            this.showBoxCont.editBoxIsTrue = false;
         },
         //删除
         async showDelBase(val){
-            console.log("删除--------->",val)  
+            console.log("删除--------->",val) 
+            this.$confirm('确定要删除吗？已经删除，资料将不复存在！', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+            }).then(async() => {
+                let sendData = {
+                    id:val.id.toString(),
+                    state:3,
+                } 
+                let res = await editDoubleWorkerState(sendData)
+                if(res.code == 0){
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        showClose: true
+                    })
+                    this.getEmergencyContact();
+                }
+            }); 
         },
     }
 }
diff --git a/src/views/hr/newhr/emergencycontact.vue b/src/views/hr/newhr/emergencycontact.vue
index 5a9d123..b75b2f8 100644
--- a/src/views/hr/newhr/emergencycontact.vue
+++ b/src/views/hr/newhr/emergencycontact.vue
@@ -57,16 +57,93 @@
                 </template>
             </el-col>
         </el-row>
+
+        <!--添加紧急联系人-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="showBoxCont.addBox" title="添加紧急联系人" :before-close="closeAddDialog"  width="40%">
+            <el-form ref="addForm" :model="addCont" :rules="addRules" label-width="120px" class="demo-ruleForm">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model="addCont.name"  placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobilephone">
+                    <el-input v-model="addCont.mobilephone"  placeholder="请输入紧急联系人电话"></el-input>
+                </el-form-item>
+                <el-form-item label="与联系人关系" prop="relationship">
+                    <el-input v-model="addCont.relationship"  placeholder="请输入紧急联系人与您的关系"></el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer "> 
+                    <el-button size="small" type="primary" @click="addContsubmit" :loading="showBoxCont.addBoxIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeAddDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <!--编辑紧急联系人-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="showBoxCont.editBox" title="编辑紧急联系人信息" :before-close="closeEditDialog"  width="40%">
+            <el-form ref="editForm" :model="editCont" :rules="addRules" label-width="120px" class="demo-ruleForm">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model="editCont.name"  placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobilephone">
+                    <el-input v-model="editCont.mobilephone"  placeholder="请输入紧急联系人电话"></el-input>
+                </el-form-item>
+                <el-form-item label="与联系人关系" prop="relationship">
+                    <el-input v-model="editCont.relationship"  placeholder="请输入紧急联系人与您的关系"></el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer "> 
+                    <el-button size="small" type="primary" @click="editContsubmit" :loading="showBoxCont.editBoxIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeEditDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+
     </el-scrollbar>
 </template>
 <script>
-import { getEmergencyContactList } from "@/api/systemaccredit/systemhrapi"
+import { getEmergencyContactList,addEmercyCall,editEmercyCallState,editEmercyCallCont } from "@/api/systemaccredit/systemhrapi"
 export default {
     name:"emergencycontact",
     props:['userKey'],
     data() {
         return {
             emergencyContactList:[], //紧急联系人
+            showBoxCont:{
+                addBox:false,
+                addBoxIsTrue:false,
+                editBox:false,
+                editBoxIsTrue:false,
+                delBox:false,
+                delBoxIsTrue:false,
+            },
+            addCont:{
+                name:"",
+                mobilephone:"",
+                relationship:""
+            }, //添加紧急联系人数据
+            addRules:{
+                name: [{ required: true, message: '必填', trigger: 'blur' }],
+                mobilephone: [
+                    { required: true, message: '必填', trigger: 'blur' },
+                    { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
+                    {
+                        pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+                        message: "请输入正确的手机号码", 
+                        trigger: "blur"
+                    },
+                ],
+                relationship: [{ required: true, message: '必填', trigger: 'blur' }]
+            }, //添加紧急联系人验证
+            editCont:{
+                id:"",
+                name:"",
+                mobilephone:"",
+                relationship:""
+            },  //编辑紧急联系人信息
+            
         }
     },
     created(){
@@ -74,9 +151,60 @@ export default {
         this.getEmergencyContact()
     },
     methods:{
-        //编辑基本信息
+        //添加紧急联系人
         showAddBase(val){
-            console.log("编辑基本信息--------->",val)  
+            console.log("添加紧急联系人--------->",val)  
+            this.showBoxCont.addBox = true;
+        },
+        //关闭添加紧急联系人弹窗
+        closeAddDialog(){
+            this.showBoxCont.addBox = false;
+            this.showBoxCont.addBoxIsTrue = false;
+            this.initData();
+        },
+        //提交添加紧急联系人数据
+        async addContsubmit(){
+            this.showBoxCont.addBoxIsTrue = true;
+            this.$refs.addForm.validate(async valid => {
+                console.log("提交添加紧急联系人数据---------------2--",valid)
+                if (valid) {
+                    let sendData = {
+                        id:this.userKey,
+                        list:[
+                            this.addCont 
+                        ]
+                    }
+                    let res = await addEmercyCall(sendData)
+                    this.$confirm('新增成功！是否继续添加？', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.showBoxCont.addBoxIsTrue = false;
+                        this.initData();
+                        this.getEmergencyContact();
+                        this.$forceUpdate()
+                    }).catch(() => {
+                        this.showBoxCont.addBoxIsTrue = false;
+                        this.getEmergencyContact();
+                        this.$forceUpdate();
+                        this.closeAddDialog();       
+                    });
+                } else {
+                    // console.log('error submit!!');
+                    this.showBoxCont.addBoxIsTrue = false;
+                    return false;
+                }
+            });
+        },
+        //初始化添加数据
+        initData(){
+            this.$refs.addForm.resetFields();
+            this.addCont={
+                name:"",
+                tel:"",
+                relationship:""
+            }
         },
         //获取紧急联系人信息
         async getEmergencyContact(){
@@ -89,12 +217,66 @@ export default {
         },
         //编辑
         async showEditBase(val){
-            console.log("编辑--------->",val)  
+            console.log("编辑--------->",val)   
+            this.editCont={
+                id:val.id.toString(),
+                name:val.name,
+                mobilephone:val.tel,
+                relationship:val.relationship
+            }  //编辑紧急联系人信息
+            this.showBoxCont.editBox = true;
+        },
+        //编辑数据提交
+        async editContsubmit(){
+            this.showBoxCont.editBoxIsTrue = true;
+            this.$refs.editForm.validate(async valid => {
+                console.log("提交编辑数据提交数据---------------2--",valid)
+                if (valid) {
+                    let res = await editEmercyCallCont(this.editCont)
+                    if(res.code == 0){
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            showClose: true
+                        })
+                        this.getEmergencyContact();
+                        this.closeEditDialog();
+                    }
+                }else {
+                    this.showBoxCont.editBoxIsTrue = false;
+                    return false;
+                }
+            });
+        },
+        //关闭紧急联系人编辑窗口
+        closeEditDialog(){
+            this.showBoxCont.editBox = false;
+            this.showBoxCont.editBoxIsTrue = false;
         },
         //删除
         async showDelBase(val){
-            console.log("删除--------->",val)  
+            this.$confirm('确定要删除吗？已经删除，资料将不复存在！', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+            }).then(async() => {
+                let sendData = {
+                    id:val.id.toString(),
+                    state:3,
+                } 
+                let res = await editEmercyCallState(sendData)
+                if(res.code == 0){
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        showClose: true
+                    })
+                    this.getEmergencyContact();
+                }
+            });
+            
         },
+        //
     }
 }
 </script>
diff --git a/src/views/hr/newhr/employmentrelationship.vue b/src/views/hr/newhr/employmentrelationship.vue
index af30c11..0d8c2d1 100644
--- a/src/views/hr/newhr/employmentrelationship.vue
+++ b/src/views/hr/newhr/employmentrelationship.vue
@@ -2,7 +2,37 @@
     <el-scrollbar >
         <el-row class="title_body">
             <el-col :span="20">
-                <span class="cont_header_title"><i class="el-icon-s-order"></i>员工用工关系</span>
+                <span class="cont_header_title"><i class="el-icon-s-order"></i>集团年限信息</span>
+            </el-col>
+            <el-col :span="4" class="edit_buttion">
+                <el-button
+                icon="el-icon-plus"
+                size="small"
+                type="text"
+                @click="showAddBase(userKey)"
+                >编辑</el-button>
+            </el-col>
+        </el-row>
+        <el-divider style="margin:0"></el-divider>
+        <el-row>
+            <el-col :span="24" class="cont_body">
+
+                <el-descriptions class="margin-top" :column="4" direction="vertical">
+                    
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="首次加入集团日期"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="本次加入集团日期"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="集团工龄（年）"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="实际工龄"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    
+                </el-descriptions>
+                
+
+
+            </el-col>
+        </el-row>
+        <el-row class="title_body">
+            <el-col :span="20">
+                <span class="cont_header_title"><i class="el-icon-s-order"></i>公司职业信息</span>
             </el-col>
             <el-col :span="4" class="edit_buttion">
                 <el-button
@@ -16,6 +46,18 @@
         <el-divider style="margin:0"></el-divider>
         <el-row>
             <el-col :span="24" class="cont_body">
+
+                <el-descriptions class="margin-top" :column="4" direction="vertical">
+                    
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="面试人"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="面试评语"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="集团工龄（年）"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="实际工龄"><div class="bottment_line">{{ userKey }}</div></el-descriptions-item>
+                    
+                </el-descriptions>
+                
+
+
             </el-col>
         </el-row>
     </el-scrollbar>
diff --git a/src/views/hr/newhr/familymembers.vue b/src/views/hr/newhr/familymembers.vue
index b3103e4..ff7f16e 100644
--- a/src/views/hr/newhr/familymembers.vue
+++ b/src/views/hr/newhr/familymembers.vue
@@ -70,16 +70,123 @@
                 </template>
             </el-col>
         </el-row>
+
+
+        <!--添加-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="showBoxCont.addBox" title="添加信息" :before-close="closeAddDialog"  width="40%">
+            <el-form ref="addForm" :model="addCont" :rules="addRules" label-width="120px" class="demo-ruleForm">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model="addCont.name"  placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobilephone">
+                    <el-input v-model="addCont.mobilephone"  placeholder="请输入信息电话"></el-input>
+                </el-form-item>
+                <el-form-item label="所在公司" >
+                    <el-input v-model="addCont.company"  placeholder="请输入所在公司"></el-input>
+                </el-form-item>
+                <el-form-item label="所在部门" >
+                    <el-input v-model="addCont.department"  placeholder="请输入所在部门"></el-input>
+                </el-form-item>
+                <el-form-item label="亲属关系" >
+                    <el-input v-model="addCont.relationship"  placeholder="请输入亲属关系"></el-input>
+                </el-form-item >
+                <el-form-item label="政治面貌" >
+                    <el-select v-model="addCont.politicaloutlook" placeholder="请选择政治面貌">
+                        <el-option v-for="itemPoliti in politicsList" :label="itemPoliti.tittle" :value="itemPoliti.id" :key="itemPoliti.id"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer "> 
+                    <el-button size="small" type="primary" @click="addContsubmit" :loading="showBoxCont.addBoxIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeAddDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <!--编辑-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="showBoxCont.editBox" title="编辑信息" :before-close="closeEditDialog"  width="40%">
+            <el-form ref="editForm" :model="editCont" :rules="addRules" label-width="120px" class="demo-ruleForm">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model="editCont.name"  placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobilephone">
+                    <el-input v-model="editCont.mobilephone"  placeholder="请输入信息电话"></el-input>
+                </el-form-item>
+                <el-form-item label="所在公司" >
+                    <el-input v-model="editCont.company"  placeholder="请输入所在公司"></el-input>
+                </el-form-item>
+                <el-form-item label="所在部门" >
+                    <el-input v-model="editCont.department"  placeholder="请输入所在部门"></el-input>
+                </el-form-item>
+                <el-form-item label="亲属关系" >
+                    <el-input v-model="editCont.relationship"  placeholder="请输入亲属关系"></el-input>
+                </el-form-item >
+                <el-form-item label="政治面貌" >
+                    <el-select v-model="editCont.politicaloutlook" placeholder="请选择政治面貌">
+                        <el-option v-for="itemPoliti in politicsList" :label="itemPoliti.tittle" :value="itemPoliti.id" :key="itemPoliti.id"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer "> 
+                    <el-button size="small" type="primary" @click="editContsubmit" :loading="showBoxCont.editBoxIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeEditDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+
+
+
+
+
+
+
+
+
+
     </el-scrollbar>
 </template>
 <script>
-import { getFamilyList } from "@/api/systemaccredit/systemhrapi"
+import { getFamilyList,addFamilyMembers,editFamilyMembers,editFamilyMembersState } from "@/api/systemaccredit/systemhrapi"
+import { peopleMethod } from "@/api/people/peopledata"
 export default {
     name:"familymembers",
     props:['userKey'],
     data() {
         return {
             contList:[],           //列表信息
+            politicsList:peopleMethod.politicsList, //政治面貌
+            showBoxCont:{
+                addBox:false,
+                addBoxIsTrue:false,
+                editBox:false,
+                editBoxIsTrue:false,
+            },
+            addCont:{
+                name:"",
+                relationship:"",
+                mobilephone:"",
+                company:"",
+                department:"",
+                politicaloutlook:""
+            }, //添加数据
+            addRules:{
+                name: [{ required: true, message: '必填', trigger: 'blur' }],
+                mobilephone: [
+                    { required: true, message: '必填', trigger: 'blur' },
+                    { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
+                    {
+                        pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+                        message: "请输入正确的手机号码", 
+                        trigger: "blur"
+                    },
+                ],
+                company: [{ required: true, message: '必填', trigger: 'blur' }],
+                department: [{ required: true, message: '必填', trigger: 'blur' }]
+            }, //添加验证
+            editCont:{}, //编辑信息
         }
     },
     created(){
@@ -90,6 +197,62 @@ export default {
         //新增信息
         showAddBase(val){
             console.log("新增信息--------->",val)  
+            this.showBoxCont.addBox=true
+           
+        },
+        //新增数据处理
+        async addContsubmit(){
+            this.showBoxCont.addBoxIsTrue = true;
+            this.$refs.addForm.validate(async valid => {
+                if (valid) {
+                    let userKeyStr = this.userKey*1
+                    let sendData = {
+                        // id:userKeyStr.toString(),
+                        id:this.userKey,
+                        list:[this.addCont]
+                    }
+                    let res = await addFamilyMembers(sendData)
+                    if(res.code == 0){
+                        this.$confirm('新增成功！是否继续添加？', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                        }).then(() => {
+                            this.showBoxCont.addBoxIsTrue = false;
+                            this.initData();
+                            this.getEmergencyContact();
+                            this.$forceUpdate()
+                        }).catch(() => {
+                            this.showBoxCont.addBoxIsTrue = false;
+                            this.getEmergencyContact();
+                            this.$forceUpdate();
+                            this.closeAddDialog();       
+                        });
+                    }
+                }else {
+                    this.showBoxCont.addBoxIsTrue = false;
+                    return false;
+                }
+            });
+        },
+        //关闭添加双职工弹窗
+        closeAddDialog(){
+            this.showBoxCont.addBox = false;
+            this.showBoxCont.addBoxIsTrue = false;
+            this.initData();
+            // this.initForm();
+        },
+        //初始化添加数据
+        initData(){
+            this.$refs.addForm.resetFields();
+            this.addCont={
+                name:"",
+                relationship:"",
+                mobilephone:"",
+                company:"",
+                department:"",
+                politicaloutlook:""
+            }
         },
         //获取列表信息
         async getEmergencyContact(){
@@ -102,11 +265,66 @@ export default {
         },
         //编辑
         async showEditBase(val){
-            console.log("编辑--------->",val)  
+            console.log("编辑--------->",val) 
+            this.editCont={
+                id:val.id.toString(),
+                name:val.name,
+                relationship:val.relationship,
+                mobilephone:val.tel,
+                company:val.company,
+                department:val.deparment,
+                politicaloutlook:val.politicaloutlook
+            };
+            this.showBoxCont.editBox=true
+        },
+        //编辑数据提交
+        async editContsubmit(){
+            this.showBoxCont.editBoxIsTrue = true;
+            this.$refs.editForm.validate(async valid => {
+                // console.log("提交编辑数据提交数据---------------2--",valid)
+                if (valid) {
+                    let res = await editFamilyMembers(this.editCont)
+                    if(res.code == 0){
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            showClose: true
+                        })
+                        this.getEmergencyContact();
+                        this.closeEditDialog();
+                        this.$forceUpdate();
+                    }
+                }else {
+                    this.showBoxCont.editBoxIsTrue = false;
+                    return false;
+                }
+            });
+        },
+        closeEditDialog(){
+            this.showBoxCont.editBox=false;
+            this.showBoxCont.editBoxIsTrue=false;
         },
         //删除
         async showDelBase(val){
-            console.log("删除--------->",val)  
+            this.$confirm('确定要删除吗？已经删除，资料将不复存在！', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+            }).then(async() => {
+                let sendData = {
+                    id:val.id.toString(),
+                    state:3,
+                } 
+                let res = await editFamilyMembersState(sendData)
+                if(res.code == 0){
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        showClose: true
+                    })
+                    this.getEmergencyContact();
+                }
+            }); 
         },
     }
 }
diff --git a/src/views/hr/newhr/people.vue b/src/views/hr/newhr/people.vue
index 7a68273..aa8b9d2 100644
--- a/src/views/hr/newhr/people.vue
+++ b/src/views/hr/newhr/people.vue
@@ -671,11 +671,26 @@ export default {
         }
     },
     created(){
+        // this.searchInfo= {
+        //         page: this.$route.query.page,
+        //         number:this.$route.query.number,
+        //         name:this.$route.query.name,
+        //         hireclass:this.$route.query.hireclass,
+        //         company:this.$route.query.company,
+        //         adminorg:this.$route.query.adminorg,
+        //         position:this.$route.query.position,
+        //         emptype:this.$route.query.emptype,
+        //         role:this.$route.query.role
+        //     }
+        if(this.$route.query.page) this.searchInfo.page=this.$route.query.page;
+        if(this.$route.query.adminorg) this.searchInfo.adminorg=this.$route.query.adminorg;
+        if(this.$route.query.position) this.searchInfo.position=this.$route.query.position;
         // 页面渲染时获取初始数据
         this.getGovthree2();
         this.getPeopleList()
         this.getTeam();
         this.getDutieslist();
+        
     },
     methods:{
         //   获取行政组织二级树
@@ -692,6 +707,7 @@ export default {
         
         // 点击行政组织树
         handleNodeClick(val) {
+            this.searchInfo.page= 1;
             // this.searchInfo.organization=val.id
             // this.searchInfo.organization=this.searchInfo.organization.toString()
             this.getPost(val.id);
@@ -712,6 +728,7 @@ export default {
         },
         // 点击岗位列表
         NodePostClick(val) {
+            this.searchInfo.page= 1;
             this.searchInfo.position=val.id
             this.getPeopleList()
         },
@@ -729,6 +746,7 @@ export default {
         },
         //查询
         searchSubmit(){
+            this.searchInfo.page= 1;
             this.getPeopleList()
         },
         //新增人员
@@ -830,7 +848,16 @@ export default {
             this.$router.push({
                 path:'/hr/employeeinformation',
                 query:{
-                    id:val.id
+                    id:val.id,
+                    page:this.searchInfo.page,
+                    number:this.searchInfo.number,
+                    name:this.searchInfo.name,
+                    hireclass:this.searchInfo.hireclass,
+                    company:this.searchInfo.company,
+                    adminorg:this.searchInfo.adminorg,
+                    position:this.searchInfo.position,
+                    emptype:this.searchInfo.emptype,
+                    role:this.searchInfo.page,
                 }
             })
         },
diff --git a/src/views/hr/newhr/peoplecont.vue b/src/views/hr/newhr/peoplecont.vue
index 5e45349..d2287cd 100644
--- a/src/views/hr/newhr/peoplecont.vue
+++ b/src/views/hr/newhr/peoplecont.vue
@@ -7,7 +7,7 @@
                         <i class="el-icon-s-custom icon_size"></i>
                     </el-avatar>
                 </el-col>
-                <el-col :span="14">
+                <el-col :span="18">
                     <el-row>
                         <el-col :span="24" class="mycont_one">
                             <span>{{ peopleCont.name }}</span> <a>工号：{{ peopleCont.number }}</a>{{ peopleCont.positionname }} 
@@ -22,7 +22,29 @@
                         <el-col class="col_text" :span="24">{{ peopleCont.joblevename }}{{ peopleCont.jobname }}（ {{ peopleCont.jobclassname }} ）  <span>{{ peopleCont.teamname }}</span><span>TEL:{{ peopleCont.tel }}</span></el-col>
                     </el-row>
                 </el-col>
-                
+                <el-col :span="4">
+
+                    <el-row>
+                        <el-col :span="24" class="col_text_but">
+                            <el-button
+                            style="padding:0px"
+                                size="mini"
+                                type="text"
+                                @click="callBackPage"
+                            ><i class="fa fa-reply"></i>返回</el-button>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="24" class="col_text_title">
+                            资料完整度
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="24" class="col_text_yuan">
+                            <el-progress :width="windthSize" type="circle" :percentage="sata_integrity"></el-progress>
+                        </el-col>
+                    </el-row>
+                </el-col>
             </el-row>
         </el-header>
         <el-container>
@@ -122,7 +144,7 @@
     </el-container>
 </template>
 <script>
-import { getOnlyOnePeopleCont,getOnlyOnePeopleMainCont } from "@/api/systemaccredit/systemhrapi"
+import { getDataIntegrity,getOnlyOnePeopleMainCont } from "@/api/systemaccredit/systemhrapi"
 
 import {
     peopleinfor,
@@ -153,18 +175,44 @@ export default {
     },
     data() {
         return {
+            windthSize:65,
+            sata_integrity:0,   //资料完整度
             userid:"",  //员工ID
             userKey: "",    //员工Key
             peopleCont:{},          //人员基本信息
             pageSetUp:1,    //显示那个页面
+            searchInfo: {
+                page: 1,
+                number:"",
+                name:"",
+                hireclass:0,
+                company:0,
+                adminorg:0,
+                position:0,
+                emptype:"",
+                role:""
+            },
         }
     },
     
     created(){
         let id = this.$route.query.id
+        this.searchInfo= {
+                page: this.$route.query.page,
+                number:this.$route.query.number,
+                name:this.$route.query.name,
+                hireclass:this.$route.query.hireclass,
+                company:this.$route.query.company,
+                adminorg:this.$route.query.adminorg,
+                position:this.$route.query.position,
+                emptype:this.$route.query.emptype,
+                role:this.$route.query.role
+            },
+        
         console.log("接收值id----------》",id)
         this.userid = id
         this.getPeopleCont(id)
+        this.getDataIntegrity(id)
     },
     methods:{
        
@@ -183,6 +231,36 @@ export default {
             console.log("单击菜单操作----------》",id)
             this.pageSetUp = id
         },
+        //返回
+        //查看详情
+        async callBackPage(){
+            
+            this.$router.push({
+                path:'/hr/personnel',
+                query:{
+                    page:this.searchInfo.page,
+                    number:this.searchInfo.number,
+                    name:this.searchInfo.name,
+                    hireclass:this.searchInfo.hireclass,
+                    company:this.searchInfo.company,
+                    adminorg:this.searchInfo.adminorg,
+                    position:this.searchInfo.position,
+                    emptype:this.searchInfo.emptype,
+                    role:this.searchInfo.page,
+                }
+                
+            })
+        },
+        //获取资料完整度
+        async getDataIntegrity(id){
+            let sendData = {
+                id:this.id,
+                idstr:id.toString()
+            }
+            let res = await getDataIntegrity(sendData)
+            this.sata_integrity = res.data
+            console.log("获取资料完整度----------》",res)
+        },
     }
 }
 </script>
@@ -241,6 +319,23 @@ export default {
     .col_text span{
         margin-left: 25px;
     }
+    .col_text_but{
+        line-height: 20px;
+        text-align: right;
+        padding-right: 10px;
+    }
+    .col_text_title{
+        line-height: 20px;
+        text-align: right;
+        padding-right: 10px;
+        font-size: 12px;
+    }
+    .col_text_yuan{
+        line-height: 25px;
+        text-align: right;
+        padding-right: 10px;
+        font-size: 12px;
+    }
 
     .font_icon{
         margin-right: 5px;
@@ -255,4 +350,16 @@ export default {
         /*font-size: 18px;*/
         margin-left: 15px;
     }
+    .callback{
+        text-align:right;
+        width:100%;
+        padding:0 10px 0 0;
+    }
+    .callback_ziliao{
+        width:100%;
+        text-align: right;
+        font-size: 10px;
+        margin-top: 5px;
+        padding-right: 10px;
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/hr/newhr/peopleinfor.vue b/src/views/hr/newhr/peopleinfor.vue
index d3a47b8..70ed61b 100644
--- a/src/views/hr/newhr/peopleinfor.vue
+++ b/src/views/hr/newhr/peopleinfor.vue
@@ -9,7 +9,7 @@
                 icon="el-icon-edit"
                 size="small"
                 type="text"
-                @click="showEditBase(scope.row)"
+                @click="showEditBase(myCont)"
                 >编辑</el-button>
             </el-col>
         </el-row>
@@ -26,10 +26,10 @@
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="健康状况"><div class="bottment_line">{{ replace.health }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="婚姻状况"><div class="bottment_line">{{ replace.maritalstatus }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="政治面貌"><div class="bottment_line">{{ replace.politicaloutlook }}</div></el-descriptions-item>
-                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="出生日期"><div class="bottment_line">{{ myCont.birthday }}</div></el-descriptions-item>
+                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="出生日期"><div class="bottment_line">{{ myCont.birthdaytime }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="身份证号"><div class="bottment_line">{{ myCont.idcardno }}</div></el-descriptions-item>
-                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="身份证有效期开始"><div class="bottment_line">{{ myCont.idcardstartdate }}</div></el-descriptions-item>
-                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="身份证有效期结束"><div class="bottment_line">{{ myCont.idcardenddate }}</div></el-descriptions-item>
+                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="身份证有效期开始"><div class="bottment_line">{{ myCont.idcardstarttimedata }}</div></el-descriptions-item>
+                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="身份证有效期结束"><div class="bottment_line">{{ myCont.idcardendtimedata }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="身份证地址"><div class="bottment_line">{{ myCont.idcardaddress }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="身份证签发机关"><div class="bottment_line">{{ myCont.idcardIssued }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="手机号码"><div class="bottment_line">{{ myCont.mobilephone }}</div></el-descriptions-item>
@@ -40,10 +40,10 @@
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="星座"><div class="bottment_line">{{ replace.constellationing }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="雇佣类型"><div class="bottment_line">{{ replace.hireclass }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="用工关系"><div class="bottment_line">{{ replace.emptype }}</div></el-descriptions-item>
-                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="入职日期"><div class="bottment_line">{{ myCont.entrydate }}</div></el-descriptions-item>
-                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="试用期"><div class="bottment_line">{{ myCont.probationperiod }}</div></el-descriptions-item>
-                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="预计转正日期"><div class="bottment_line">{{ myCont.planformaldate }}</div></el-descriptions-item>
-                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="参加工作日期"><div class="bottment_line">{{ myCont.jobstartdate }}</div></el-descriptions-item>
+                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="入职日期"><div class="bottment_line">{{ myCont.entrydatetime }}</div></el-descriptions-item>
+                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="试用期"><div class="bottment_line">{{ myCont.probationperiod }}月</div></el-descriptions-item>
+                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="预计转正日期"><div class="bottment_line">{{ myCont.planformaldatetime }}</div></el-descriptions-item>
+                        <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="参加工作日期"><div class="bottment_line">{{ myCont.jobstartdatestr }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="是否为退役军人"><div class="bottment_line">{{ replace.isveterans }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="退役证编号"><div class="bottment_line">{{ myCont.veteransnumber }}</div></el-descriptions-item>
                         <el-descriptions-item label-class-name="my_label_c" content-class-name="bottment_cont" label="护照号码"><div class="bottment_line">{{ myCont.passportno }}</div></el-descriptions-item>
@@ -65,7 +65,7 @@
                 icon="el-icon-edit"
                 size="small"
                 type="text"
-                @click="showEditBaseOrg(scope.row)"
+                @click="showEditBaseOrg(myCont)"
                 >编辑</el-button>
             </el-col>
         </el-row>
@@ -83,11 +83,316 @@
                 </template>
             </el-col>
         </el-row>
+        <!--编辑员工基本信息-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="editSetUp.cont" title="编辑基本信息" :before-close="closeEditContDialog"  width="60%">
+            <el-form ref="editContData" :model="editContData" :rules="editContRules" label-width="140px"  class="demo-ruleForm">
+
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="手机号码" prop="mobilephone">
+                            <el-input v-model="editContData.mobilephone" placeholder="请输入手机号码"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="身份证号" prop="idcardno">
+                            <el-input v-model="editContData.idcardno"  placeholder="请输入身份证号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="入职日期" prop="joinedDate">
+                            <el-date-picker
+                                format="yyyy 年 MM 月 dd 日"
+                                @change="entryChangeDate"
+                                v-model="joinedDate"
+                                type="date"
+                                placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="试用期"  prop="probationperiod">
+                            <el-input-number v-model="editContData.probationperiod"  :min="1" :max="12" label="试用期" placeholder="试用期" @change="handleChange"></el-input-number>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="预计转正日期" >
+                            <el-input v-model="confirmationdateval" disabled placeholder="预计转正日期"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="参加工作日期" >
+                            <el-date-picker
+                                format="yyyy 年 MM 月 dd 日"
+                                @change="workdayChange"
+                                v-model="workingdate"
+                                type="date"
+                                placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                
+
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="曾用名" >
+                            <el-input v-model="editContData.nameusedbefore"  placeholder="曾用名"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="性别" >
+                            <el-select v-model="editContData.gender" placeholder="请选择性别">
+                                <el-option v-for="itemGender in genderList" :label="itemGender.tittle" :value="itemGender.id" :key="itemGender.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="民族" >
+                            <el-input v-model="editContData.myfolk"  placeholder="民族"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="政治面貌" >
+                            <el-select v-model="editContData.politicaloutlook" placeholder="请选择政治面貌">
+                                <el-option v-for="itemPoliti in politicsList" :label="itemPoliti.tittle" :value="itemPoliti.id" :key="itemPoliti.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="健康状况" >
+                            <el-select v-model="editContData.health" placeholder="请选择健康状况">
+                                <el-option v-for="itemHeal in healthList" :label="itemHeal.tittle" :value="itemHeal.id" :key="itemHeal.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="生日" >
+                            <el-date-picker
+                                format="yyyy 年 MM 月 dd 日"
+                                @change="birthdayChange"
+                                v-model="birthday"
+                                type="date"
+                                placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="身份证有效期开始" >
+                            <el-date-picker
+                                format="yyyy 年 MM 月 dd 日"
+                                @change="idCodeTimeStartChange"
+                                v-model="idCardStartTimeStr"
+                                type="date"
+                                placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="身份证有效期结束" >
+                            <el-date-picker
+                                format="yyyy 年 MM 月 dd 日"
+                                @change="idCodeTimeEndChange"
+                                v-model="idCardEndTimeStr"
+                                type="date"
+                                placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="身份证地址" >
+                            <el-input v-model="editContData.idcardaddress"  placeholder="请输入身份证地址"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="身份证签发机关" >
+                            <el-input v-model="editContData.idcardIssued"  placeholder="请输入身份证签发机关"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="现居住地址" >
+                            <el-input v-model="editContData.currentresidence" placeholder="请输入现居住地址"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="籍贯" >
+                            <el-input v-model="editContData.nativeplace" placeholder="请输入籍贯"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="电子邮件" >
+                            <el-input v-model="editContData.email" placeholder="请输入电子邮件"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="内线电话" >
+                            <el-input v-model="editContData.internaltelephone" placeholder="请输入内线电话"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="雇佣类型" >
+                            <el-select v-model="editContData.hireclass" placeholder="请选择雇佣类型">
+                                <el-option v-for="itemEmploy in employmentType" :label="itemEmploy.tittle" :value="itemEmploy.id" :key="itemEmploy.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="用工关系" >
+                            <el-select v-model="editContData.emptype" placeholder="请选择用工关系">
+                                <el-option v-for="itemEmpType in emptypeList" :label="itemEmpType.tittle" :value="itemEmpType.id" :key="itemEmpType.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="是否为退役军人">
+                            <el-select v-model="editContData.isveterans" placeholder="请选择是否为退役军人">
+                                <el-option label="是" :value="1"></el-option>
+                                <el-option label="否" :value="2"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="退役证编号" >
+                            <el-input v-model="editContData.veteransnumber"  placeholder="请输入退役证编号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="护照号码" >
+                            <el-input v-model="editContData.passportno"  placeholder="请输入护照号码"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="国际区号" >
+                            <el-input v-model="editContData.globalroaming"  placeholder="请输入国际区号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="绑定微信" >
+                            <el-input v-model="editContData.wechat"  placeholder="请输入微信OpenId"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="绑定企业微信" >
+                            <el-input v-model="editContData.workwechat"  placeholder="请输入企业微信OpenId"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="星座" >
+                            <el-select v-model="editContData.constellationing" placeholder="请选择星座">
+                                <el-option v-for="itemConstell in constellationList" :label="itemConstell.tittle" :value="itemConstell.id" :key="itemConstell.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="婚姻状况" >
+                            <el-select v-model="editContData.maritalstatus" placeholder="婚姻状况">
+                                <el-option v-for="itemConstell in marriageList" :label="itemConstell.tittle" :value="itemConstell.id" :key="itemConstell.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        
+                    </el-col>
+                </el-row>
+                
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer ">  
+                    <el-button size="small" type="primary" @click="editContContsubmit" :loading="editContIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeEditContDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+        <!--编辑行政组织-->
+        <el-dialog :close-on-click-modal="false" :visible.sync="editSetUp.org" title="编辑行政组织关系" :before-close="closeEditOrgDialog"  width="40%">
+            <el-form ref="editForm" :model="ediOrgCont" :rules="editOrgRules" label-width="100px" >
+                <el-form-item label="归属组织" prop="orglist">
+                    <el-cascader clearable v-model="ediOrgCont.orglist" :options="grouplist" @change="orgChange" :props="propsdepart" style="width:100%"></el-cascader>
+                </el-form-item>
+                <el-form-item label="岗位"  prop="position">
+                    <el-select filterable v-model="ediOrgCont.position" clearable placeholder="请选择" >
+                        <el-option
+                            v-for="item in postListAdd"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="职务" prop="jobid">
+                    <el-select filterable v-model="ediOrgCont.jobid" clearable placeholder="请选择">
+                        <el-option
+                            v-for="item in dutieslist"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="职务等级" prop="jobleve">
+                    <el-select filterable v-model="ediOrgCont.jobleve" clearable placeholder="请选择">
+                        <el-option
+                            v-for="item in positiongrade"
+                            :key="item.id"
+                            :label="item.tittle"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="班组" prop="teamid">
+                    <el-select filterable v-model="ediOrgCont.teamid" clearable placeholder="请选择">
+                        <el-option
+                            v-for="item in teamcontlist"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <template #footer class="el_dialog__footer">
+                <div class="dialog-footer "> 
+                    <el-button size="small" type="primary" @click="editOrgContsubmit" :loading="editOrgIsTrue">确 定</el-button> 
+                    <el-button size="small" @click="closeEditOrgDialog">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
     </el-scrollbar>
 </template>
 <script>
-import { getOnlyOnePeopleCont } from "@/api/systemaccredit/systemhrapi"
-import { peopleMethod } from "@/api/people/peopledata"
+import {  positionlist,archiveslist,teamcontlist,orgThreeList,positionlistIsMe,dutieslist } from "@/api/personnel/post";
+import { getOnlyOnePeopleCont,editManOrgCont,editManPeopleCont } from "@/api/systemaccredit/systemhrapi"
+import { peopleMethod,judgeArray } from "@/api/people/peopledata"
+import {
+        getgroupdepartmap,
+    } from '@/api/duty/group' //组织建构
+import { calculationDate } from "@/api/time/dateval"
 
 export default {
     name:"peopleinfor",
@@ -95,6 +400,35 @@ export default {
    
     data() {
         return {
+            confirmationdateval:"",     //转正日期
+            joinedDate:"",    //入职日期
+            birthday:"",    //生日
+            workingdate:"", //参加工作日期
+            idCardStartTimeStr:"", //身份证有效期开始
+            idCardEndTimeStr:"", //身份证有效期结束
+            genderList:peopleMethod.sexData,    //性别
+            healthList:peopleMethod.healthList, //健康状况
+            politicsList:peopleMethod.politicsList, //政治面貌
+            constellationList:peopleMethod.constellationList, //星座
+            employmentType:peopleMethod.employmentType, //雇佣类型
+            emptypeList:peopleMethod.emptypeList, //	用工关系
+            marriageList:peopleMethod.marriageList, //	婚姻状态
+            editContIsTrue:false,
+            positiongrade:peopleMethod.positiongrade, //入职等级
+            editOrgIsTrue:false,
+            grouplist:[], //部门列表
+            dutieslist:[], //职务
+            postListAdd: [],           //岗位
+            teamcontlist:[],           //班组
+            propsdepart: {
+                // checkStrictly: true,
+                value: "id",
+                label: "name",
+                children: "children",
+                // emitPath:false,
+                // multiple: false
+            },  //关联部门
+            ediOrgCont:{},  //  行政组织
             myCont:{},          //个人信息
             replace:{
                 probationperiod: 0,
@@ -129,7 +463,69 @@ export default {
                 passportno: "",
                 nativeplace: "",
                 currentresidence: ""
-            }
+            },
+            editSetUp:{
+                cont:false,
+                org:false
+            },
+            editContData:{
+                mobilephone:"",     //手机号码
+                idcardno:"", //身份证号
+                entrydatetime:"", //入职日期
+                probationperiod:"", //试用期
+                confirmationdate:"",// 预计转正日期
+                jobstartdatestr:"", //参加工作日期
+                nameusedbefore:"",      //曾用名
+                gender:1,   //性别
+                myfolk:"",  //民族
+                politicaloutlook:0, //政治面貌
+                health:1,   //健康状况
+                birthdaytime:"",    //生日
+                idcardstarttimedata:"", //身份证有效期开始
+                idcardendtimedata:"", //身份证有效期结束
+                idcardaddress:"",   //身份证地址
+                idcardIssued:"",    //身份证签发机关
+                currentresidence:"",    //现居住地址
+                nativeplace:"", //籍贯
+                email:"", //电子邮件
+                internaltelephone:"",   //内线电话
+                hireclass:1,    //雇佣类型
+                emptype:1,  //用工关系
+                isveterans:2, //是否为退役军人
+                veteransnumber:"",  //退役证编号
+                passportno:"",  //护照号码
+                globalroaming:"",   //国际区号
+                wechat:"",  //绑定微信
+                workwechat:"", //绑定企业微信
+                constellationing:1,   //星座
+            },        //编辑个人信息
+            editOrgRules:{      //验证规则
+                orglist: [{ required: true, message: '必填', trigger: 'blur' }],
+                position: [{ required: true, message: '必填', trigger: 'blur' }],
+                jobid: [{ required: true, message: '必填', trigger: 'blur' }],
+                jobleve: [{ required: true, message: '必填', trigger: 'blur' }],
+                teamid: [{ required: true, message: '必填', trigger: 'blur' }], 
+            },
+            editContData:{},        //编辑个人信息
+            editContRules:{
+                idcardno: [
+                    { required: true, message: '必填', trigger: 'blur' }
+                ],
+                mobilephone: [
+                    { required: true, message: '必填', trigger: 'blur' },
+                    { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
+                    {
+                        pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+                        message: "请输入正确的手机号码", 
+                        trigger: "blur"
+                    },
+                    
+                ],
+                
+                probationperiod: [
+                    { type: 'number', required: true, message: '请输入试用期', trigger: 'change' }
+                ],
+            },          //编辑个人信息验证规则
             
         }
     },
@@ -137,8 +533,60 @@ export default {
     created(){
         console.log("userId---------->",this.userid)  
         this.getMyCont(this.userid)
+        this.getDutieslist();
+        let myId = this.userid * 1
+        this.ediOrgCont.id = myId.toString()
     },
     methods:{
+        // 获取部门
+        async getGrouplist(){
+            let sendData = {
+                id:313,
+                all:1
+            };
+            const res = await getgroupdepartmap(sendData)
+            this.grouplist=res.data
+        },
+        //选择行政组织
+        orgChange(val){
+            if(val){
+                if(judgeArray(val) && val.length > 0){
+                    let postId = val[val.length-1];
+                    this.getPostAdd(postId);
+                }else{
+                    this.postListAdd = [];
+                }
+            }else{
+                this.postListAdd = [];
+            }
+            // 
+            // this.ediOrgCont.position = null
+            console.log("选择行政组织---------------->",val)
+        },
+        //获取刚问列表
+        async getPostAdd(val) {
+            const from = {
+                organization: val.toString(),
+                page: 1,
+                pagesize: 500,
+            };
+            const res = await positionlistIsMe(from);
+            this.postListAdd = res.data.list;
+            console.log("获取刚问列表---------------->",res)
+        },
+        //获取职务
+        async getDutieslist(){
+            let res = await dutieslist();
+            this.dutieslist = res.data.list
+            console.log("班组---------------->",res,res.list)
+        },
+        //获取班组
+        async getTeam(){
+            
+            let res = await teamcontlist();
+            this.teamcontlist = res.data.list
+            console.log("班组---------------->",res)
+        },
         //获取人员基本信息
         async getMyCont(id){
             let sendData = {
@@ -147,6 +595,7 @@ export default {
             }
             let res = await getOnlyOnePeopleCont(sendData);
             this.myCont = res.data
+            if(!this.myCont.probationperiod) this.myCont.probationperiod = 3;
             //处理性别
             peopleMethod.sexData.forEach(item=>{
                 if(item.id == this.myCont.gender){
@@ -208,12 +657,311 @@ export default {
         },
         //编辑基本信息
         showEditBase(val){
+            this.editSetUp.cont = true
+            this.editContData.birthdaytime = val.birthdaytime
             console.log("编辑基本信息--------->",val)  
+            this.confirmationdateval = this.myCont.planformaldatetime     //转正日期
+            this.joinedDate = this.myCont.entrydatetime    //入职日期
+            this.birthday = this.myCont.birthdaytime    //生日
+            this.workingdate = this.myCont.jobstartdatestr //参加工作日期
+            this.idCardStartTimeStr = this.myCont.idcardstarttimedata //身份证有效期开始
+            this.idCardEndTimeStr = this.myCont.idcardendtimedata //身份证有效期结束
+
+            this.editContData = {
+                id:this.myCont.idstr,  
+                mobilephone:this.myCont.mobilephone,     //手机号码
+                idcardno:this.myCont.idcardno, //身份证号
+                entrydatetime:this.myCont.entrydatetime, //入职日期
+                probationperiod:this.myCont.probationperiod?this.myCont.probationperiod:3, //试用期
+                confirmationdate:this.myCont.planformaldatetime,// 预计转正日期
+                jobstartdatestr:this.myCont.jobstartdatestr, //参加工作日期
+                nameusedbefore:this.myCont.nameusedbefore,      //曾用名
+                gender:this.myCont.gender,   //性别
+                myfolk:this.myCont.myfolk,  //民族
+                politicaloutlook:this.myCont.politicaloutlook, //政治面貌
+                health:this.myCont.health,   //健康状况
+                birthdaytime:this.myCont.birthdaytime,    //生日
+                idcardstarttimedata:this.myCont.idcardstarttimedata, //身份证有效期开始
+                idcardendtimedata:this.myCont.idcardendtimedata, //身份证有效期结束
+                idcardaddress:this.myCont.idcardaddress,   //身份证地址
+                idcardIssued:this.myCont.idcardIssued,    //身份证签发机关
+                currentresidence:this.myCont.currentresidence,    //现居住地址
+                nativeplace:this.myCont.nativeplace, //籍贯
+                email:this.myCont.email, //电子邮件
+                internaltelephone:this.myCont.internaltelephone,   //内线电话
+                hireclass:this.myCont.hireclass,    //雇佣类型
+                emptype:this.myCont.emptype,  //用工关系
+                isveterans:this.myCont.isveterans, //是否为退役军人
+                veteransnumber:this.myCont.veteransnumber,  //退役证编号
+                passportno:this.myCont.passportno,  //护照号码
+                globalroaming:this.myCont.globalroaming,   //国际区号
+                wechat:this.myCont.wechat,  //绑定微信
+                workwechat:this.myCont.workwechat, //绑定企业微信
+                constellationing:this.myCont.constellationing,   //星座
+                maritalstatus:this.myCont.maritalstatus
+            };        //编辑个人信息
         },
         //编辑行政组织
         showEditBaseOrg(val){
-            console.log("编辑行政组织--------->",val)  
+            console.log("编辑行政组织--------->",val) 
+            this.getGrouplist() 
+            this.getTeam()
+            this.getPostAdd(this.myCont.adminorg)
+            this.ediOrgCont.orglist = this.myCont.allorglist
+            if(this.myCont.teamid != 0){
+                this.ediOrgCont.teamid = this.myCont.teamid
+            }
+            if(this.myCont.jobid != 0){
+                this.ediOrgCont.jobid = this.myCont.jobid
+            }
+            if(this.myCont.position != 0){
+                this.ediOrgCont.position = this.myCont.position
+            }
+            if(this.myCont.jobleve != 0){
+                this.ediOrgCont.jobleve = this.myCont.jobleve
+            }
+            
+            this.ediOrgCont.id = this.myCont.id.toString()
+            this.editSetUp.org = true
+            console.log("编辑行政组织-----123---->",this.joinedDate) 
+        },
+        //关闭编辑行政组织框
+        closeEditOrgDialog(){
+            this.editOrgIsTrue = false
+            this.editSetUp.org = false
+            this.initOrgCont()
+        },
+        //提交行政组织修改数据
+        async editOrgContsubmit(){
+            this.editOrgIsTrue = true
+            console.log("编辑行政组织--------->",this.ediOrgCont) 
+            this.$refs.editForm.validate(async valid => {
+                if (valid) {
+                    if(this.ediOrgCont.id == ""){
+                        this.tispOrgBox('参数错误！不可提交！请刷新页面！','error');
+                        return
+                    }
+                    if(this.ediOrgCont.orglist){
+                        if(judgeArray(this.ediOrgCont.orglist) && this.ediOrgCont.orglist.length > 0){
+                            let orgAry = this.ediOrgCont.orglist
+                            console.log("编辑行政组织----223----->",orgAry.length) 
+                            let postId = orgAry[orgAry.length-1];
+                            this.ediOrgCont.orgid = postId
+                        }else{
+                            this.tispOrgBox('请选择归属行政组织！','error');
+                            return
+                        }
+                    }else{
+                        this.tispOrgBox('请选择归属行政组织！','error');
+                        return
+                    }
+                    if(this.ediOrgCont.position){
+                        if(this.ediOrgCont.position == 0 || this.ediOrgCont.position == ""  || this.ediOrgCont.position == null){
+                            this.tispOrgBox('请选择职务！','error');
+                            return
+                        }
+                    }else{
+                        this.tispOrgBox('请选择职务！','error');
+                        return
+                    }
+                    if(this.ediOrgCont.teamid){
+                        if(this.ediOrgCont.teamid == 0 || this.ediOrgCont.teamid == ""  || this.ediOrgCont.teamid == null){
+                            this.tispOrgBox('请选择班组！','error');
+                            return
+                        }
+                    }else{
+                        this.tispOrgBox('请选择班组！','error');
+                        return
+                    }
+                    if(this.ediOrgCont.jobleve){
+                        if(this.ediOrgCont.jobleve == 0 || this.ediOrgCont.jobleve == ""  || this.ediOrgCont.jobleve == null){
+                            this.tispOrgBox('请选择班组！','error');
+                            return
+                        }
+                    }else{
+                        this.tispOrgBox('请选择班组！','error');
+                        return
+                    }
+                    console.log("提交数据--------->",this.ediOrgCont) 
+
+                    let res = await editManOrgCont(this.ediOrgCont)
+                    this.editOrgIsTrue = false
+                    if (res.code === 0) {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            showClose: true
+                        })
+                        this.getMyCont(this.userid)
+                        this.getDutieslist();
+                        this.closeEditOrgDialog()
+                    }
+
+
+                }else{
+                    this.editOrgIsTrue = false
+                }
+            });
+        },
+        openOrgButton(){
+            this.editOrgIsTrue = false
+        },
+        //提示
+        tispOrgBox(msg,typeClass){
+            this.$message({
+                showClose: true,
+                message: msg,
+                type: typeClass,
+                duration:1000,
+                onClose:this.openOrgButton
+            });
+        },
+        //编辑行政组织关系数据初始化
+        initOrgCont(){
+            let myId = this.userid * 1
+            this.ediOrgCont.id = myId.toString()
+        },
+
+        //关闭基本信息编辑框
+        closeEditContDialog(){
+            this.editSetUp.cont = false
+            this.editContIsTrue = false
+        },
+        //提交个人基本信息
+        async editContContsubmit(){
+            this.editContIsTrue = true
+            console.log("提交个人基本信息---------------1--",this.editContData)
+            this.$refs.editContData.validate(async valid => {
+                console.log("提交个人基本信息---------------2--",valid)
+                if (valid) {
+                    console.log("提交个人基本信息",this.editContData)
+                    let res = await editManPeopleCont(this.editContData)
+                    this.editContIsTrue = false
+                    if (res.code === 0) {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            showClose: true
+                        })
+                        this.getMyCont(this.userid)
+                        this.closeEditContDialog()
+                    }
+                } else {
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        //入职日期操作
+        async entryChangeDate(){
+            if(this.editContData.probationperiod == 0) this.editContData.probationperiod = 3;
+            console.log("入职日期操作",this.joinedDate,this.editContData.probationperiod)
+            if(this.editContData.probationperiod && this.joinedDate != null){
+                let yearVal = this.joinedDate.getFullYear();
+                let monthVal = this.joinedDate.getMonth()+1;
+                let dayVal = this.joinedDate.getDate();
+                if(monthVal < 10) monthVal = "0"+newMonthVal;
+                if(dayVal < 10) dayVal = "0"+dayVal;
+                let dataVal = yearVal + "-" + monthVal + "-" + dayVal
+                const res = await calculationDate(dataVal,this.editContData.probationperiod)
+                this.editContData.confirmationdate = res.newYear + "-" + res.newMonth + "-" + res.newDay;           //预计转正日期(提交表)
+                this.editContData.entrydatetime = dataVal //入职日期(提交表)
+                this.confirmationdateval = res.newYear + " 年 " + res.newMonth + " 月 " + res.newDay + " 日"; //(回填表格)
+                console.log("入职日期操作---------1---->",dataVal,this.joinedDate,res)
+            }
         },
+        //改变试用期设置转正日期
+        async handleChange(){
+            
+            if(this.joinedDate && this.joinedDate != null){
+                let yearVal = this.joinedDate.getFullYear();
+                let monthVal = this.joinedDate.getMonth()+1;
+                let dayVal = this.joinedDate.getDate();
+                if(monthVal < 10) monthVal = "0"+newMonthVal;
+                if(dayVal < 10) dayVal = "0"+dayVal;
+                let dataVal = yearVal + "-" + monthVal + "-" + dayVal
+                const res = await calculationDate(dataVal,this.editContData.probationperiod)
+                this.editContData.confirmationdate = res.newYear + "-" + res.newMonth + "-" + res.newDay; //预计转正日期(提交表)
+                this.confirmationdateval = res.newYear + " 年 " + res.newMonth + " 月 " + res.newDay + " 日"; //预计转正日期(回填表格)
+            }
+        },
+        //生日
+        async birthdayChange(){
+            if(this.birthday && this.birthday != null){
+                let yearVal = this.birthday.getFullYear();
+                let monthVal = this.birthday.getMonth()+1;
+                let dayVal = this.birthday.getDate();
+                if(monthVal < 10) monthVal = "0"+newMonthVal;
+                if(dayVal < 10) dayVal = "0"+dayVal;
+                this.editContData.birthdaytime= yearVal + "-" + monthVal + "-" + dayVal
+            }
+        },
+        //参加工作日期
+        async workdayChange(){
+            if(this.workingdate && this.workingdate != null){
+                let yearVal = this.workingdate.getFullYear();
+                let monthVal = this.workingdate.getMonth()+1;
+                let dayVal = this.workingdate.getDate();
+                if(monthVal < 10) monthVal = "0"+newMonthVal;
+                if(dayVal < 10) dayVal = "0"+dayVal;
+                this.editContData.jobstartdatestr= yearVal + "-" + monthVal + "-" + dayVal
+            }
+        },
+        //身份证有效期开始
+        idCodeTimeStartChange(){
+            if(this.idCardStartTimeStr && this.idCardStartTimeStr != null){
+                let yearVal = this.idCardStartTimeStr.getFullYear();
+                let monthVal = this.idCardStartTimeStr.getMonth()+1;
+                let dayVal = this.idCardStartTimeStr.getDate();
+                if(monthVal < 10) monthVal = "0"+newMonthVal;
+                if(dayVal < 10) dayVal = "0"+dayVal;
+                this.editContData.idcardstarttimedata= yearVal + "-" + monthVal + "-" + dayVal
+            }
+        },
+        //身份证有效期结束
+        idCodeTimeEndChange(){
+            if(this.idCardEndTimeStr && this.idCardEndTimeStr != null){
+                let yearVal = this.idCardEndTimeStr.getFullYear();
+                let monthVal = this.idCardEndTimeStr.getMonth()+1;
+                let dayVal = this.idCardEndTimeStr.getDate();
+                if(monthVal < 10) monthVal = "0"+newMonthVal;
+                if(dayVal < 10) dayVal = "0"+dayVal;
+                this.editContData.idcardendtimedata= yearVal + "-" + monthVal + "-" + dayVal
+            }
+        },
+        // 身份证验证
+        isCardID (rule, value, callback) {
+            console.log(value)
+            if (!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
+                callback(new Error('你输入的身份证长度或格式错误'))
+            }
+            //身份证城市
+            var aCity = { 11: "北京", 12: "天津", 13: "河北", 14: "山西", 15: "内蒙古", 21: "辽宁", 22: "吉林", 23: "黑龙江", 31: "上海", 32: "江苏", 33: "浙江", 34: "安徽", 35: "福建", 36: "江西", 37: "山东", 41: "河南", 42: "湖北", 43: "湖南", 44: "广东", 45: "广西", 46: "海南", 50: "重庆", 51: "四川", 52: "贵州", 53: "云南", 54: "西藏", 61: "陕西", 62: "甘肃", 63: "青海", 64: "宁夏", 65: "新疆", 71: "台湾", 81: "香港", 82: "澳门", 91: "国外" };
+            if (!aCity[parseInt(value.substr(0, 2))]) {
+                callback(new Error('你的身份证地区非法'))
+            }
+        
+            // 出生日期验证
+            var sBirthday = (value.substr(6, 4) + "-" + Number(value.substr(10, 2)) + "-" + Number(value.substr(12, 2))).replace(/-/g, "/"),
+                d = new Date(sBirthday)
+            if (sBirthday != (d.getFullYear() + "/" + (d.getMonth() + 1) + "/" + d.getDate())) {
+                callback(new Error('身份证上的出生日期非法'))
+            }
+        
+            // 身份证号码校验
+            var sum = 0,
+                weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2],
+                codes = "10X98765432"
+            for (var i = 0; i < value.length - 1; i++) {
+                sum += value[i] * weights[i];
+            }
+            var last = codes[sum % 11]; //计算出来的最后一位身份证号码
+            if (value[value.length - 1] != last) {
+                callback(new Error('你输入的身份证号非法'))
+            }
+            console.log("End------>",value)
+            return true
+        }
     }
 }
 </script>
diff --git a/src/views/hr/newhr/personneleducation.vue b/src/views/hr/newhr/personneleducation.vue
index 6c7031c..c58f683 100644
--- a/src/views/hr/newhr/personneleducation.vue
+++ b/src/views/hr/newhr/personneleducation.vue
@@ -17,43 +17,71 @@
         <el-row>
             <el-col :span="24" class="cont_body">
 
-                <el-descriptions v-for="item in contList" class="margin-top" :title="item.levelname" :column="3" :size="size" border :key="item.id">
+                <el-descriptions v-for="item in contList" class="margin-top" :title="item.levelname" :column="3"  border :key="item.id" >
                     <template slot="extra">
                         <el-button
                             icon="el-icon-edit"
                             size="small"
                             type="text"
-                            @click="showEditBase(scope.row)"
+                            @click="showEditBase(item)"
                         >编辑</el-button>
                         <el-button
                             icon="el-icon-delete"
                             size="small"
                             type="text"
-                            @click="showDelBase(scope.row)"
+                            @click="showDelBase(item)"
                         >删除</el-button>
                     </template>
                     <el-descriptions-item>
                         <template slot="label">
-                            <i class="el-icon-user"></i>
+                           
                             毕业院校
                         </template>
                         {{ item.graduationschool }}
                     </el-descriptions-item>
                     <el-descriptions-item>
                         <template slot="label">
-                            <i class="el-icon-user"></i>
+                           
                             专业
                         </template>
                         {{ item.subject }}
                     </el-descriptions-item>
+                    <el-descriptions-item>
+                        <template slot="label">
+                           
+                            学历
+                        </template>
+                        {{ item.educationname }}
+                    </el-descriptions-item>
+                    <el-descriptions-item>
+                        <template slot="label">
+                           
+                            学位
+                        </template>
+                        {{ item.academicdegreename }}
+                    </el-descriptions-item>
+                    <el-descriptions-item>
+                        <template slot="label">
+                           
+                            入学时间
+                        </template>
+                        {{ item.admissiontimestr }}
+                    </el-descriptions-item>
+                    <el-descriptions-item>
+                        <template slot="label">
+                           
+                            毕业时间
+                        </template>
+                        {{ item.graduationtimestr }}
+                    </el-descriptions-item>
                     
                 </el-descriptions>
-
             </el-col>
         </el-row>
     </el-scrollbar>
 </template>
 <script>
+import { peopleMethod } from "@/api/people/peopledata"
 import { getPersonneleDucationlist } from "@/api/systemaccredit/systemhrapi"
 export default {
     name:"familymembers",
@@ -89,7 +117,22 @@ export default {
                         break;
                     default:
                         item.levelname = "普通学历"
-                }
+                };
+                //用工关系
+                peopleMethod.educationList.forEach(itemes=>{
+                    // console.log("获取列表信息---"+item.id+"------>",res)  
+                    if(itemes.id == item.education){
+                        item.educationname = itemes.tittle
+                    }
+                })
+                //学位
+                peopleMethod.academicDegree.forEach(itemes=>{
+                    // console.log("获取列表信息---"+item.id+"------>",res)  
+                    if(itemes.id == item.academicdegree){
+                        item.academicdegreename = itemes.title
+                    }
+                })
+                
             })
             console.log("获取列表信息--------->",res)  
         },
@@ -104,7 +147,7 @@ export default {
     }
 }
 </script>
-<style>
+<style scopen>
 .el-scrollbar {
     height: 100%;
     width: 100%;
@@ -154,4 +197,8 @@ div::-webkit-scrollbar-track {
 .cont_body{
     margin-top: 20px;
 }
+.el-descriptions__header{
+    margin-bottom: 0px;
+    margin-top: 15px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/hr/newhr/workhistory.vue b/src/views/hr/newhr/workhistory.vue
index 9cb582f..56853c0 100644
--- a/src/views/hr/newhr/workhistory.vue
+++ b/src/views/hr/newhr/workhistory.vue
@@ -15,7 +15,76 @@
         </el-row>
         <el-divider style="margin:0"></el-divider>
         <el-row>
-            <el-col :span="24" class="cont_body">
+            <el-col :span="24" class="cont_body_work">
+
+                <el-descriptions v-for="item in insideWorkList" class="margin-top"  :column="3"  border :key="item.id" >
+                    <template slot="extra">
+                        <el-button
+                            icon="el-icon-edit"
+                            size="small"
+                            type="text"
+                            @click="showEditBase(item)"
+                        >编辑</el-button>
+                        <el-button
+                            icon="el-icon-delete"
+                            size="small"
+                            type="text"
+                            @click="showDelBase(item)"
+                        >删除</el-button>
+                    </template>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            开始日期
+                        </template>
+                        {{ item.starttimg }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            结束日期
+                        </template>
+                        {{ item.endtimg }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            调动类型
+                        </template>
+                        {{ item.changetypename }}
+                    </el-descriptions-item>
+                    
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            岗位
+                        </template>
+                        {{ item.postname }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            班组
+                        </template>
+                        {{ item.teamname }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            职务
+                        </template>
+                        {{ item.postname }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            职务性质
+                        </template>
+                        <span v-if="item.assigntype == 1">主职</span>
+                        <span v-if="item.assigntype != 1">兼职</span>
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw" :span="2">
+                        <template slot="label">
+                            行政组织
+                        </template>
+                        {{ item.allorgname }}
+                    </el-descriptions-item>
+                    
+                </el-descriptions>
+
             </el-col>
         </el-row>
         <el-row class="title_body">
@@ -33,26 +102,107 @@
         </el-row>
         <el-divider style="margin:0"></el-divider>
         <el-row>
-            <el-col :span="24" class="cont_body">
+            <el-col :span="24" class="cont_body_work">
+
+                <el-descriptions v-for="itemwai in extWorkList" class="margin-top"  :column="3"  border :key="itemwai.id" >
+                    <template slot="extra">
+                        <el-button
+                            icon="el-icon-edit"
+                            size="small"
+                            type="text"
+                            @click="showEditBase(itemwai)"
+                        >编辑</el-button>
+                        <el-button
+                            icon="el-icon-delete"
+                            size="small"
+                            type="text"
+                            @click="showDelBase(itemwai)"
+                        >删除</el-button>
+                    </template>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            开始日期
+                        </template>
+                        {{ itemwai.starttimg }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            结束日期
+                        </template>
+                        {{ itemwai.endtimg }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            公司
+                        </template>
+                        {{ itemwai.company }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            证明人
+                        </template>
+                        {{ itemwai.witness }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            证明人电话
+                        </template>
+                        {{ itemwai.witnesstel }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label-class-name="my_label_ciw">
+                        <template slot="label">
+                            离职原因
+                        </template>
+                        {{ itemwai.remarks }}
+                    </el-descriptions-item>
+                   
+                    
+                </el-descriptions>
+
+
             </el-col>
         </el-row>
     </el-scrollbar>
 </template>
 <script>
+import { getWorkHistoryList,getInsiDeworkHistoryList } from "@/api/systemaccredit/systemhrapi"
 export default {
     name:"familymembers",
     props:['userKey'],
     data() {
-        return {}
+        return {
+            extWorkList:[],           //集团外工作履历
+            insideWorkList:[],           //集团内工作履历
+        }
     },
     created(){
         console.log("userKey---------->",this.userKey) 
+        this.getExtWorkList();
+        this.getInsideWorkList();
     },
     methods:{
         //新增信息
         showAddBase(val){
             console.log("新增信息--------->",val)  
         },
+        //获取集团外工作履历
+        async getExtWorkList(){
+            let sendData = {
+                id:this.userKey
+            }
+            let res = await getWorkHistoryList(sendData)
+            this.extWorkList = res.data
+            console.log("获取列表信息--------->",res)  
+        },
+        //获取集团内工作履历
+        async getInsideWorkList(){
+            let sendData = {
+                id:this.userKey
+            }
+            let res = await getInsiDeworkHistoryList(sendData)
+            this.insideWorkList = res.data
+            console.log("获取列表信息--------->",res)  
+        },
     }
 }
 </script>
@@ -103,7 +253,11 @@ div::-webkit-scrollbar-track {
     text-align: right; 
     padding-right: 5px;
 }
-.cont_body{
-    margin-top: 20px;
+.cont_body_work{
+    margin-bottom: 30px;
+    padding-right: 30px;
+}
+.my_label_ciw{
+    width: 120px;
 }
 </style>
\ No newline at end of file