Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-11 7369fd5866a78cde7ecbb4721d9decdfa181fd39

Merge remote-tracking branch 'origin/master'

 src/settings.js

@@ -29,6 +29,10 @@
    // 下载员工导入模版
    downloadEmpExcel: 'http://120.24.23.155:8000/员工信息.xls',
    // 导入员工
    uploadEmpExcel: 'http://120.24.23.155:8301/hr/empBaseInfo/importEmp'
    uploadEmpExcel: 'http://120.24.23.155:8301/hr/empBaseInfo/importEmp',
    // 获取图片
    getFilesUploadImage: 'http://120.24.23.155:8301/hr/filesUpload/image/',
    // 获取图片
    getAccessoryImage: 'http://120.24.23.155:8301/hr/empAccessory/image/'
  }
}

 src/views/dashboard/HtUser.vue

@@ -24,10 +24,11 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="150" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />

 src/views/dashboard/blUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <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="身份证号码" />

 src/views/dashboard/cqUser.vue

@@ -25,12 +25,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />

 src/views/dashboard/ctUser.vue

@@ -23,12 +23,14 @@
        :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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="100" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <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="身份证号码" width="100" />

 src/views/dashboard/gsUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="60" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />

 src/views/dashboard/lzUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <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="身份证号码" width="100" />

 src/views/dashboard/onTheJobUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <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="身份证号码" />

 src/views/dashboard/qjUser.vue

@@ -25,12 +25,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />

 src/views/dashboard/sbUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <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="身份证号码" />

 src/views/dashboard/sfzUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="150" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="150" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="150" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="150" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />

 src/views/dashboard/tgUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" 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="oldDeptName" label="原护卫点" width="100" />

 src/views/dashboard/tjUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" 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="jobName" label="岗位" width="80" />

 src/views/dashboard/ygUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="100" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100 " />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <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="身份证号码" width="100" />

 src/views/dashboard/yjUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
        <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="身份证号码" />

 src/views/dashboard/ywUser.vue

@@ -24,12 +24,13 @@
        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%;"
      >
        <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="60" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />

 src/views/febs/system/dept/Index.vue

@@ -132,7 +132,8 @@
        parentId: null,
        deptType: '',
        deptFunction: '',
        orderNum: 0
        orderNum: 0,
        allDeptName: ''
      }
    },
    initDeptTree() {
@@ -162,6 +163,7 @@
      this.dept.deptId = data.id
      this.dept.deptType = data.deptType
      this.dept.deptFunction = data.deptFunction
      this.dept.allDeptName = data.allDeptName
      this.$refs.form.clearValidate()
    },
    add() {

 src/views/statistics/outEmpCount.vue

@@ -18,7 +18,7 @@
          <el-table :data="tableData">

            <el-table-column label="序号" type="index" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" />
            <el-table-column prop="deptName" label="护卫点" />
            <el-table-column prop="allDeptName" label="护卫点" />
            <el-table-column prop="jobName" label="岗位" />
            <el-table-column prop="empName" label="姓名" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

 src/views/user/Informationinput.vue

@@ -101,12 +101,12 @@
          <!--          </el-table-column>-->
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="50" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
          <el-table-column show-overflow-tooltip prop="empType" label="员工类别" width="80" :formatter="empTypeFormat" />
          <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
          <el-table-column show-overflow-tooltip prop="nation" label="民族" width="50" :formatter="nationFormat" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
          <el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
          <el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
          <el-table-column show-overflow-tooltip prop="education" label="学历" width="50" :formatter="educationFormat" />
@@ -183,7 +183,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <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="jobName" label="岗位" width="80" />
@@ -230,7 +230,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="150" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="150" />
          <el-table-column prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
@@ -262,7 +262,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <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="jobName" label="岗位" width="60" />
@@ -296,7 +296,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <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="身份证号码" />
@@ -329,7 +329,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="100" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
          <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="身份证号码" />
@@ -359,7 +359,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="100" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
          <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="身份证号码" />
@@ -390,7 +390,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="100" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
          <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="身份证号码" />
@@ -423,7 +423,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="名称" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
@@ -469,7 +469,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
@@ -516,7 +516,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <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="身份证号码" />
@@ -568,7 +568,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="120" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -598,7 +598,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="180" />
          <el-table-column show-overflow-tooltip prop="deptName" label="部门(护卫点)" width="120" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />

 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
@@ -5928,9 +5928,10 @@
  }

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

