Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-14 680c4f9e4e8b079593c8e57c100b92890e70960d

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/febs/system/user/Edit.vue

 src/layout/components/AppMain.vue

@@ -26,7 +26,7 @@
  width: 100%;
  position: relative;
  overflow: hidden;
  background: #f3f5f8;
  background: #fff;
  font-size: .88rem;
}


 src/views/dashboard/HtUser.vue

@@ -35,9 +35,9 @@
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" />
        <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="100" />
        <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
        <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" />
        <el-table-column show-overflow-tooltip prop="endDate" label="结束日期" />
        <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" min-width="120" />
        <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" min-width="80" />
        <el-table-column show-overflow-tooltip prop="endDate" label="结束日期" min-width="80" />
        <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
        <el-table-column show-overflow-tooltip prop="transactor" label="办理人" width="80" />
      </el-table>

 src/views/dashboard/blUser.vue

@@ -33,9 +33,9 @@
        <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
        <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" />
        <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="100" />
        <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" min-width="120" />
        <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" min-width="120" />
        <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
        <el-table-column show-overflow-tooltip prop="remark" label="备注" />
      </el-table>

 src/views/dashboard/onTheJobUser.vue

@@ -33,7 +33,7 @@
        <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
        <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="60" />
        <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
        <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="80" />

 src/views/dashboard/sbUser.vue

@@ -34,7 +34,7 @@
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" />
        <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
        <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" min-width="120" />
        <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
        <el-table-column show-overflow-tooltip prop="insuranceGaers" :formatter="insuranceGaersFormat" label="社保档位" width="100" />
        <el-table-column show-overflow-tooltip prop="reportStatus" :formatter="reportStatusFormat" label="是否已报告" width="100" />

 src/views/dashboard/sfzUser.vue

@@ -33,8 +33,8 @@
        <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
        <el-table-column show-overflow-tooltip prop="certificateValidity" label="身份证有效期" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
        <el-table-column show-overflow-tooltip prop="certificateValidity" label="身份证有效期" min-width="120" />
        <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="100">
          <template slot-scope="scope">
            <span>{{ gzdStateList[scope.row.empStatus] }}&nbsp;</span>

 src/views/dashboard/tgUser.vue

@@ -32,15 +32,15 @@
        <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
        <el-table-column show-overflow-tooltip prop="oldDeptName" label="原护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" width="100" />
        <el-table-column show-overflow-tooltip prop="newDeptName" label="新护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="newJobName" label="新岗位" width="100" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" min-width="100" />
        <el-table-column show-overflow-tooltip prop="changeType" :formatter="changeTypeFormat" label="调岗类型" width="100" />
        <el-table-column show-overflow-tooltip prop="changeDate" label="调岗位日期" width="150" />
        <el-table-column show-overflow-tooltip prop="changeReason" label="调岗原因" />
        <el-table-column show-overflow-tooltip prop="changeReason" label="调岗原因" min-width="100" />
      </el-table>
      <pagination
        v-show="total>0"

 src/views/dashboard/tjUser.vue

@@ -38,10 +38,10 @@
        <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
        <el-table-column show-overflow-tooltip prop="physicalExamType" :formatter="typeFormat" label="体检类型" width="80" />
        <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="60" />
        <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="60" />
        <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="60" />
        <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论" />
        <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" />
        <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="70" />
        <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="70" />
        <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论" min-width="100" />
        <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" min-width="100" />
        <el-table-column show-overflow-tooltip prop="remark" label="备注" />
      </el-table>
      <pagination

 src/views/dashboard/yjUser.vue

@@ -33,9 +33,9 @@
        <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
        <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" />
        <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
        <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" min-width="140" />
        <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" min-width="100" />
        <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="80" />
        <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="80" />
        <el-table-column show-overflow-tooltip prop="remark" label="备注" />

 src/views/febs/system/user/Edit.vue

