Merge remote-tracking branch 'origin/master'

luoyb

2021-03-10 8181e7bf22a3edb624a16970619ced2771cbb585

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/user/Informationinput.vue

 src/views/dashboard/HtUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/blUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/cqUser.vue

@@ -25,6 +25,7 @@
        width="50%"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/ctUser.vue

@@ -23,6 +23,8 @@
        :data="list"
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
        style="width: 100%;"
      >

 src/views/dashboard/gsUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/lzUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/onTheJobUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/qjUser.vue

@@ -25,6 +25,7 @@
        width="50%"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/sbUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/sfzUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/tgUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/tjUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/ygUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/yjUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/dashboard/ywUser.vue

@@ -24,6 +24,7 @@
        row-key="prop1"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >

 src/views/user/Informationinput.vue

@@ -795,7 +795,6 @@
                    :clear-value-text="$t('common.clear')"
                    placeholder="请选择部门(护卫点)"
                    style="width:100%"
                    @select="DeptNameSelect"
                  />
                </el-form-item>
                <el-form-item label="岗位" prop="jobName">
@@ -2605,7 +2604,6 @@
        JobId: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        jobName: '',
        remarkContent: '',
        remarkDate: '',
@@ -2627,7 +2625,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        arbitrationDate: '',
@@ -2656,7 +2653,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        injuredTime: '',
@@ -2705,7 +2701,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        injuredTime: '',
@@ -2745,7 +2740,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        applayDate: '',
@@ -2773,7 +2767,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        applayDate: '',
@@ -2799,7 +2792,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        applayDate: '',
@@ -2824,7 +2816,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        beginTime: '',
@@ -2852,7 +2843,6 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        beginDate: '',
@@ -2879,7 +2869,6 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        certificateNumb: '',
@@ -2909,7 +2898,6 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        hospital: '',
@@ -2939,7 +2927,6 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        workUnit: '',
@@ -2960,8 +2947,7 @@
        customerId: '',
        archivesNumb: '',
        deptId: '1',
        deptName: '深圳市中保亚太保安服务有限公司',
        allDeptName: '深圳市中保亚太保安服务有限公司',
        deptName: '',
        empNumb: '',
        empName: '',
        sex: '1',