@@ -5964,6 +5965,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 {
@@ -6086,8 +6094,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/inemployees.vue

@@ -7,7 +7,7 @@
            <h3 class="bu-tian-jia-title">在职员工</h3>
          </el-col>
          <el-col :span="9" style="margin-top: 15px;">
            <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:300px" />
            <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:300px" />
            <span class="search-btn" @click="vagueSearch">查询</span>
            <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
          </el-col>
@@ -225,6 +225,7 @@
          stripe
          border
          style="width: 100%;color: #000;"
          @sort-change="changeSort"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column label="操作" width="130">
@@ -247,18 +248,18 @@
              >编辑</span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="deptName" label="部门（护卫点）" />
          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="180" />
          <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="60" :formatter="sexFormat" />
          <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="140" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="140" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
            <template slot-scope="{row}">
              {{ transEmpStatus(row.empStatus) }}
@@ -416,6 +417,7 @@
                    :clear-value-text="$t('common.clear')"
                    placeholder="请选择部门(护卫点)"
                    style="width:100%"
                    @select="deptNameSelect"
                  />
                </el-form-item>
                <el-form-item label="岗位" prop="jobName">
@@ -701,7 +703,7 @@
          <tr>
            <td>部门(护卫点)</td>
            <td>
              <el-checkbox label="deptName"><span /></el-checkbox>
              <el-checkbox label="allDeptName"><span /></el-checkbox>
            </td>
            <td>所属岗位</td>
            <td>
@@ -932,6 +934,7 @@
        deptId: '',
        deptName: '',
        empNumb: '',
        allDeptName: '',
        empName: '',
        sex: '1',
        JobId: '',
@@ -1113,7 +1116,7 @@
      exportUrl: '',
      checkAll: false,
      isIndeterminate: false,
      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      checkedCities: [],
      tableData: [],
      selectDimissionType: 1,
@@ -1273,7 +1276,7 @@
    },
    // 翻页方法
    search() {
      this.queryParams.vague = ''
      this.queryParams.baseKey = ''
      this.fetch({
        ...this.queryParams,
        ...this.sort
@@ -1295,7 +1298,7 @@
    },
    vagueSearch() {
      this.fetch({
        baseKey: this.queryParams.vague
        baseKey: this.queryParams.baseKey
      })
    },
    transEmpStatus(empStatus) {
@@ -1726,6 +1729,10 @@

      this.ygdgForm.newJobName = item.value
      this.ygdgForm.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)
@@ -2003,6 +2010,11 @@
          this.cleanEmpBase()
        })
      }
    },
    changeSort(val) {
      this.sort.field = val.prop
      this.sort.order = val.order
      this.search()
    }
  }
}

 src/views/user/outemployess.vue

@@ -7,7 +7,7 @@
            <h3 class="bu-tian-jia-title">离职员工</h3>
          </el-col>
          <el-col :span="9" style="margin-top: 15px;">
            <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:300px" />
            <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:300px" />
            <span class="search-btn" @click="vagueSearch">查询</span>
            <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
          </el-col>
@@ -226,6 +226,7 @@
          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
          :cell-style="{padding:'7px 0','text-align':'center'}"
          style="width: 100%;color: #000;"
          @sort-change="changeSort"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column label="操作" width="70">
@@ -249,11 +250,11 @@
              >编辑</span> -->
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="deptName" label="部门（护卫点）" />
          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="180" />
          <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="60" :formatter="sexFormat" />
          <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
          <el-table-column