@@ -73,7 +73,6 @@
          node-key="id"
          highlight-current
          style="border: 1px solid #DCDFE6;border-radius: 3px;padding: 6px;"
          @check="checkeTree"
        />
      </el-form-item>
      <el-form-item :label="$t('table.user.status')" prop="status">

 src/views/user/archivesChange.vue

@@ -1189,6 +1189,7 @@
                          >下载
                          </el-button>
                          <el-button
                            class="pri-del-btn"
                            type="primary"
                            icon="el-icon-search"
                            size="mini"
@@ -1196,7 +1197,7 @@
                          >删除
                          </el-button>
                          <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
                            <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
                            <el-button slot="reference" type="danger">转存</el-button>
                          </el-popconfirm>
                        </el-col>
                      </el-row>
@@ -6014,5 +6015,9 @@
      color: #333 !important;
    }
  }
  .pri-del-btn {
    background-color: rgb(64, 158, 255);
    border-color: rgb(64, 158, 255);
  }
</style>


 src/views/user/archivesEdit.vue

@@ -1330,6 +1330,7 @@
                          >下载
                          </el-button>
                          <el-button
                            class="pri-del-btn"
                            type="primary"
                            icon="el-icon-search"
                            size="mini"
@@ -1337,7 +1338,7 @@
                          >删除
                          </el-button>
                          <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
                            <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
                            <el-button slot="reference" type="danger">转存</el-button>
                          </el-popconfirm>
                        </el-col>
                      </el-row>
@@ -6154,5 +6155,9 @@
    color: #333 !important;
  }
}
.pri-del-btn {
  background-color: rgb(64, 158, 255) !important;
  border-color: rgb(64, 158, 255) !important;
}
</style>


 src/views/user/inemployees.vue

@@ -257,8 +257,8 @@
          <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
          <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="60" :formatter="educationFormat" />
          <el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
          <el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" width="80" />
          <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
          <el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" width="80" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
            <template slot-scope="{row}">

 src/views/user/outemployess.vue

@@ -265,6 +265,7 @@
            :formatter="educationFormat"
          />
          <el-table-column show-overflow-tooltip="true" prop="nativePlaceName" label="籍贯" width="70" />
          <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
          <el-table-column
            show-overflow-tooltip="true"
            prop="empType"
@@ -272,7 +273,6 @@
            width="80"
            :formatter="empTypeFormat"
          />
          <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">

 src/views/yunpan/fujian.vue

@@ -334,7 +334,7 @@
          :data="tableData"
          stripe
          border
          :cell-style="{padding:'7px 0','text-align':'center'}"
          :cell-style="{padding:'4.8px 0','text-align':'center'}"
          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
          style="width: 100%;color: #000;"
        >
@@ -373,6 +373,7 @@
        </el-table>
        <pagination
          v-show="total>0"
          style="text-align: right;width: 98%;"
          :total="total"
          :page.sync="pagination.num"
          :limit.sync="pagination.size"

 src/views/yunpan/uploadfj.vue

@@ -43,7 +43,7 @@
          <el-row><el-col :span="24">
            <i
              class="el-icon-bell"
              style=" color: #a32c30; margin-right: 10px;"
              style="color: #a32c30; margin-right: 10px;"
            />提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
          </el-row>
          <el-row style="background-color: rgba(0,0,0,0.2);">
@@ -63,12 +63,13 @@
              >下载</el-button>
              <el-button
                type="primary"
                class="pri-del-btn"
                icon="el-icon-search"
                size="mini"
                @click="delFile()"
              >删除</el-button>
              <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
                <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
                <el-button slot="reference" type="danger">转存</el-button>
              </el-popconfirm>
              <el-button type="warning" @click="openUpdateFileName()">重命名</el-button>
            </el-col>
@@ -131,7 +132,7 @@
                    @click="clickImg(node)"
                  />
                  <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
                    <div style="padding-top: 14px;">
                    <div style="padding-top: 14px;text-align: center">
                      <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
                    </div>
                  </el-tooltip>
