Merge branch 'master' of http://120.24.23.155:9999/r/sunsail-platform-ui

yijiusmile

2021-03-05 b0e2dddc687bc3538fedf704c3530bd7b4f6eb70

Merge branch 'master' of http://120.24.23.155:9999/r/sunsail-platform-ui

 src/utils/request.js

@@ -8,7 +8,7 @@
import 'nprogress/nprogress.css'

// 请求超时时间，10s
const requestTimeOut = 20 * 1000
const requestTimeOut = 60 * 1000
const success = 200
// 更换令牌的时间区间
const checkRegion = 5 * 60 * 1000

 src/views/user/Informationinput.vue

@@ -549,9 +549,11 @@
              <el-upload
                ref="upload"
                class="upload-demo"
                action="http://127.0.0.1:8301/hr/empBaseInfo/importEmp"
                action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
                accept=".xls, .xlsx, .excel"
                :headers="headers()"
                :on-success="importHandleAvatarSuccess"
                :on-error="importHandleAvatarError"
                :file-list="fileList"
                :auto-upload="false"
              >
@@ -2857,6 +2859,25 @@
    this.isShow(false, 0)
  },
  methods: {
    importHandleAvatarError() {
      this.$notify.error({
        title: '错误',
        message: '导入失败'
      })
    },
    importHandleAvatarSuccess(res, file) {
      if (res.data === null) {
        this.$notify({
          title: '成功',
          message: '导入成功!',
          type: 'success'
        })
      } else {
        this.$alert(JSON.stringify(res.data), '导入失败原因', {
          confirmButtonText: '确定'
        })
      }
    },
    headers() {
      const token = getToken()
      if (token) {

 src/views/user/search.vue

@@ -540,13 +540,14 @@
          </el-row>
          <el-table ref="physicalExamTable" :data="physicalExamData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" />
            <el-table-column prop="empNumb" label="员工编号" />
            <el-table-column prop="empName" label="员工姓名" />
            <el-table-column prop="deptName" label="护卫点" width="150" />
            <el-table-column prop="jobName" label="岗位" />
            <el-table-column prop="empName" label="员工姓名" width="100" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="sex" label="性别" width="50" :formatter="sexFormat" />
            <el-table-column prop="hospital" label="体检医院" />
            <el-table-column prop="physicalExamDate" label="体检日期" />
            <el-table-column prop="hospital" label="体检医院" width="150" />
            <el-table-column prop="physicalExamDate" label="体检日期" width="100" />
            <el-table-column prop="physicalExamType" label="体检类型" :formatter="typeFormat" />
            <el-table-column prop="bloodPressure" label="血压" />
            <el-table-column prop="transaminase" label="转氨酶" />
@@ -630,10 +631,10 @@
          <el-table ref="contractInfoTable" :data="contractInfoData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <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="deptName" label="护卫点" width="180" />
            <!-- <el-table-column prop="jobName" 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" />
@@ -703,11 +704,8 @@
          <el-table ref="dimissionAttendTable" :data="dimissionAttendData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <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="attendMonth" label="离职考勤月份" width="180" />
            <el-table-column prop="empName" 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" />
            <el-table-column prop="overtimeHour" label="加班（小时）" width="180" />
@@ -715,6 +713,12 @@
            <el-table-column prop="leaveDay" label="请假（天）" width="180" />
            <el-table-column prop="absenteeism" label="旷工（天）" width="180" />
            <el-table-column prop="remark" label="备注" width="180" />

            <!-- <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="attendMonth" label="离职考勤月份" width="180" /> -->
          </el-table>
        </div>

@@ -785,15 +789,15 @@
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <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="jobName" label="名称" width="100" />
            <el-table-column prop="empName" label="姓名" width="100" />
            <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="leaveDay" label="请假天数" />
            <el-table-column prop="leaveType" label="请假类型" width="180" :formatter="leaveTypeFormat" />
            <el-table-column prop="returnDate" label="到岗时间" width="180" />
            <el-table-column prop="reporter" label="报备人" width="180" />
            <el-table-column prop="remark" label="备注" width="180" />
            <el-table-column prop="remark" label="备注" width="280" />
          </el-table>
        </div>

@@ -846,15 +850,15 @@
          </el-row>
          <el-table ref="resignTable" :data="resignData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" width="150" />
            <el-table-column prop="deptName" label="护卫点" width="180" />
            <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="jobName" label="岗位" width="100" />
            <el-table-column prop="empName" label="员工姓名" width="150" />
            <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" />
            <el-table-column prop="remark" label="备注" width="180" />
            <el-table-column prop="reason" label="辞职事由" width="200" />
            <el-table-column prop="reporter" label="汇报人" width="150" />
            <el-table-column prop="remark" label="备注" width="200" />
          </el-table>
        </div>

@@ -907,16 +911,16 @@
          </el-row>
          <el-table ref="unemploymentTable" :data="unemploymentData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />
            <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="deptName" label="护卫点" width="120" />
            <el-table-column prop="jobName" label="岗位" width="120" />
            <el-table-column prop="empNumb" label="员工编号" width="150" />
            <el-table-column prop="empName" label="姓名" width="120" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="applayDate" label="失业金申请日期" width="180" />
            <el-table-column prop="applayReason" label="申报事由" width="180" />
            <el-table-column prop="reporter" label="汇报人" width="180" />
            <el-table-column prop="auditor" label="审核人" width="180" />
            <el-table-column prop="remark" label="备注" width="180" />
            <el-table-column prop="remark" label="备注" width="280" />
          </el-table>
        </div>

@@ -976,15 +980,15 @@
          </el-row>
          <el-table ref="insuranceTable" :data="insuranceData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <el-table-column prop="empName" label="姓名" width="180" />
            <el-table-column prop="empNumb" label="员工编号" width="150" />
            <el-table-column prop="empName" label="姓名" width="150" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="deptName" label="护卫点" width="180" />
            <el-table-column prop="applayDate" label="社保申请日期" width="180" />
            <el-table-column prop="proposer" label="申请人" width="180" />
            <el-table-column prop="deptName" label="护卫点" width="150" />
            <el-table-column prop="applayDate" label="社保申请日期" width="150" />
            <el-table-column prop="proposer" label="申请人" />
            <el-table-column prop="insuranceGaers" label="社保档位" width="180" :formatter="insuranceGaersFormat" />
            <el-table-column prop="reportStatus" label="是否已报告" width="180" :formatter="reportStatusFormat" />
            <el-table-column prop="applayStatus" label="状态" width="180" :formatter="applayStatusFormat" />
            <el-table-column prop="reportStatus" label="是否已报告" width="100" :formatter="reportStatusFormat" />
            <el-table-column prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
            <el-table-column prop="auditor" label="审核人" width="180" />
            <el-table-column prop="remark" label="备注" width="280" />
          </el-table>
@@ -1068,10 +1072,10 @@
          </el-row>
          <el-table ref="accidentCasesTable" :data="accidentCasesData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <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="empNumb" label="员工编号" width="150" />
            <el-table-column prop="deptName" label="护卫点" width="120" />
            <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="injuredTime" label="受伤日期" width="180" />
            <el-table-column prop="injuredAddress" label="受伤地点" width="180" />
@@ -1080,14 +1084,17 @@
            <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" :formatter="hospitalizatioFlagFormat" />
            <el-table-column prop="bedNumb" label="床号" width="180" />
            <el-table-column prop="reprotTime" label="报案时间" width="180" />
            <el-table-column prop="submitTime" label="递交资料时间" width="180" />
            <el-table-column prop="sbumitBy" label="递交人" width="180" />
            <el-table-column prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
            <el-table-column prop="bedNumb" label="床号" />
            <el-table-column prop="reprotTime" label="报案时间" width="150" />
            <el-table-column prop="submitTime" label="递交资料时间" width="150" />
            <el-table-column prop="sbumitBy" label="递交人" width="120" />
            <el-table-column prop="expensesFee" label="医疗总费用" width="180" />
            <el-table-column prop="settleStatus" label="案结状态" width="180" :formatter="settleStatusFormat" />
            <el-table-column prop="innsureFee" label="保险赔付费用" width="180" />
            <el-table-column prop="expenseReport" label="保单" width="180" />
            <el-table-column prop="hrDoDate" label="人事处理时间" width="180" />
            <el-table-column prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
            <el-table-column prop="settleDate" label="结案时间" width="150" />
          </el-table>
        </div>

@@ -1172,10 +1179,10 @@
          </el-row>
          <el-table ref="occupationalTable" :data="occupationalData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />
            <el-table-column prop="jobName" label="岗位" width="180" />
            <el-table-column prop="deptName" label="护卫点" width="150" />
            <el-table-column prop="jobName" label="岗位" width="150" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <el-table-column prop="empName" label="姓名" width="180" />
            <el-table-column prop="empName" label="姓名" width="150" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="injuredTime" label="受伤日期" width="180" />
            <el-table-column prop="injuredAddress" label="受伤地点" width="180" />
@@ -1184,14 +1191,16 @@
            <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" :formatter="hospitalizatioFlagFormat" />
            <el-table-column prop="bedNumb" label="床号" width="180" />
            <el-table-column prop="reportTime" label="报案时间" width="180" />
            <el-table-column prop="submitTime" label="递交资料时间" width="180" />
            <el-table-column prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
            <el-table-column prop="bedNumb" label="床号" width="100" />
            <el-table-column prop="reportTime" label="报案时间" width="150" />
            <el-table-column prop="submitTime" label="递交资料时间" width="150" />
            <el-table-column prop="sbumitBy" label="递交人" width="180" />
            <el-table-column prop="expensesFee" label="医疗总费用" width="180" />
            <el-table-column prop="compensated" label="已赔付医药费用" width="180" />
            <el-table-column prop="settleStatus" label="状态" width="180" :formatter="settleStatusFormat" />
            <el-table-column prop="expensesFee" label="医疗总费用" width="100" />
            <el-table-column prop="innsureFee" label="保险赔付费用" width="100" />
            <el-table-column prop="hrDoDate" label="人事处理时间" width="150" />
            <el-table-column prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
            <el-table-column prop="settleDate" label="结案时间" width="150" />
          </el-table>
        </div>

@@ -1264,18 +1273,18 @@
          </el-row>
          <el-table ref="laborTroubleTable" :data="laborTroubleData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />
            <el-table-column prop="deptName" label="护卫点" width="150" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <el-table-column prop="empName" label="姓名" width="180" />
            <el-table-column prop="empName" label="姓名" width="150" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
            <el-table-column prop="arbitrationType" label="仲裁类型" width="180" :formatter="arbitrationTypeFormat" />
            <el-table-column prop="arbitrationReason" label="仲裁事由" width="180" />
            <el-table-column prop="reporter" label="汇报人" width="180" />
            <el-table-column prop="remark" label="备注" width="180" />
            <el-table-column prop="arbitrationPay" label="仲裁赔付（元）" width="180" />
            <el-table-column prop="arbitrationStatus" label="状态" width="180" :formatter="arbitrationStatusFormat" />
            <el-table-column prop="settleDate" label="案结日期" width="180" />
            <el-table-column prop="arbitrationDate" label="仲裁日期" width="150" />
            <el-table-column prop="arbitrationType" label="仲裁类型" width="150" :formatter="arbitrationTypeFormat" />
            <el-table-column prop="arbitrationReason" label="仲裁事由" width="150" />
            <el-table-column prop="reporter" label="汇报人" width="150" />
            <el-table-column prop="remark" label="备注" width="200" />
            <el-table-column prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
            <el-table-column prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
            <el-table-column prop="settleDate" label="案结日期" width="150" />
          </el-table>
        </div>

@@ -1328,14 +1337,14 @@
          </el-row>
          <el-table ref="badRecordTable" :data="badRecordData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />
            <el-table-column prop="deptName" label="护卫点" width="140" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <el-table-column prop="empName" label="姓名" width="180" />
            <el-table-column prop="empName" label="姓名" width="140" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="badDate" label="不良记录日期" width="180" />
            <el-table-column prop="badContent" label="不良记录描述" width="180" />
            <el-table-column prop="reporter" label="汇报人" width="180" />
            <el-table-column prop="remark" label="备注" width="180" />
            <el-table-column prop="badDate" label="不良记录日期" width="140" />
            <el-table-column prop="badContent" label="不良记录描述" width="280" />
            <el-table-column prop="reporter" label="汇报人" width="100" />
            <el-table-column prop="remark" label="备注" width="280" />
          </el-table>
        </div>

@@ -1388,11 +1397,12 @@
          </el-row>
          <el-table ref="remarkInfoTable" :data="remarkInfoData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <el-table-column prop="empName" label="姓名" width="180" />
            <el-table-column prop="deptName" label="护卫点" width="140" />
            <el-table-column prop="jobName" label="岗位" width="140" />
            <el-table-column prop="empName" label="姓名" width="140" />
            <el-table-column prop="remarkDate" label="备注日期" width="180" />
            <el-table-column prop="remarkContent" label="备注信息" width="400" />
            <el-table-column prop="remarkContent" label="备注信息" />
          </el-table>
        </div>
        <div v-show="showArr[14].show">
@@ -1454,7 +1464,7 @@
          <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="certificateNumb" label="身份证号码" width="180" /> -->
            <el-table-column prop="newDeptName" label="现部门" />
            <el-table-column prop="newJobName" label="现岗位" />
            <el-table-column prop="empName" label="姓名" width="180" />
@@ -1462,6 +1472,7 @@
            <el-table-column prop="oldJobName" label="原岗位" />
            <el-table-column prop="changeDate" label="调岗日期" />
            <el-table-column prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
            <el-table-column prop="changeReason" label="调岗理由描述" width="380" />
          </el-table>
        </div>
        <div v-show="showArr[15].show">
@@ -1535,15 +1546,15 @@
          </el-row>
          <el-table ref="dimissionLogTable" :data="dimissionLogData" style="width: 100%;height: 70%;">
            <el-table-column type="selection" width="55" />
            <el-table-column prop="newDeptName" label="护卫点" width="180" />
            <el-table-column prop="newJobName" label="岗位" />
            <el-table-column prop="empNumb" 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="entryDate" label="入职日期" />
            <el-table-column prop="dimissionDate" label="离职日期" />
            <el-table-column prop="selfLeaveDay" label="自离天数" />
            <el-table-column prop="reporter" label="报备人" />
            <el-table-column prop="remark" label="备注" />
            <el-table-column prop="reporter" label="报告人" />
            <el-table-column prop="remark" label="备注" width="280" />
          </el-table>
        </div>
        <pagination

 src/views/yunpan/fujian.vue

@@ -322,6 +322,7 @@
</template>
<script>
import Pagination from '@/components/Pagination'
import { Loading } from 'element-ui'

export default {
  components: {
@@ -450,8 +451,10 @@
            empIds.push(j.empId)
          })
          this.labelform.empIds = empIds
          const loadingInstance = Loading.service({ fullscreen: true })
          this.$download('hr/empAccessory/singledownload', { ...this.labelform }, '附件_' + new Date().getTime() + '.zip').then(() => {
            this.downloaddialogFormVisible = false
            loadingInstance.close()
            this.$message({
              message: this.$t('下载成功'),
              type: 'success'

 src/views/yunpan/uploadfj.vue

@@ -153,6 +153,7 @@
<script>
import { getToken } from '@/utils/auth'
import { pages } from '@/settings'
import { Loading } from 'element-ui'

export default {
  props: {
@@ -402,9 +403,11 @@
          type: 'warning'
        })
      } else {
        const loadingInstance = Loading.service({ fullscreen: true })
        // 生成查询文件的条件
        var params = { accessoryids: checke.join(',') }
        this.$download('hr/empAccessory/download', { ...params }, this.activities[this.beforeIndex].timestamp + '.zip').then(() => {
          loadingInstance.close()
          this.$message({
            message: '下载成功!',
            type: 'success'

 src/views/yunpan/zhishou.vue

@@ -186,6 +186,7 @@
<script>
import { getToken } from '@/utils/auth'
import { pages } from '@/settings'
import { Loading } from 'element-ui'

export default {
  data() {
@@ -482,9 +483,11 @@
          type: 'warning'
        })
      } else {
        const loadingInstance = Loading.service({ fullscreen: true })
        // 生成查询文件的条件
        var params = { fileids: checke.join(',') }
        this.$download('hr/filesUpload/download', { ...params }, this.activities[this.beforeIndex].timestamp + '.zip').then(() => {
          loadingInstance.close()
          this.$message({
            message: '下载成功!',
            type: 'success'