@@ -272,8 +273,8 @@
            :formatter="empTypeFormat"
          />
          <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="120" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="130" />
          <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="130" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
            <template slot-scope="{row}">
              {{ transEmpStatus(row.empStatus) }}
@@ -1038,7 +1039,7 @@
          <tr>
            <td>部门(护卫点)</td>
            <td>
              <el-checkbox label="deptName"><span /></el-checkbox>
              <el-checkbox label="allDeptName"><span /></el-checkbox>
            </td>
            <td>所属岗位</td>
            <td>
@@ -1264,7 +1265,7 @@
      archivesStatusOptions: [],
      sexOptions: [],
      empTypeOptions: [],
      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      checkedCities: []
    }
  },
@@ -1357,7 +1358,7 @@
    },
    // 翻页方法
    search() {
      this.queryParams.vague = ''
      this.queryParams.baseKey = ''
      this.fetch({
        ...this.queryParams,
        ...this.sort
@@ -1379,7 +1380,7 @@
    },
    vagueSearch() {
      this.fetch({
        baseKey: this.queryParams.vague
        baseKey: this.queryParams.baseKey
      })
    },
    transEmpStatus(empStatus) {
@@ -1625,6 +1626,11 @@
          })
          break
      }
    },
    changeSort(val) {
      this.sort.field = val.prop
      this.sort.order = val.order
      this.search()
    }
  }
}

 src/views/user/search.vue

@@ -271,10 +271,10 @@
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
            <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="80" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
            <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
@@ -317,7 +317,7 @@
                <tr>
                  <td>部门(护卫点)</td>
                  <td>
                    <el-checkbox label="deptName"><span /></el-checkbox>
                    <el-checkbox label="allDeptName"><span /></el-checkbox>
                  </td>
                  <td>所属岗位</td>
                  <td>
@@ -451,7 +451,7 @@
                  </td>
                  <td>工作证</td>
                  <td>
                    <el-checkbox label="empCardStatus"><span /></el-checkbox>
                    <el-checkbox label="empCardStatusName"><span /></el-checkbox>
                  </td>
                </tr>
                <tr>
@@ -844,7 +844,7 @@
            <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="100" />
            <el-table-column show-overflow-tooltip prop="remark" label="备注" />

            <!-- <el-table-column prop="deptName" label="护卫点" width="180" />
            <!-- <el-table-column prop="allDeptName" 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" />
@@ -1938,7 +1938,7 @@
  },
  data() {
    return {
      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      dialogShowDcyg: false,
      isIndeterminate: false,
      checkedCities: [],

 src/views/user/selectuser.vue

@@ -32,6 +32,7 @@
        width="80%"
        @selection-change="handleSelectionChange"
        @row-dblclick="rowDblclick"
        @sort-change="changeSort"
      >
        <el-table-column type="selection" :reserve-selection="false" width="50" />
        <el-table-column v-if="show" prop="empId" label="员工Id" />
@@ -39,7 +40,7 @@
        <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="护卫点" width="180" />
        <el-table-column prop="allDeptName" label="护卫点" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
        <el-table-column v-if="show" prop="jobId" label="岗位Id" />
        <el-table-column prop="jobName" label="岗位" />
        <el-table-column prop="empTypeName" label="员工类别" />
@@ -156,6 +157,11 @@
    rowDblclick(row, column, event) {
      this.$refs.multipleTable.toggleRowSelection(row, true)
      this.sureChoose()
    },
    changeSort(val) {
      this.sort.field = val.prop
      this.sort.order = val.order
      this.search()
    }
  }
}

 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>
@@ -361,8 +361,6 @@
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80px" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点(部门)" width="120px" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="70px" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="70px" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号" width="120px" />
          <template v-for="(col) in labelData">
            <el-table-column :key="col.labelid" show-overflow-tooltip :prop="col.labelcode" :label="col.labelname">
              <template slot-scope="scope">
