Merge remote-tracking branch 'origin/master'

luoyb

2021-02-26 84597eb4f868e088f658d2f04ce354813afa780e

Merge remote-tracking branch 'origin/master'

 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

@@ -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" />
@@ -212,7 +212,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="beginTime" label="开始时间" width="180" />
          <el-table-column prop="endTime" label="结束时间" width="180" />
          <el-table-column prop="leaveDay" label="请假天数" width="180" />
@@ -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>
@@ -1841,7 +1853,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>
@@ -5075,6 +5087,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 '（非深户）四险一档'
      }
    }
  }
}

 src/views/user/archivesEdit.vue

@@ -464,7 +464,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="beginTime" label="开始时间" width="180" />
              <el-table-column prop="endTime" label="结束时间" width="180" />
              <el-table-column prop="leaveDay" label="请假天数" width="180" />
@@ -494,7 +494,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" />

 src/views/user/inemployees.vue

@@ -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">
@@ -134,18 +134,17 @@
                    </el-checkbox-group>
                  </td>
                </tr>
                <tr>
                <!-- <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>
@@ -154,16 +153,15 @@
      <el-main style="height: 85%;">
        <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">
@@ -1779,11 +1777,9 @@
        case '0':
          return '在职'
        case '1':
          return '正常离职'
          return '离职'
        case '2':
          return '自动离职'
        case '3':
          return '公司辞退'
          return '退休'
      }
    },
    initDept() {
@@ -1803,7 +1799,7 @@
        this.headerHeight = '30px'
        this.advancedQueryShow = false
      } else {
        this.headerHeight = '370px'
        this.headerHeight = '330px'
        this.advancedQueryShow = true
      }
    },

 src/views/user/outemployess.vue

@@ -153,18 +153,17 @@
                      </el-checkbox-group>
                    </td>
                  </tr>
                  <tr>
                  <!-- <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-group>
                      <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>
@@ -1025,11 +1024,9 @@
        case '0':
          return '在职'
        case '1':
          return '正常离职'
          return '离职'
        case '2':
          return '自动离职'
        case '3':
          return '公司辞退'
          return '退休'
      }
    },
    transDimissionType(dimissionType) {

 src/views/user/search.vue

@@ -208,9 +208,8 @@
                  <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>

 src/views/user/selectuser.vue

@@ -1,13 +1,28 @@
<template>
  <div id="mainDiv">
    <el-header :height="headerHeight">
      <el-row>
        <el-col :span="24">
          <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" />
          <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-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
@@ -69,7 +84,8 @@
      multipleSelection: [],
      total: 0, // 总数量
      queryParams: {
        empNumb: ''
        empNumb: '',
        empStatus: []
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数

 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>