src/views/dashboard/HtUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -101,6 +102,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/blUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -100,6 +101,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/cqUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -104,6 +105,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/gsUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -110,6 +111,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/index.vue
@@ -1,8 +1,8 @@ <template> <div class="main"> <el-row style="height: 10px;"> <el-col :span="9"><p /></el-col> <el-col :span="15"> <el-col :span="8"><p /></el-col> <el-col :span="16"> <ul class="data-ul"> <li :class="{ selectedColor: selectIndex === 0 }" @click="selectTab(0)"> 今日 src/views/dashboard/lzUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -104,6 +105,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/onTheJobUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -113,6 +114,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/qjUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -103,6 +104,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/sbUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -103,6 +104,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/tgUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -100,6 +101,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/tjUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -105,6 +106,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/ygUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -118,6 +119,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/yjUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -101,6 +102,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/dashboard/ywUser.vue
@@ -5,6 +5,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="isVisible" :before-close="beforeClose" > <div class="app-container"> <div class="filter-container" style="margin-left: -340px;"> @@ -110,6 +111,9 @@ } }, methods: { beforeClose(done) { this.$emit('cancleChooseUser') }, search() { this.fetch({ ...this.queryParams src/views/febs/system/user/Edit.vue
@@ -66,7 +66,7 @@ <el-tree ref="deptTree" :data="deptTree" :check-strictly="true" :check-strictly="false" :default-checked-keys="user.deptIdsArr" show-checkbox accordion src/views/user/Informationinput.vue
@@ -16,7 +16,7 @@ <span :class="thisShowIndex===3?'selectedTimeline':''">合同信息</span> </el-timeline-item> <el-timeline-item @click.native="isShow(showArr[4].show, 4)"> <span :class="thisShowIndex===4?'selectedTimeline':''">考勤情况</span> <span :class="thisShowIndex===4?'selectedTimeline':''">离职当月考勤</span> </el-timeline-item> <el-timeline-item @click.native="isShow(showArr[5].show, 5)"> <span :class="thisShowIndex===5?'selectedTimeline':''">请假记录</span> @@ -109,7 +109,7 @@ </el-table-column> <el-table-column prop="empNumb" label="员工编号" width="100" /> <el-table-column prop="empName" label="员工姓名" width="100" /> <el-table-column prop="certificateNumb" label="证件号码" width="180" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="workUnit" label="工作单位" width="240" /> <el-table-column prop="beginDate" label="开始日期" width="100" /> <el-table-column prop="endDate" label="结束日期" width="100" /> @@ -208,17 +208,17 @@ <el-button type="text" size="small" @click="editLeaveInfo(scope.row)">编辑</el-button> </template> </el-table-column> <el-table-column prop="empNumb" label="员工编号" width="180" /> <el-table-column prop="empNumb" label="员工编号" width="120" /> <el-table-column prop="deptName" label="护卫点" width="180" /> <el-table-column prop="jobName" label="岗位名称" width="180" /> <el-table-column prop="empName" label="员工姓名" width="180" /> <el-table-column prop="certificateNumb" label="证件号码" width="180" /> <el-table-column prop="beginTime" label="开始时间" width="180" /> <el-table-column prop="endTime" label="结束时间" width="180" /> <el-table-column prop="leaveDay" label="请假天数" width="180" /> <el-table-column prop="leaveType" label="请假类型" width="180" /> <el-table-column prop="returnDate" label="到岗时间" width="180" /> <el-table-column prop="reporter" label="报备人" width="180" /> <el-table-column prop="jobName" label="岗位名称" width="120" /> <el-table-column prop="empName" label="员工姓名" width="120" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="beginTime" label="开始时间" width="150" /> <el-table-column prop="endTime" label="结束时间" width="150" /> <el-table-column prop="leaveDay" label="请假天数" width="100" /> <el-table-column prop="leaveTypeName" label="请假类型" width="120" /> <el-table-column prop="returnDate" label="到岗时间" width="150" /> <el-table-column prop="reporter" label="报备人" width="120" /> <el-table-column prop="remark" label="备注" width="180" /> </el-table> <el-table v-show="showArr[6].show" ref="resignTable" :data="resignData" style="width: 100%;"> @@ -232,7 +232,7 @@ <el-table-column prop="jobName" label="岗位名" width="180" /> <el-table-column prop="empNumb" label="员工编号" width="180" /> <el-table-column prop="empName" label="员工姓名" width="180" /> <el-table-column prop="certificateNumb" label="证件号码" width="180" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="applayDate" label="辞职申请日期" width="180" /> <el-table-column prop="reason" label="辞职事由" width="180" /> <el-table-column prop="reporter" label="汇报人" width="180" /> @@ -275,9 +275,21 @@ <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="applayDate" label="社保申请日期" width="180" /> <el-table-column prop="proposer" label="申请人" width="180" /> <el-table-column prop="insuranceGaers" label="社保档位" width="180" /> <el-table-column prop="reportStatus " label="是否已报告" width="180" /> <el-table-column prop="applayStatus" label="状态" width="180" /> <el-table-column prop="insuranceGaers" label="社保档位" width="250"> <template slot-scope="{row}"> {{ transinsuranceGaers(row.insuranceGaers) }} </template> </el-table-column> <el-table-column prop="reportStatus " label="是否已报告" width="180"> <template slot-scope="{row}"> {{ row.reportStatus === 0?'未报告':'已报告' }} </template> </el-table-column> <el-table-column prop="applayStatus" label="状态"> <template slot-scope="{row}"> {{ row.applayStatus === 0?'未申请':'已申请' }} </template> </el-table-column> <el-table-column prop="auditor" label="审核人" width="180" /> <el-table-column prop="remark" label="备注" width="280" /> </el-table> @@ -305,7 +317,11 @@ <el-table-column prop="injuredDiacrisis" label="意外险诊断" width="180" /> <el-table-column prop="hospitalName" label="就诊医院" width="180" /> <el-table-column prop="treatmentName" label="就诊科室" width="180" /> <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180" /> <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180"> <template slot-scope="scope"> {{ scope.row.hospitalizatioFlag ===1?'已住院':'未住院' }} </template> </el-table-column> <el-table-column prop="bedNumb" label="床号" width="180" /> <el-table-column prop="reprotTime" label="报案时间" width="180" /> <el-table-column prop="submitTime" label="递交资料时间" width="180" /> @@ -337,7 +353,11 @@ <el-table-column prop="injuredDiacrisis" label="工伤诊断" width="180" /> <el-table-column prop="hospitalName" label="就诊医院" width="180" /> <el-table-column prop="treatmentName" label="就诊科室" width="180" /> <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180" /> <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180"> <template slot-scope="scope"> {{ scope.row.hospitalizatioFlag ===1?'已住院':'未住院' }} </template> </el-table-column> <el-table-column prop="bedNumb" label="床号" width="180" /> <el-table-column prop="reportTime" label="报案时间" width="180" /> <el-table-column prop="submitTime" label="递交资料时间" width="180" /> @@ -364,7 +384,7 @@ <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" /> <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" /> <el-table-column prop="arbitrationType" label="仲裁类型" width="180" /> <el-table-column prop="arbitrationTypeName" label="仲裁类型" width="180" /> <el-table-column prop="arbitrationReason" label="仲裁事由" width="180" /> <el-table-column prop="reporter" label="报备人" width="180" /> <el-table-column prop="remark" label="备注" width="180" /> @@ -830,6 +850,7 @@ > <el-option label="普通体检" value="1" /> <el-option label="员工体检" value="2" /> <el-option label="入职体检" value="03" /> </el-select> </el-form-item> <el-form-item label="转氨酶" prop="transaminase"> @@ -1067,8 +1088,20 @@ <el-form-item label="请假类型" prop="leaveType"> <el-select v-model="leaveInfoForm.leaveType" placeholder="请选择请假类型"> <el-option label="事假" value="1" /> <el-option label="病假" value="2" /> <el-option label="事假" value="05" /> <el-option label="病假" value="06" /> <el-option label="公假" value="07" /> <el-option label="婚假" value="08" /> <el-option label="孕假" value="09" /> <el-option label="产假" value="10" /> <el-option label="陪产假" value="11" /> <el-option label="探亲假" value="12" /> <el-option label="探配偶假" value="13" /> <el-option label="丧假" value="14" /> <el-option label="工伤假" value="15" /> <el-option label="节育假" value="16" /> <el-option label="年休假" value="17" /> <el-option label="其它假" value="18" /> </el-select> </el-form-item> @@ -1832,7 +1865,7 @@ </div> </el-dialog> <el-dialog title="选择员工" :visible.sync="dialogShowXzyg"> <el-dialog title="选择员工" :visible.sync="dialogShowXzyg" width="60%"> <Selectuser @selectedUser="selectedUser" @cancleChooseUser="cancleChooseUser" /> </el-dialog> </div> @@ -2538,14 +2571,14 @@ empId: '', customerId: '', archivesNumb: '', deptId: '', deptId: '1', deptName: '', empNumb: '', empName: '', sex: '1', JobId: '', jobName: '', empType: '1', empType: '01', certificateType: '', certificateNumb: '', nation: '01', @@ -2813,6 +2846,11 @@ }) this.selectEmpBase() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break case 1: @@ -2828,6 +2866,11 @@ type: 'success' }) this.selectWorkExperience() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break @@ -2845,6 +2888,11 @@ }) this.selectPhysicalExam() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break case 3: @@ -2860,6 +2908,11 @@ type: 'success' }) this.selectContractInfo() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break @@ -2893,6 +2946,11 @@ }) this.selectLeaveInfo() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break case 6: @@ -2908,6 +2966,11 @@ type: 'success' }) this.selectResign() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break @@ -2925,6 +2988,11 @@ }) this.selectUnemployment() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break case 8: @@ -2940,6 +3008,11 @@ type: 'success' }) this.selectInsurance() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break @@ -2957,6 +3030,11 @@ }) this.selectAccidentCases() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break case 10: @@ -2972,6 +3050,11 @@ type: 'success' }) this.selectOccupational() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break @@ -2989,6 +3072,11 @@ }) this.selectLaborTrouble() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break case 12: @@ -3005,6 +3093,11 @@ }) this.selectBadRecord() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break case 13: @@ -3020,6 +3113,11 @@ type: 'success' }) this.selectBadRecord() }) } else { this.$message({ message: '请先选中需要删除的记录', type: 'error' }) } break @@ -3154,6 +3252,11 @@ this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break case 1: @@ -3172,6 +3275,11 @@ this.tableDataName = 'workExperienceData' this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break @@ -3192,6 +3300,11 @@ this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break case 3: @@ -3210,6 +3323,11 @@ this.tableDataName = 'contractInfoData' this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break @@ -3230,6 +3348,11 @@ this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break case 5: @@ -3248,6 +3371,11 @@ this.tableDataName = 'leaveInfoData' this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break @@ -3268,6 +3396,11 @@ this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break case 7: @@ -3286,6 +3419,11 @@ this.tableDataName = 'unemploymentData' this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break @@ -3306,6 +3444,11 @@ this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break case 9: @@ -3324,6 +3467,11 @@ this.tableDataName = 'accidentCasesData' this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break @@ -3344,6 +3492,11 @@ this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break case 11: @@ -3362,6 +3515,11 @@ this.tableDataName = 'laborTroubleData' this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break @@ -3382,6 +3540,11 @@ this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break case 13: @@ -3400,6 +3563,11 @@ this.tableDataName = 'remarkInfoData' this.queryParams.delFlag = 2 this.search() }) } else { this.$message({ message: '请先选中需要提交的记录', type: 'error' }) } break @@ -3488,6 +3656,7 @@ this.empBaseInfoForm.education = row.education this.empBaseInfoForm.seniority = row.seniority this.empBaseInfoForm.nativePlace = row.nativePlace this.empBaseInfoForm.nativePlaceName = row.nativePlaceName this.empBaseInfoForm.censusAddress = row.censusAddress this.empBaseInfoForm.currentAddress = row.currentAddress this.empBaseInfoForm.guardNumb = row.guardNumb @@ -3790,15 +3959,6 @@ }, cleanContractInfo() { this.contractInfoForm.contractId = '' this.contractInfoForm.empId = '' this.contractInfoForm.empNumb = '' this.contractInfoForm.empName = '' this.contractInfoForm.certificateNumb = '' this.contractInfoForm.sex = '' this.contractInfoForm.deptId = '' this.contractInfoForm.deptName = '' this.contractInfoForm.JobId = '' this.contractInfoForm.jobName = '' this.contractInfoForm.beginDate = '' this.contractInfoForm.endDate = '' this.contractInfoForm.contractStatus = '' @@ -3895,15 +4055,6 @@ }, cleanDimissionAttend() { this.dimissionAttendForm.dimissionAttendId = '' this.dimissionAttendForm.empId = '' this.dimissionAttendForm.empNumb = '' this.dimissionAttendForm.empName = '' this.dimissionAttendForm.sex = '' this.dimissionAttendForm.certificateNumb = '' this.dimissionAttendForm.deptId = '' this.dimissionAttendForm.deptName = '' this.dimissionAttendForm.JobId = '' this.dimissionAttendForm.jobName = '' this.dimissionAttendForm.attendMonth = '' this.dimissionAttendForm.overtimeHour = '' this.dimissionAttendForm.overtimeDay = '' @@ -3998,15 +4149,6 @@ }, cleanLeaveInfo() { this.leaveInfoForm.leaveId = '' this.leaveInfoForm.empId = '' this.leaveInfoForm.empNumb = '' this.leaveInfoForm.empName = '' this.leaveInfoForm.sex = '' this.leaveInfoForm.certificateNumb = '' this.leaveInfoForm.deptId = '' this.leaveInfoForm.deptName = '' this.leaveInfoForm.JobId = '' this.leaveInfoForm.jobName = '' this.leaveInfoForm.beginTime = '' this.leaveInfoForm.endTime = '' this.leaveInfoForm.leaveType = '' @@ -4103,15 +4245,6 @@ }, cleanResign() { this.resignForm.resignId = '' this.resignForm.empId = '' this.resignForm.empNumb = '' this.resignForm.empName = '' this.resignForm.sex = '' this.resignForm.certificateNumb = '' this.resignForm.deptId = '' this.resignForm.deptName = '' this.resignForm.JobId = '' this.resignForm.jobName = '' this.resignForm.applayDate = '' this.resignForm.reporter = '' this.resignForm.reason = '' @@ -4202,15 +4335,6 @@ }, cleanUnemployment() { this.unemploymentForm.unemploymentId = '' this.unemploymentForm.empId = '' this.unemploymentForm.empNumb = '' this.unemploymentForm.empName = '' this.unemploymentForm.sex = '' this.unemploymentForm.certificateNumb = '' this.unemploymentForm.deptId = '' this.unemploymentForm.deptName = '' this.unemploymentForm.JobId = '' this.unemploymentForm.jobName = '' this.unemploymentForm.applayDate = '' this.unemploymentForm.applayReason = '' this.unemploymentForm.reporter = '' @@ -4303,15 +4427,6 @@ }, cleanInsurance() { this.insuranceForm.insuranceId = '' this.insuranceForm.empId = '' this.insuranceForm.empNumb = '' this.insuranceForm.empName = '' this.insuranceForm.sex = '' this.insuranceForm.certificateNumb = '' this.insuranceForm.deptId = '' this.insuranceForm.deptName = '' this.insuranceForm.JobId = '' this.insuranceForm.jobName = '' this.insuranceForm.applayDate = '' this.insuranceForm.proposer = '' this.insuranceForm.insuranceGaers = '' @@ -4408,15 +4523,6 @@ }, cleanAccidentCases() { this.accidentCasesForm.accidentId = '' this.accidentCasesForm.empId = '' this.accidentCasesForm.empNumb = '' this.accidentCasesForm.empName = '' this.accidentCasesForm.sex = '' this.accidentCasesForm.certificateNumb = '' this.accidentCasesForm.deptId = '' this.accidentCasesForm.deptName = '' this.accidentCasesForm.JobId = '' this.accidentCasesForm.jobName = '' this.accidentCasesForm.injuredTime = '' this.accidentCasesForm.injuredAddress = '' this.accidentCasesForm.injuredPart = '' @@ -4463,7 +4569,7 @@ this.accidentCasesForm.injuredDescribe = row.injuredDescribe this.accidentCasesForm.hospitalName = row.hospitalName this.accidentCasesForm.treatmentName = row.treatmentName this.accidentCasesForm.hospitalizatioFlag = row.hospitalizatioFlag this.accidentCasesForm.hospitalizatioFlag = row.hospitalizatioFlag + '' this.accidentCasesForm.bedNumb = row.bedNumb this.accidentCasesForm.reprotTime = row.reprotTime this.accidentCasesForm.submitTime = row.submitTime @@ -4537,15 +4643,6 @@ }, cleanOccupational() { this.occupationalForm.occupationalId = '' this.occupationalForm.empId = '' this.occupationalForm.empNumb = '' this.occupationalForm.empName = '' this.occupationalForm.sex = '' this.occupationalForm.certificateNumb = '' this.occupationalForm.deptId = '' this.occupationalForm.deptName = '' this.occupationalForm.JobId = '' this.occupationalForm.jobName = '' this.occupationalForm.injuredTime = '' this.occupationalForm.injuredAddress = '' this.occupationalForm.injuredPart = '' @@ -4601,7 +4698,7 @@ this.occupationalForm.injuredDescribe = row.injuredDescribe this.occupationalForm.hospitalName = row.hospitalName this.occupationalForm.treatmentName = row.treatmentName this.occupationalForm.hospitalizatioFlag = row.hospitalizatioFlag this.occupationalForm.hospitalizatioFlag = row.hospitalizatioFlag + '' this.occupationalForm.bedNumb = row.bedNumb this.occupationalForm.reportTime = row.reportTime this.occupationalForm.submitTime = row.submitTime @@ -4628,7 +4725,6 @@ this.occupationalForm.delFlag = row.delFlag this.occupationalForm.version = row.version this.occupationalForm.remark = row.remark this.dialogshowArr[10].show = true }, selectLaborTrouble() { @@ -4687,15 +4783,6 @@ }, cleanLaborTrouble() { this.laborTroubleForm.arbitrationId = '' this.laborTroubleForm.empId = '' this.laborTroubleForm.empNumb = '' this.laborTroubleForm.empName = '' this.laborTroubleForm.sex = '' this.laborTroubleForm.certificateNumb = '' this.laborTroubleForm.deptId = '' this.laborTroubleForm.deptName = '' this.laborTroubleForm.JobId = '' this.laborTroubleForm.jobName = '' this.laborTroubleForm.arbitrationDate = '' this.laborTroubleForm.arbitrationType = '' this.laborTroubleForm.arbitrationReason = '' @@ -4713,7 +4800,6 @@ }, editLaborTrouble(row) { this.isAdd = false this.laborTroubleForm.arbitrationId = row.arbitrationId this.laborTroubleForm.empId = row.empId this.laborTroubleForm.empNumb = row.empNumb @@ -4729,7 +4815,7 @@ this.laborTroubleForm.arbitrationReason = row.arbitrationReason this.laborTroubleForm.reporter = row.reporter this.laborTroubleForm.arbitrationPay = row.arbitrationPay this.laborTroubleForm.arbitrationStatus = row.arbitrationStatus this.laborTroubleForm.arbitrationStatus = row.arbitrationStatus + '' this.laborTroubleForm.settleDate = row.settleDate this.laborTroubleForm.createTime = row.createTime this.laborTroubleForm.creator = row.creator @@ -4749,15 +4835,6 @@ }, cleanBadRecord() { this.badRecordForm.badId = '' this.badRecordForm.empId = '' this.badRecordForm.empName = '' this.badRecordForm.empNumb = '' this.badRecordForm.sex = '' this.badRecordForm.certificateNumb = '' this.badRecordForm.deptId = '' this.badRecordForm.deptName = '' this.badRecordForm.JobId = '' this.badRecordForm.jobName = '' this.badRecordForm.badDate = '' this.badRecordForm.reporter = '' this.badRecordForm.badContent = '' @@ -4891,15 +4968,6 @@ }, cleanRemarkInfo() { this.remarkInfoForm.remarkId = '' this.remarkInfoForm.empId = '' this.remarkInfoForm.empNumb = '' this.remarkInfoForm.empName = '' this.remarkInfoForm.sex = '' this.remarkInfoForm.certificateNumb = '' this.remarkInfoForm.JobId = '' this.remarkInfoForm.deptId = '' this.remarkInfoForm.deptName = '' this.remarkInfoForm.jobName = '' this.remarkInfoForm.remarkContent = '' this.remarkInfoForm.remarkDate = '' this.remarkInfoForm.createTime = '' @@ -5031,6 +5099,20 @@ }, calculateSeniority(val) { this.empBaseInfoForm.seniority = calculateSeniority(val) }, transinsuranceGaers(val) { switch (val) { case '1': return '（深户）五险一档' case '2': return '（非深户）五险一档' case '3': return '（非深户）五险二档' case '4': return '（非深户）五险三档' case '5': return '（非深户）四险一档' } } } } @@ -5044,6 +5126,7 @@ .el-main { background-color: #fff; } } .el-container { height: 770px; @@ -5059,6 +5142,12 @@ background-color: #e9eef3; color: #333; height: 100%; .el-table{ margin-top: 10px; } } .el-timeline-item{ padding-bottom: 5px; } }
@@ -2,7 +2,7 @@ <div> <el-container> <el-header :height="headerHeight"> <el-row> <el-row style="margin-bottom: 10px;"> <el-col :span="16"> <h3 class="bu-tian-jia-title">在职员工</h3> </el-col> @@ -37,7 +37,7 @@ value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 400px;" style="width: 300px;" /> </el-col> <el-col :span="3"> @@ -49,9 +49,9 @@ <el-col :span="24"> <table class="searchTable"> <tr> <td>性别：</td> <td> <el-checkbox-group v-model="queryParams.sex"> <td class="td">性别：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.sex" class="fj-checkbox"> <el-checkbox label="" @change="selectAllSex">全部</el-checkbox> <el-checkbox label="1">男性</el-checkbox> <el-checkbox label="2">女性</el-checkbox> @@ -59,9 +59,9 @@ </td> </tr> <tr> <td>最高学历：</td> <td> <el-checkbox-group v-model="queryParams.education"> <td class="td">最高学历：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.education" class="fj-checkbox"> <el-checkbox label="" @change="selectAllEducation">全部</el-checkbox> <el-checkbox label="91">无学历</el-checkbox> <el-checkbox label="81">小学</el-checkbox> @@ -77,9 +77,9 @@ </td> </tr> <tr> <td>政治面貌：</td> <td> <el-checkbox-group v-model="queryParams.politics"> <td class="td">政治面貌：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.politics" class="fj-checkbox"> <el-checkbox label="" @change="selectAllPolitics">全部</el-checkbox> <el-checkbox label="01">党员</el-checkbox> <el-checkbox label="02">预备</el-checkbox> @@ -98,9 +98,9 @@ </td> </tr> <tr> <td>年龄：</td> <td> <el-checkbox-group v-model="queryParams.ageStr"> <td class="td">年龄：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.ageStr" class="fj-checkbox"> <el-checkbox label="" @change="selectAllAgeStr">全部</el-checkbox> <el-checkbox label="18-29">18-29</el-checkbox> <el-checkbox label="30-39">30-39</el-checkbox> @@ -112,9 +112,9 @@ </td> </tr> <tr> <td>档案情况：</td> <td> <el-checkbox-group v-model="queryParams.archivesStatus"> <td class="td">档案情况：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.archivesStatus" class="fj-checkbox"> <el-checkbox label="" @change="selectAllArchivesStatus">全部</el-checkbox> <el-checkbox label="0">已移交</el-checkbox> <el-checkbox label="1">未移交</el-checkbox> @@ -122,9 +122,9 @@ </td> </tr> <tr> <td>保险类型：</td> <td> <el-checkbox-group v-model="queryParams.insuranceType"> <td class="td">保险类型：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.insuranceType" class="fj-checkbox"> <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox> <el-checkbox label="1">深户（五险一档）</el-checkbox> <el-checkbox label="2">非深户(五险一档)</el-checkbox> @@ -134,36 +134,34 @@ </el-checkbox-group> </td> </tr> <tr> <td>员工状态：</td> <td> <el-checkbox-group v-model="queryParams.empStatus"> <!-- <tr> <td class="td">员工状态：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.empStatus" class="fj-checkbox"> <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox> <el-checkbox label="0">在职</el-checkbox> <el-checkbox label="1">正常离职</el-checkbox> <el-checkbox label="2">自动离职</el-checkbox> <el-checkbox label="3">公司辞退</el-checkbox> <el-checkbox label="1">离职</el-checkbox> <el-checkbox label="2">退休</el-checkbox> </el-checkbox-group> </td> </tr> </tr> --> </table> </el-col> </el-row> </div> </el-header> <el-main style="height: 85%;"> <el-row> <el-row style="margin: 10px 0 10px 0;"> <el-col :span="24"> <el-button type="danger" @click="showXzyg(0)">新增员工</el-button> <el-button type="danger" class="hr-but-all" @click="showXzyg(0)">新增员工</el-button> <el-button type="primary" @click="delEmp">删除员工</el-button> <el-button type="danger" @click="showYgdg(0)">员工调岗</el-button> <el-button type="danger" @click="showDryg(0)">导入员工</el-button> <el-button type="danger" @click="showDcyg(0)">导出员工</el-button> <el-button type="danger" @click="doDcda">导出档案</el-button> <el-button type="danger" @click="showGbda(0)">关闭档案</el-button> <el-button type="danger" class="hr-but-all" @click="showYgdg(0)">员工调岗</el-button> <el-button type="danger" class="hr-but-all" @click="showDcyg(0)">导出员工</el-button> <el-button type="danger" class="hr-but-all" @click="doDcda">导出档案</el-button> <el-button type="danger" class="hr-but-all" @click="showGbda(0)">关闭档案</el-button> </el-col> </el-row> <el-table ref="multipleTable" :data="tableData" style="width: 100%;"> <el-table ref="multipleTable" :data="tableData" style="width: 100%;color: #000;"> <el-table-column type="selection" width="55" /> <el-table-column label="操作" width="100"> <template slot-scope="scope"> @@ -187,9 +185,9 @@ <el-table-column prop="nativePlaceName" label="籍贯" /> <el-table-column prop="telePhone" label="联系电话" /> <el-table-column prop="entryDate" label="入职日期" width="100" /> <el-table-column prop="delFlag" label="员工状态"> <el-table-column prop="empStatus" label="员工状态"> <template slot-scope="{row}"> {{ transDelFlag(row.delFlag) }} {{ transEmpStatus(row.empStatus) }} </template> </el-table-column> </el-table> @@ -1253,7 +1251,7 @@ <el-row> <el-col span="24"> <el-form-item label="离职类型" prop="dimissionType"> <el-radio-group v-model="gbdaForm.dimissionType"> <el-radio-group v-model="gbdaForm.dimissionType" @change="changeDimissionType"> <el-radio :label="1">正常离职</el-radio> <el-radio :label="2">自动离职</el-radio> <el-radio :label="3">公司劝退</el-radio> @@ -1262,12 +1260,12 @@ </el-radio-group> </el-form-item> </el-col> <el-col span="12"> <el-col v-if="selectDimissionType === 2" span="12"> <el-form-item label="自离天数" prop="selfLeaveDay"> <el-input v-model="gbdaForm.selfLeaveDay" onkeyup="value=value.replace(/[^0-9.]/g,'')" /> </el-form-item> </el-col> <el-col span="12"> <el-col v-if="selectDimissionType === 2" span="12"> <el-form-item label="报告人" prop="reporter"> <el-input v-model="gbdaForm.reporter" /> </el-form-item> @@ -1312,7 +1310,7 @@ </td> <td>性别</td> <td> <el-checkbox label="sex"><span /></el-checkbox> <el-checkbox label="sexName"><span /></el-checkbox> </td> </tr> <tr> @@ -1326,13 +1324,13 @@ </td> <td>员工类别</td> <td> <el-checkbox label="empType"><span /></el-checkbox> <el-checkbox label="empTypeName"><span /></el-checkbox> </td> </tr> <tr> <td>民族</td> <td> <el-checkbox label="nation"><span /></el-checkbox> <el-checkbox label="nationName"><span /></el-checkbox> </td> <td>身份证号码</td> <td> @@ -1346,7 +1344,7 @@ <tr> <td>婚姻状况</td> <td> <el-checkbox label="marriage"><span /></el-checkbox> <el-checkbox label="marriageName"><span /></el-checkbox> </td> <td>身份证有效期</td> <td> @@ -1360,7 +1358,7 @@ <tr> <td>政治面貌</td> <td> <el-checkbox label="politics"><span /></el-checkbox> <el-checkbox label="politicsName"><span /></el-checkbox> </td> <td>出生日期</td> <td> @@ -1368,13 +1366,13 @@ </td> <td>最高学历</td> <td> <el-checkbox label="education"><span /></el-checkbox> <el-checkbox label="educationName"><span /></el-checkbox> </td> </tr> <tr> <td>籍贯</td> <td> <el-checkbox label="nativePlace"><span /></el-checkbox> <el-checkbox label="nativePlaceName"><span /></el-checkbox> </td> <td>户籍地址</td> <td> @@ -1396,7 +1394,7 @@ </td> <td>档案情况</td> <td> <el-checkbox label="archivesStatus"><span /></el-checkbox> <el-checkbox label="archivesStatusName"><span /></el-checkbox> </td> </tr> <tr> @@ -1420,7 +1418,7 @@ </td> <td>保险类型</td> <td> <el-checkbox label="insuranceType"><span /></el-checkbox> <el-checkbox label="InsuranceTypeName"><span /></el-checkbox> </td> <td>社保电脑号</td> <td> @@ -1452,7 +1450,7 @@ </td> <td>员工手册</td> <td> <el-checkbox label="handbookStatus"><span /></el-checkbox> <el-checkbox label="handbookStatusName"><span /></el-checkbox> </td> </tr> <tr> @@ -1556,7 +1554,7 @@ archivesStatus: '0', bankName: '', bankNumb: '', InsuranceType: '', insuranceType: '', socialNumb: '', family: '', handbookStatus: '0', @@ -1713,9 +1711,10 @@ exportUrl: '', checkAll: false, isIndeterminate: false, cityOptions: ['sex', 'empName', 'archivesNumb', 'deptName', 'jobName', 'empType', 'nation', 'certificateNumb', 'age', 'marriage', 'certificateValidity', 'stature', 'politics', 'birthdate', 'education', 'nativePlace', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatus', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceType', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatus', 'family'], cityOptions: ['sexName', 'empName', 'archivesNumb', 'deptName', 'jobName', 'empTypeName', 'nationName', 'certificateNumb', 'age', 'marriageName', 'certificateValidity', 'stature', 'politicsName', 'birthdate', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family'], checkedCities: [], tableData: [] tableData: [], selectDimissionType: 1 } }, mounted() { @@ -1773,14 +1772,14 @@ deptName: this.queryParams.vague }) }, transDelFlag(delFlag) { switch (delFlag) { case 0: return '正常' case 1: return '删除' case 2: return '暂存' transEmpStatus(empStatus) { switch (empStatus) { case '0': return '在职' case '1': return '离职' case '2': return '退休' } }, initDept() { @@ -1800,7 +1799,7 @@ this.headerHeight = '30px' this.advancedQueryShow = false } else { this.headerHeight = '370px' this.headerHeight = '330px' this.advancedQueryShow = true } }, @@ -2025,8 +2024,9 @@ this.dialogShowDcyg = false break case 2: var params = { exportField: this.checkedCities.join(',') } this.$download('hr/empBaseInfo/export', { ...params }, '在职员工列表.xls').then(() => { var params = this.queryParams params.exportField = this.checkedCities.join(',') this.$download('hr/empBaseInfo/exportWithField', { ...params }, '在职员工列表.xls').then(() => { this.$message({ message: '下载成功!', type: 'success' @@ -2139,6 +2139,10 @@ this.$refs.upload.submit() break } }, changeDimissionType(value) { this.selectDimissionType = value console.log('值:' + value) }, validSelfLeaveDay(rule, value, callback) { const type = this.gbdaForm.dimissionType @@ -2303,6 +2307,18 @@ } } </script> <style lang="scss"> .fj-checkbox{ .el-checkbox__input.is-checked .el-checkbox__inner { border-color: #a32c30;; background: #a32c30;; } .el-checkbox__label { color: #000 !important; } } </style> <style lang="scss" scoped> .el-main { height: 600px; @@ -2327,24 +2343,25 @@ } .searchTable { margin-top: 10px; border-collapse: collapse; width: 100%; margin-top: 10px; border-collapse: collapse; width: 100%; .td { background-color: #dddcdc !important; width: 160px; text-align: center; } .searchTable td, .searchTable th { border: 1px solid #b0b0b0; color: #000; height: 40px; background-color: #fff; .td-group { padding-left: 20px; } .searchTable tr td:first-child { background-color: #dddcdc !important; width: 160px; text-align: center; } } .searchTable td, .searchTable th { border: 1px solid #b0b0b0; color: #000; height: 40px; background-color: #fff; } #ygxq table { border-collapse: collapse; src/views/user/outemployess.vue
@@ -13,7 +13,7 @@ </el-col> </el-row> <div v-show="advancedQueryShow"> <el-row> <el-row style="margin-bottom: 10px;"> <el-col :span="3">员工编号： <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" /> </el-col> @@ -68,9 +68,9 @@ <el-col :span="24"> <table class="searchTable"> <tr> <td>性别：</td> <td> <el-checkbox-group v-model="queryParams.sex"> <td class="td">性别：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.sex" class="fj-checkbox"> <el-checkbox label="" @change="selectAllSex">全部</el-checkbox> <el-checkbox label="1">男性</el-checkbox> <el-checkbox label="2">女性</el-checkbox> @@ -78,9 +78,9 @@ </td> </tr> <tr> <td>最高学历：</td> <td> <el-checkbox-group v-model="queryParams.education"> <td class="td">最高学历：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.education" class="fj-checkbox"> <el-checkbox label="" @change="selectAllEducation">全部</el-checkbox> <el-checkbox label="91">无学历</el-checkbox> <el-checkbox label="81">小学</el-checkbox> @@ -96,30 +96,30 @@ </td> </tr> <tr> <td>政治面貌：</td> <td> <el-checkbox-group v-model="queryParams.politics"> <td class="td">政治面貌：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.politics" class="fj-checkbox"> <el-checkbox label="" @change="selectAllPolitics">全部</el-checkbox> <el-checkbox label="01">中共党员</el-checkbox> <el-checkbox label="02">预备党员</el-checkbox> <el-checkbox label="03">共青团员</el-checkbox> <el-checkbox label="04">民革会员</el-checkbox> <el-checkbox label="05">民盟盟员</el-checkbox> <el-checkbox label="06">民建会员</el-checkbox> <el-checkbox label="07">民进会员</el-checkbox> <el-checkbox label="08">农工党员</el-checkbox> <el-checkbox label="09">致公党员</el-checkbox> <el-checkbox label="10">九三社员</el-checkbox> <el-checkbox label="11">台盟盟员</el-checkbox> <el-checkbox label="12">民主人士</el-checkbox> <el-checkbox label="01">党员</el-checkbox> <el-checkbox label="02">预备</el-checkbox> <el-checkbox label="03">共青</el-checkbox> <el-checkbox label="04">民革</el-checkbox> <el-checkbox label="05">民盟</el-checkbox> <el-checkbox label="06">民建</el-checkbox> <el-checkbox label="07">民进</el-checkbox> <el-checkbox label="08">农工</el-checkbox> <el-checkbox label="09">致公</el-checkbox> <el-checkbox label="10">九三</el-checkbox> <el-checkbox label="11">台盟</el-checkbox> <el-checkbox label="12">民主</el-checkbox> <el-checkbox label="13">群众</el-checkbox> </el-checkbox-group> </td> </tr> <tr> <td>年龄：</td> <td> <el-checkbox-group v-model="queryParams.ageStr"> <td class="td">年龄：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.ageStr" class="fj-checkbox"> <el-checkbox label="" @change="selectAllAgeStr">全部</el-checkbox> <el-checkbox label="18-29">18-29</el-checkbox> <el-checkbox label="30-39">30-39</el-checkbox> @@ -131,9 +131,9 @@ </td> </tr> <tr> <td>档案情况：</td> <td> <el-checkbox-group v-model="queryParams.archivesStatus"> <td class="td">档案情况：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.archivesStatus" class="fj-checkbox"> <el-checkbox label="" @change="selectAllArchivesStatus">全部</el-checkbox> <el-checkbox label="0">已移交</el-checkbox> <el-checkbox label="1">未移交</el-checkbox> @@ -141,9 +141,9 @@ </td> </tr> <tr> <td>保险类型：</td> <td> <el-checkbox-group v-model="queryParams.insuranceType"> <td class="td">保险类型：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.insuranceType" class="fj-checkbox"> <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox> <el-checkbox label="1">深户（五险一档）</el-checkbox> <el-checkbox label="2">非深户(五险一档)</el-checkbox> @@ -153,18 +153,17 @@ </el-checkbox-group> </td> </tr> <tr> <td>员工状态：</td> <td> <el-checkbox-group v-model="queryParams.empStatus"> <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox> <el-checkbox label="0">在职</el-checkbox> <el-checkbox label="1">正常离职</el-checkbox> <el-checkbox label="2">自动离职</el-checkbox> <el-checkbox label="3">公司辞退</el-checkbox> </el-checkbox-group> <!-- <tr> <td class="td">员工状态：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.empStatus" class="fj-checkbox"> <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox> <el-checkbox label="0">在职</el-checkbox> <el-checkbox label="1">离职</el-checkbox> <el-checkbox label="2">退休</el-checkbox> </el-checkbox-group> </td> </tr> </tr> --> </table> </el-col> </el-row> @@ -172,7 +171,7 @@ </div> </el-header> <el-main style="height: 85%;"> <el-row> <el-row style="margin: 10px 0 10px 0;"> <el-col :span="24"> <el-button type="primary" @click="delEmp">删除员工</el-button> <el-button type="danger" @click="showDkda(0)">打开档案</el-button> @@ -199,9 +198,14 @@ <el-table-column prop="censusAddress" label="籍贯" /> <el-table-column prop="telePhone" label="联系电话" /> <el-table-column prop="entryDate" label="入职日期" width="100" /> <el-table-column prop="delFlag" label="员工状态"> <el-table-column prop="empStatus" label="员工状态"> <template slot-scope="{row}"> {{ transDelFlag(row.delFlag) }} {{ transEmpStatus(row.empStatus) }} </template> </el-table-column> <el-table-column prop="dimissionType" label="离职类型"> <template slot-scope="{row}"> {{ transDimissionType(row.dimissionType) }} </template> </el-table-column> </el-table> @@ -904,7 +908,12 @@ （主要对已退休员工返聘） </el-form-item> <el-form-item label="打开日期"> <el-input v-model="baseicInformationForm.openDate" /> <el-date-picker v-model="baseicInformationForm.openDate" value-format="yyyy-MM-dd" type="date" placeholder="选择打开日期" /> </el-form-item> <el-form-item label="备注说明"> <el-input v-model="baseicInformationForm.remark" type="textarea" :rows="4" /> @@ -957,7 +966,9 @@ dialogShowXzyg: false, dialogShowXzbm: false, tableData: [], baseicInformationForm: {} baseicInformationForm: { openDate: new Date() } } }, mounted() { @@ -992,7 +1003,7 @@ params.pageSize = this.pagination.size params.pageNum = this.pagination.num params.delFlag = 0 params.empStatus = 1 params.empStatus = '1,2,3' this.$get('hr/empBaseInfo/zslist', { ...params }).then((r) => { @@ -1008,14 +1019,28 @@ deptName: this.queryParams.vague }) }, transDelFlag(delFlag) { switch (delFlag) { case 0: return '正常' case 1: return '删除' case 2: return '暂存' transEmpStatus(empStatus) { switch (empStatus) { case '0': return '在职' case '1': return '离职' case '2': return '退休' } }, transDimissionType(dimissionType) { switch (dimissionType) { case '1': return '正常离职' case '2': return '自动离职' case '3': return '公司劝退' case '4': return '公司辞退' case '5': return '试用期内' } }, advancedQueryShowMethods() { @@ -1177,6 +1202,18 @@ } } </script> <style lang="scss"> .fj-checkbox{ .el-checkbox__input.is-checked .el-checkbox__inner { border-color: #a32c30;; background: #a32c30;; } .el-checkbox__label { color: #000 !important; } } </style> <style lang="scss" scoped> .el-main { height: 600px; @@ -1188,25 +1225,26 @@ } .searchTable { margin-top: 10px; border-collapse: collapse; width: 100%; } .searchTable td, .searchTable th { border: 1px solid #b0b0b0; color: #000; height: 40px; background-color: #fff; } .searchTable tr td:first-child { background-color: #dddcdc !important; width: 160px; text-align: center; } .searchTable { margin-top: 10px; border-collapse: collapse; width: 100%; .td { background-color: #dddcdc !important; width: 160px; text-align: center; } .td-group { padding-left: 20px; } } .searchTable td, .searchTable th { border: 1px solid #b0b0b0; color: #000; height: 40px; background-color: #fff; } #ygxq table { border-collapse: collapse; src/views/user/search.vue
@@ -54,7 +54,7 @@ </el-timeline></el-aside> <el-main> <div v-show="showArr[0].show"> <el-row> <el-row style="margin-bottom: 10px;"> <el-col :span="17"> <br> </el-col> @@ -65,7 +65,7 @@ </el-col> </el-row> <div v-show="advancedQueryShow"> <el-row> <el-row style="margin-bottom: 10px;"> <el-col :span="3">员工编号： <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" /> </el-col> @@ -113,16 +113,13 @@ <el-col :span="8"> <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button> <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button> <el-button size="mini" class="hr-but" type="success" @click.native="exportExcel"> {{ $t('table.export') }} </el-button> </el-col> </el-row> <table class="searchTable"> <tr> <td>性别：</td> <td> <el-checkbox-group v-model="queryParams.sex"> <td class="td">性别：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.sex" class="fj-checkbox"> <el-checkbox label="" @change="selectAllSex">全部</el-checkbox> <el-checkbox label="1">男性</el-checkbox> <el-checkbox label="2">女性</el-checkbox> @@ -130,9 +127,9 @@ </td> </tr> <tr> <td>最高学历：</td> <td> <el-checkbox-group v-model="queryParams.education"> <td class="td">最高学历：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.education" class="fj-checkbox"> <el-checkbox label="" @change="selectAllEducation">全部</el-checkbox> <el-checkbox label="91">无学历</el-checkbox> <el-checkbox label="81">小学</el-checkbox> @@ -148,30 +145,30 @@ </td> </tr> <tr> <td>政治面貌：</td> <td> <el-checkbox-group v-model="queryParams.politics"> <td class="td">政治面貌：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.politics" class="fj-checkbox"> <el-checkbox label="" @change="selectAllPolitics">全部</el-checkbox> <el-checkbox label="01">中共党员</el-checkbox> <el-checkbox label="02">预备党员</el-checkbox> <el-checkbox label="03">共青团员</el-checkbox> <el-checkbox label="04">民革会员</el-checkbox> <el-checkbox label="05">民盟盟员</el-checkbox> <el-checkbox label="06">民建会员</el-checkbox> <el-checkbox label="07">民进会员</el-checkbox> <el-checkbox label="08">农工党员</el-checkbox> <el-checkbox label="09">致公党员</el-checkbox> <el-checkbox label="10">九三社员</el-checkbox> <el-checkbox label="11">台盟盟员</el-checkbox> <el-checkbox label="12">民主人士</el-checkbox> <el-checkbox label="01">党员</el-checkbox> <el-checkbox label="02">预备</el-checkbox> <el-checkbox label="03">共青</el-checkbox> <el-checkbox label="04">民革</el-checkbox> <el-checkbox label="05">民盟</el-checkbox> <el-checkbox label="06">民建</el-checkbox> <el-checkbox label="07">民进</el-checkbox> <el-checkbox label="08">农工</el-checkbox> <el-checkbox label="09">致公</el-checkbox> <el-checkbox label="10">九三</el-checkbox> <el-checkbox label="11">台盟</el-checkbox> <el-checkbox label="12">民主</el-checkbox> <el-checkbox label="13">群众</el-checkbox> </el-checkbox-group> </td> </tr> <tr> <td>年龄：</td> <td> <el-checkbox-group v-model="queryParams.ageStr"> <td class="td">年龄：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.ageStr" class="fj-checkbox"> <el-checkbox label="" @change="selectAllAgeStr">全部</el-checkbox> <el-checkbox label="18-29">18-29</el-checkbox> <el-checkbox label="30-39">30-39</el-checkbox> @@ -183,9 +180,9 @@ </td> </tr> <tr> <td>档案情况：</td> <td> <el-checkbox-group v-model="queryParams.archivesStatus"> <td class="td">档案情况：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.archivesStatus" class="fj-checkbox"> <el-checkbox label="" @change="selectAllArchivesStatus">全部</el-checkbox> <el-checkbox label="0">已移交</el-checkbox> <el-checkbox label="1">未移交</el-checkbox> @@ -193,9 +190,9 @@ </td> </tr> <tr> <td>保险类型：</td> <td> <el-checkbox-group v-model="queryParams.insuranceType"> <td class="td">保险类型：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.insuranceType" class="fj-checkbox"> <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox> <el-checkbox label="1">深户（五险一档）</el-checkbox> <el-checkbox label="2">非深户(五险一档)</el-checkbox> @@ -206,19 +203,28 @@ </td> </tr> <tr> <td>员工状态：</td> <td> <el-checkbox-group v-model="queryParams.empStatus"> <td class="td">员工状态：</td> <td class="td-group"> <el-checkbox-group v-model="queryParams.empStatus" class="fj-checkbox"> <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox> <el-checkbox label="0">在职</el-checkbox> <el-checkbox label="1">正常离职</el-checkbox> <el-checkbox label="2">自动离职</el-checkbox> <el-checkbox label="3">公司辞退</el-checkbox> <el-checkbox label="1">离职</el-checkbox> <el-checkbox label="2">退休</el-checkbox> </el-checkbox-group> </td> </tr> </table> </div> <el-row style="margin-bottom: 10px;"> <el-col :span="21"> 已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录 </el-col> <el-col :span="3"> <el-button size="mini" class="hr-but" type="success" @click.native="exportExcel"> {{ $t('table.export') }} </el-button> </el-col> </el-row> <el-table ref="empBaseInfoTable" :data="basicInformationData" style="width: 100%;height: 70%;"> <el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column prop="empNumb" label="员工编号" /> @@ -445,7 +451,7 @@ <el-table-column prop="deptName" label="护卫点" width="180" /> <el-table-column prop="jobName" label="岗位" width="180" /> <el-table-column prop="empName" label="员工姓名" width="180" /> <el-table-column prop="certificateNumb" label="证件号码" width="180" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="signingDate" label="合同签订日期" width="180" /> <el-table-column prop="endDate" label="合同结束日期" width="180" /> <el-table-column prop="contractPeriod" label="合同期限(年)" width="180" /> @@ -520,7 +526,7 @@ <el-table-column prop="deptName" label="护卫点" width="180" /> <el-table-column prop="jobName" label="岗位名称" width="180" /> <el-table-column prop="empName" label="员工姓名" width="180" /> <el-table-column prop="certificateNumb" label="证件号码" width="180" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="attendMonth" label="离职考勤月份" width="180" /> <el-table-column prop="attendDays" label="出勤天数" width="180" /> <el-table-column prop="overtimeDay" label="加班（天）" width="180" /> @@ -564,9 +570,20 @@ <el-col :span="4">请假类型： <el-select v-model="queryParams.leaveType" style="width:100px"> <el-option value="" label="全部" /> <el-option value="1" label="事假" /> <el-option value="2" label="病假" /> <el-option value="3" label="调休假" /> <el-option value="05" label="事假" /> <el-option value="06" label="病假" /> <el-option value="07" label="公假" /> <el-option value="08" label="婚假" /> <el-option value="09" label="孕假" /> <el-option value="10" label="产假" /> <el-option value="11" label="陪产假" /> <el-option value="12" label="探亲假" /> <el-option value="13" label="探配偶假" /> <el-option value="14" label="丧假" /> <el-option value="15" label="工伤假" /> <el-option value="16" label="节育假" /> <el-option value="17" label="年休假" /> <el-option value="18" label="其它假" /> </el-select> </el-col> <el-col :span="4"> @@ -657,7 +674,7 @@ <el-table-column prop="jobName" label="岗位名" width="180" /> <el-table-column prop="empNumb" label="员工编号" width="180" /> <el-table-column prop="empName" label="员工姓名" width="180" /> <el-table-column prop="certificateNumb" label="证件号码" width="180" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="applayDate" label="辞职申请日期" width="180" /> <el-table-column prop="reason" label="辞职事由" width="180" /> <el-table-column prop="reporter" label="汇报人" width="180" /> @@ -856,8 +873,8 @@ <el-col :span="4">是否住院： <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px"> <el-option value="" label="全部" /> <el-option value="1" label="是" /> <el-option value="2" label="否" /> <el-option label="未住院" value="0" /> <el-option label="已住院" value="1" /> </el-select> </el-col> <el-col :span="4">案结状态： @@ -962,8 +979,8 @@ <el-col :span="4">是否住院： <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px"> <el-option value="" label="全部" /> <el-option value="1" label="是" /> <el-option value="2" label="否" /> <el-option label="未住院" value="0" /> <el-option label="已住院" value="1" /> </el-select> </el-col> <el-col :span="4">案结状态： @@ -1018,7 +1035,6 @@ {{ transArbitrationStatus(row.settleStatus) }} </template> </el-table-column> <el-table-column prop="settleDate" label="案结日期" width="180" /> </el-table> </div> @@ -1226,20 +1242,22 @@ </el-table> </div> <div v-show="showArr[14].show"> <el-row style="margin-bottom: 10px;"> <el-col :span="6">员工编号： <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:200px" /> </el-col> <el-col :span="6">姓名： <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:200px" /> </el-col> <el-col :span="6">身份证号： <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:200px" /> </el-col> <el-col :span="6">护卫点： <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:200px" /> </el-col> </el-row> <el-row> <el-col :span="3">员工编号： <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" /> </el-col> <el-col :span="3">姓名： <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" /> </el-col> <el-col :span="4">身份证号： <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" /> </el-col> <el-col :span="3">护卫点： <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" /> </el-col> <el-col :span="9">调岗日期： <el-col :span="12">调岗日期： <el-date-picker v-model="queryParams.changeDateStr" size="small" @@ -1251,17 +1269,16 @@ start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" style="width: 400px;" style="width: 500px;" /> </el-col> <el-col :span="3">调岗类型： <el-select v-model="queryParams.changeType" style="width:100px"> <el-option label="全部" value="" /> <el-col :span="6">调岗类型： <el-select v-model="queryParams.changeType" size="small" style="width:200px"> <el-option label="升职" value="2" /> <el-option label="调动" value="3" /> </el-select> </el-col> <el-col :span="3.5"> <el-col :span="6"> <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button> <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button> </el-col> @@ -1279,13 +1296,18 @@ <el-table ref="jobChangeTable" :data="jobChangeData" style="width: 100%;height: 70%;"> <el-table-column type="selection" width="55" /> <el-table-column prop="empNumb" label="员工编号" width="180" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column prop="newDeptName" label="现部门" /> <el-table-column prop="newJobName" label="现岗位" /> <el-table-column prop="empName" label="姓名" width="180" /> <el-table-column prop="oldDeptName" label="原部门" /> <el-table-column prop="oldJobName" label="原岗位" /> <el-table-column prop="changeDate" label="调岗日期" /> <el-table-column prop="changeType" label="调岗类型" /> <el-table-column prop="changeType" label="调岗类型"> <template slot-scope="{row}"> {{ transChangeType(row.changeType) }} </template> </el-table-column> </el-table> </div> <div v-show="showArr[15].show"> @@ -2110,14 +2132,34 @@ transHospitalizatioFlag(hospitalizatioFlag) { switch (hospitalizatioFlag) { case 1: return '是' return '已住院' case 0: return '未住院' } }, transChangeType(changeType) { switch (changeType) { case 2: return '否' return '升职' case 3: return '调动' } } } } </script> <style lang="scss"> .fj-checkbox{ .el-checkbox__input.is-checked .el-checkbox__inner { border-color: #a32c30;; background: #a32c30;; } .el-checkbox__label { color: #000 !important; } } </style> <style lang="scss" scoped> .el-container { height: 100%; @@ -2141,11 +2183,20 @@ } } .searchTable { margin-top: 10px; border-collapse: collapse; width: 100%; .searchTable { margin-top: 10px; border-collapse: collapse; width: 100%; margin-bottom: 15px; .td { background-color: #dddcdc !important; width: 160px; text-align: center; } .td-group { padding-left: 20px; } } .searchTable td, .searchTable th { src/views/user/selectuser.vue
@@ -1,29 +1,45 @@ <template> <div id="mainDiv"> <el-header :height="headerHeight"> <el-row> <el-col :span="8"> <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" /> <el-button type="primary" @click="search">查询</el-button> </el-col> </el-row> <el-form> <el-row> <el-col :span="10"> <el-form-item label="关键字"> <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="员工状态"> <el-checkbox-group v-model="queryParams.empStatus"> <el-checkbox :label="0">在职</el-checkbox> <el-checkbox :label="1">离职</el-checkbox> <el-checkbox :label="2">退休</el-checkbox> </el-checkbox-group> </el-form-item> </el-col> <el-col :span="4"> <el-button size="mini" class="hr-but-all" type="primary" @click="vagueSearch">查询</el-button> <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button> </el-col> </el-row> </el-form> </el-header> <el-main> <el-table ref="multipleTable" :data="list" row-key="prop1" width="50%" width="80%" @selection-change="handleSelectionChange" @row-dblclick="rowDblclick" > <el-table-column type="selection" :reserve-selection="false" width="55" /> <el-table-column type="selection" :reserve-selection="false" width="50" /> <el-table-column v-if="show" prop="empId" label="员工Id" /> <el-table-column prop="empNumb" label="员工编号" /> <el-table-column prop="empName" label="姓名" /> <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> <el-table-column v-if="show" prop="deptId" label="部门Id" /> <el-table-column prop="deptName" label="护卫点" /> <el-table-column prop="deptName" label="护卫点" width="180" /> <el-table-column v-if="show" prop="jobId" label="岗位Id" /> <el-table-column prop="jobName" label="岗位" /> <el-table-column prop="empTypeName" label="员工类别" /> @@ -68,7 +84,8 @@ multipleSelection: [], total: 0, // 总数量 queryParams: { empNumb: '' empNumb: '', empStatus: [] }, // 查询参数 sort: {}, // 排序 pagination: { // 分页参数 @@ -88,18 +105,31 @@ methods: { // 翻页方法 search() { this.queryParams.empName = this.queryParams.empNumb this.queryParams.deptName = this.queryParams.empNumb this.queryParams.delFlag = 0 this.fetch({ ...this.queryParams, ...this.sort }) }, vagueSearch() { this.fetch({ empNumb: this.queryParams.empNumb, empName: this.queryParams.empNumb, deptName: this.queryParams.empNumb }) }, resetSearch() { this.queryParams = { empNumb: '', empName: '', deptName: '' } this.search() }, fetch(params = {}) { var that = this params.pageSize = this.pagination.size params.pageNum = this.pagination.num params.delFlag = 0 this.$get('hr/empBaseInfo/list', { ...params }).then((r) => { @@ -127,6 +157,7 @@ }, rowDblclick(row, column, event) { this.$refs.multipleTable.toggleRowSelection(row, true) this.sureChoose() } } } src/views/yunpan/fujian.vue
@@ -145,9 +145,8 @@ <el-checkbox-group v-model="queryform.empStatus" class="fj-checkbox"> <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox> <el-checkbox label="0">在职</el-checkbox> <el-checkbox label="1">正常离职</el-checkbox> <el-checkbox label="2">自动离职</el-checkbox> <el-checkbox label="3">公司辞退</el-checkbox> <el-checkbox label="1">离职</el-checkbox> <el-checkbox label="2">退休</el-checkbox> </el-checkbox-group> </td> </tr> @@ -160,9 +159,7 @@ <el-row style="margin-bottom: 10px;height: 40px;"> <el-col :span="24"> <el-button class="hr-but-all" type="danger" @click="dialogFormVisible = true">新建标签</el-button> <el-popconfirm title="是否删除标签？" @onConfirm="deldialogFormVisible = true"> <el-button slot="reference" class="hr-but" type="danger">删除标签</el-button> </el-popconfirm> <el-button class="hr-but" type="danger" @click="deldialogFormVisible = true">删除标签</el-button> <el-button class="hr-but-all" type="danger" @click="downloaddialogFormVisible = true">下载附件</el-button> <el-dialog title="新建标签" @@ -272,6 +269,11 @@ <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" width="80%" class="fjgl-class" top="10px" @close="closeDialog()"> <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" /> </el-dialog> <el-row> <el-col :span="21" style="line-height: 50px;"> 已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录 </el-col> </el-row> <el-table ref="empAccessoryTable" :data="tableData" class="fj-table" style="width: 100%;color: #000;"> <el-table-column type="selection" vue.config.js
@@ -36,8 +36,8 @@ // change xxx-api/login => mock/login // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { target: 'http://120.24.23.155:8301/', // target: 'http://127.0.0.1:8301/', // target: 'http://120.24.23.155:8301/', target: 'http://127.0.0.1:8301/', changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''