@@ -370,6 +368,7 @@
              </template>
            </el-table-column>
          </template>
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="70px" />
        </el-table>
        <pagination
          v-show="total>0"
@@ -808,8 +807,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"
@@ -47,14 +47,14 @@
            />提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
          </el-row>
          <el-row style="background-color: rgba(0,0,0,0.2);">
            <el-col :span="14">
            <el-col :span="16">
              <el-checkbox
                v-model="checkAll"
                class="myRedCheckBox"
                style="color: #000; margin-left: 20px;"
                @change="checkAllMethods()"
              >全选</el-checkbox></el-col>
            <el-col :span="10">
            <el-col :span="8">
              <el-button
                type="primary"
                icon="el-icon-download"
@@ -71,7 +71,6 @@
                <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
              </el-popconfirm>
              <el-button type="warning" @click="openUpdateFileName()">重命名</el-button>
              <el-button type="primary" @click="downloaddialogFormVisible = true">查看</el-button>
            </el-col>
          </el-row>
        </el-header>
@@ -125,11 +124,12 @@
                <el-card
                  shadow="never"
                >
                  <img
                  <el-image
                    :src="showFileImg(node.filesformat)"
                    class="uploading-image"
                    @click="clickCard(index * 8 + nodeIndex)"
                  >
                    :preview-src-list="srcList"
                    @click="clickImg(node)"
                  />
                  <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
                    <div style="padding-top: 14px;">
                      <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
@@ -178,6 +178,8 @@
  },
  data() {
    return {
      srcList: [],
      getImg: pages.getAccessoryImage,
      updateFileNameFormVisible: false,
      file: {
        fileName: ''
@@ -213,6 +215,12 @@
    this.initlabel()
  },
  methods: {
    clickImg(node) {
      this.srcList = []
      if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
        this.srcList.push(this.getImg + node.accessoryid)
      }
    },
    updateFileName(formName) {
      this.$refs[formName].validate(valid => {
        if (valid) {
@@ -611,12 +619,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 +659,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;

 src/views/yunpan/zhishou.vue

@@ -81,14 +81,14 @@
            />提示：文件不要超过10个，单个文件大小不超过200M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
          </el-row>
          <el-row style="background-color: rgba(0,0,0,0.2);">
            <el-col :span="14">
            <el-col :span="16">
              <el-checkbox
                v-model="checkAll"
                class="myRedCheckBox"
                style="color: #000; margin-left: 20px;"
                @change="checkAllMethods()"
              >全选</el-checkbox></el-col>
            <el-col :span="10">
            <el-col :span="8">
              <el-button
                type="primary"
                icon="el-icon-download"
@@ -105,7 +105,6 @@
                <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
              </el-popconfirm>
              <el-button type="warning" @click="openUpdateFileName()">重命名</el-button>
              <el-button type="primary" @click="downloaddialogFormVisible = true">查看</el-button>
            </el-col>
          </el-row>
        </el-header>
@@ -159,14 +158,15 @@
                <el-card
                  shadow="never"
                >
                  <img
                  <el-image
                    :src="showFileImg(node.filesformat)"
                    class="uploading-image"
                    @click="clickCard(index * rowCount + nodeIndex)"
                  >
                    :preview-src-list="srcList"
                    @click="clickImg(node)"
                  />
                  <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
                    <div style="padding-top: 14px;">
                      <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
                      <el-checkbox v-model="checkedArr[index * rowCount + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
                    </div>
                  </el-tooltip>
                </el-card>
@@ -206,6 +206,8 @@
export default {
  data() {
    return {
      srcList: [],
      getImg: pages.getFilesUploadImage,
      updateFileNameFormVisible: false,
      file: {
        fileName: ''
@@ -252,6 +254,12 @@
    this.initFolder()
  },
  methods: {
    clickImg(node) {
      this.srcList = []
      if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
        this.srcList.push(this.getImg + node.filesid)
      }
    },
    updateFileName(formName) {
      this.$refs[formName].validate(valid => {
        if (valid) {