@@ -3017,7 +3003,6 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        badDate: '',
@@ -5853,10 +5838,6 @@
    }, jobNameSelect(item) {
      this.empBaseInfoForm.jobName = item.value
      this.empBaseInfoForm.JobId = item.code
    }, DeptNameSelect(val) {
      this.empBaseInfoForm.deptId = val.id
      this.empBaseInfoForm.deptName = val.label
      this.empBaseInfoForm.allDeptName = val.allDeptName
    },
    generateUserInfo(index, val) {
      var userinfo = toCardGetUserInfo(val)

 src/views/user/archivesChange.vue

@@ -578,14 +578,14 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="physicalExamId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="100" :formatter="typeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="100" :formatter="ecgNameFormat" />
                <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" width="150" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="140" :formatter="typeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="140" :formatter="ecgNameFormat" />
                <el-table-column show-overflow-tooltip="true" prop="conclusion" label="体检结论" />
                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
              </el-table>
              <pagination
@@ -619,10 +619,10 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="contractId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="signingDate" label="合同签订日期" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="endDate" label="合同结束日期" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="contractStatus" label="合同状态" width="100" :formatter="contractStatusFormat" />
                <el-table-column show-overflow-tooltip="true" prop="signingDate" label="合同签订日期" />
                <el-table-column show-overflow-tooltip="true" prop="endDate" label="合同结束日期" />
                <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" />
                <el-table-column show-overflow-tooltip="true" prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
                <el-table-column show-overflow-tooltip="true" prop="transactor" label="合同办理人" />
              </el-table>
              <pagination
@@ -731,9 +731,9 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="resignId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" />
                <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" />
                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
              </el-table>
              <pagination
@@ -767,13 +767,13 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="dimissionAttendId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" />
                <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="150" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="150" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" />
                <el-table-column show-overflow-tooltip="true" prop="deduct" label="有无代扣款项" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假（天）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假（天）" />
                <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
              </el-table>
              <pagination
@@ -5882,8 +5882,8 @@
  button.el-dialog__headerbtn {
    height: 30px;
    width: 30px;
    background-color: #333;
    opacity: 0.4;
    background-color: #a00515;
    opacity: 0.8;
    line-height: 30px;
    border-radius: 50%;
    i {

 src/views/user/archivesEdit.vue

@@ -623,14 +623,14 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="physicalExamId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="120" :formatter="typeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="120" :formatter="ecgNameFormat" />
                <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" width="150" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="140" :formatter="typeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="140" :formatter="ecgNameFormat" />
                <el-table-column show-overflow-tooltip="true" prop="conclusion" label="体检结论" />
                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="140" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
              </el-table>
              <pagination
@@ -803,9 +803,9 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="resignId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" />
                <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" />
                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
              </el-table>
              <pagination
@@ -848,13 +848,13 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="dimissionAttendId" label="" />
                <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" />
                <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="150" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="150" />
                <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" />
                <el-table-column show-overflow-tooltip="true" prop="deduct" label="有无代扣款项" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假（天）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假（天）" />
                <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
              </el-table>
              <pagination
@@ -5923,9 +5923,10 @@
  }

  .uploading-image {
    width: 100%;
    height: 100%;
    width: 70%;
    height: 70%;
    display: block;
    margin: 0 auto;
  }
}

@@ -5959,6 +5960,13 @@
/* 设置鼠标经过对勾框，对勾框边框的颜色 */
.myRedCheckBox .el-checkbox__inner:hover {
  border-color: #a32c30;
}

.myRedCheckBox .el-checkbox__label {
  width: 90%;
  overflow: hidden;
  text-overflow:ellipsis;
  white-space: nowrap;
}

.avatar-uploader .el-upload {
@@ -6081,8 +6089,8 @@
  button.el-dialog__headerbtn {
      height: 30px;
      width: 30px;
    background-color: #333;
    opacity: 0.4;
    background-color: #a00515;
    opacity: 0.8;
      line-height: 30px;
      border-radius: 50%;
    i {

 src/views/yunpan/fujian.vue

@@ -321,7 +321,7 @@

          </el-col>
        </el-row>
        <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" width="80%" class="fjgl-class" top="10px" @close="closeDialog()">
        <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" height="100vh" fullscreen="true" class="fjgl-class" @close="closeDialog()">
          <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" />
        </el-dialog>
        <el-row>
@@ -808,8 +808,24 @@
  }
}
.fjgl-class{
    height: 90%;
     overflow: auto;
  .el-dialog__body {
    padding: 0 20px;
  }
  button.el-dialog__headerbtn {
    height: 30px;
    width: 30px;
    background-color: #a00515;
    opacity: 0.8;
    line-height: 30px;
    border-radius: 50%;
    i {
      color: #fff !important;
    }
    &:hover {
      opacity: 0.5;
    }
  }
}
.add-lable {
    text-align: initial;

 src/views/yunpan/uploadfj.vue

@@ -1,5 +1,5 @@
<template>
  <div class="zs-main">
  <div class="zs-main fj-upload">
    <el-row class="search-title">
      <el-col :span="18" class="title">
        <div class="zs-title">上传附件</div>
@@ -12,15 +12,15 @@
          clearable
          placeholder="请输入文件名"
          show-word-limit
          style="width:200px"
          style="width:280px;margin-right: 10px"
        />
        <el-button type="primary" @click="findFileByFileName()">查询</el-button>
      </el-col>
    </el-row>
    <el-container style="background-color: #fff;">
      <el-aside width="210px" style="background-color: #fff;text-align: center;">
        <h4>{{ rowitem.empName }}：{{ rowitem.deptName }}</h4>
        <el-timeline>
      <el-aside width="210px" style="background-color: #fff;padding: 0 24px;text-align: center;height: 88vh;overflow: auto">
        <span style="font-size: 18px;font-weight: 700;">{{ rowitem.empName }}：{{ rowitem.deptName }}</span>
        <el-timeline style="margin-top: 10px">
          <el-timeline-item
            v-for="(activity, index) in activities"
            :key="index"
@@ -611,12 +611,15 @@
        line-height: 60px;
    }
    .uploading-image {
        width: 100%;
        height: 100%;
        width: 60%;
        height: 60%;
        display: block;
    margin: 0 auto;
    }
}

.fj-upload .el-timeline-item {
  padding-bottom: 1px;
}
.el-timeline-item__timestamp {
    font-size: 15px;
    color: #000;
@@ -648,6 +651,12 @@
.myRedCheckBox .el-checkbox__inner:hover {
    border-color: #a32c30;
}
.myRedCheckBox .el-checkbox__label {
  width: 90%;
  overflow: hidden;
  text-overflow:ellipsis;
  white-space: nowrap;
}

.avatar-uploader .el-upload {
    border: 1px dashed #d9d9d9;