@@ -219,7 +220,7 @@
    this.initlabel()
    setTimeout(() => {
      this.clickTimeline(this.tableindex)
    }, 1000)
    }, 1500)
  },
  methods: {
    clickImg(node) {
@@ -617,8 +618,8 @@
        }
    }
    .add-folder-but {
        background: #fff !important;
        color: #a32c30 !important;
        background: #a32c30 !important;
        color: #fff !important;
        margin-bottom: 20px;
    }
    padding: 0 15px 0 15px;
@@ -626,8 +627,8 @@
        line-height: 60px;
    }
    .uploading-image {
        width: 60%;
        height: 60%;
        width: 45%;
        height: 45%;
        display: block;
    margin: 0 auto;
    }
@@ -667,10 +668,12 @@
    border-color: #a32c30;
}
.myRedCheckBox .el-checkbox__label {
  width: 90%;
  overflow: hidden;
  text-overflow:ellipsis;
  white-space: nowrap;
}
.myRedCheckBox .el-checkbox__input {
  vertical-align: text-top;
}

.avatar-uploader .el-upload {
@@ -728,4 +731,8 @@
.el-input-number {
    width: 100%;
}
.pri-del-btn {
  background-color: rgb(64, 158, 255);
  border-color: rgb(64, 158, 255);
}
</style>

 src/views/yunpan/zhishou.vue

@@ -1,5 +1,5 @@
<template>
  <div class="zs-main">
  <div class="zs-main" style="background-color: #fff">
    <el-row class="search-title">
      <el-col :span="18" class="title">
        <div class="zs-title">云盘智搜</div>
@@ -21,7 +21,7 @@
      <el-aside width="210px" style="background-color: #fff;text-align: center;">
        <el-button class="add-folder-but" @click="dialogFormVisible = true">新增</el-button>
        <el-popconfirm title="是否删除目录？" @onConfirm="delFolder()">
          <el-button slot="reference" class="hr-but-all" type="danger">删除</el-button>
          <el-button slot="reference" class="pri-del-btn" type="primary">删除</el-button>
        </el-popconfirm>
        <el-dialog
          title="新增文件夹"
@@ -97,12 +97,13 @@
              >下载</el-button>
              <el-button
                type="primary"
                class="pri-del-btn"
                icon="el-icon-search"
                size="mini"
                @click="delFile()"
              >删除</el-button>
              <el-popconfirm title="是否移动文件？" @onConfirm="mvdialogFormVisible = true">
                <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
                <el-button slot="reference" type="danger">转存</el-button>
              </el-popconfirm>
              <el-button type="warning" @click="openUpdateFileName()">重命名</el-button>
            </el-col>
@@ -679,8 +680,8 @@
        }
    }
    .add-folder-but {
        background: #fff !important;
        color: #a32c30 !important;
        background: #a32c30 !important;
        color: #fff !important;
        margin-bottom: 20px;
    }
    padding: 0 15px 0 15px;
@@ -688,9 +689,10 @@
        line-height: 60px;
    }
    .uploading-image {
        width: 100%;
        height: 100%;
        width: 70%;
        height: 70%;
        display: block;
    margin-left: 30px;
    }
}

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

.myRedCheckBox .el-checkbox__label {
  overflow: hidden;
  text-overflow:ellipsis;
  white-space: nowrap;
}
.myRedCheckBox {
  margin-left: -10px;
}
.myRedCheckBox .el-checkbox__input {
  vertical-align: text-top;
}
.avatar-uploader{
  .el-upload-dragger{
@@ -791,5 +805,9 @@
.el-input-number {
    width: 100%;
}
.pri-del-btn {
  background-color: rgb(64, 158, 255) !important;
  border-color: rgb(64, 158, 255) !important;
}
</style>