yz
2021-02-22 ad2184715247cbea83cc0cd3c1c7fd62ca768aa1
增加附件删除标签判断
3个文件已修改
100 ■■■■■ 已修改文件
src/views/dashboard/index.vue 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/Informationinput.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/yunpan/fujian.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dashboard/index.vue
@@ -37,31 +37,31 @@
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('在职员工总数','1')">
          <p class="card-number">{{ this.total.zzyg }}</p>
          <p class="card-number">{{ total.zzyg }}</p>
          <p>在职员工总数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('新进员工人数','2')">
          <p class="card-number">{{ this.total.xjyg }}</p>
          <p class="card-number">{{ total.xjyg }}</p>
          <p>新进员工人数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('正式员工人数','3')">
          <p class="card-number">{{ this.total.zsyg }}</p>
          <p class="card-number">{{ total.zsyg }}</p>
          <p>正式员工人数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('临时员工人数','4')">
          <p class="card-number">{{ this.total.lsyg }}</p>
          <p class="card-number">{{ total.lsyg }}</p>
          <p>临时员工人数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('超龄员工人数','5')">
          <p class="card-number">{{ this.total.clyg }}</p>
          <p class="card-number">{{ total.clyg }}</p>
          <p>超龄员工人数</p>
        </el-card>
      </el-col>
@@ -69,31 +69,31 @@
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('离职员工总数','6')">
          <p class="card-number">{{ this.total.lzyg }}</p>
          <p class="card-number">{{ total.lzyg }}</p>
          <p>离职员工总数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('辞职申请人数','7')">
          <p class="card-number">{{ this.total.czyg }}</p>
          <p class="card-number">{{ total.czyg }}</p>
          <p>辞职申请人数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('正常离职人数','8')">
          <p class="card-number">{{ this.total.zclz }}</p>
          <p class="card-number">{{ total.zclz }}</p>
          <p>正常离职人数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('自动离职人数','9')">
          <p class="card-number">{{ this.total.zdlz }}</p>
          <p class="card-number">{{ total.zdlz }}</p>
          <p>自动离职人数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('公司辞退人数','10')">
          <p class="card-number">{{ this.total.gsct }}</p>
          <p class="card-number">{{ total.gsct }}</p>
          <p>公司辞退人数</p>
        </el-card>
      </el-col>
@@ -101,31 +101,31 @@
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showht('有效合同','11')">
          <p class="card-number">{{ this.total.yxht }}</p>
          <p class="card-number">{{ total.yxht }}</p>
          <p>有效合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showht('到期合同','12')">
          <p class="card-number">{{ this.total.dqht }}</p>
          <p class="card-number">{{ total.dqht }}</p>
          <p>到期合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showht('新签合同','13')">
          <p class="card-number">{{ this.total.xinqht }}</p>
          <p class="card-number">{{ total.xinqht }}</p>
          <p>新签合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showht('续签合同','14')">
          <p class="card-number">{{ this.total.xqht }}</p>
          <p class="card-number">{{ total.xqht }}</p>
          <p>续签合同</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showht('解除合同','15')">
          <p class="card-number">{{ this.total.jcht }}</p>
          <p class="card-number">{{ total.jcht }}</p>
          <p>解除合同</p>
        </el-card>
      </el-col>
@@ -133,31 +133,31 @@
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showcq('出勤人数','1')">
          <p class="card-number">{{ this.total.cqrs }}</p>
          <p class="card-number">{{ total.cqrs }}</p>
          <p>出勤人数</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showqj('员工请假','1')">
          <p class="card-number">{{ this.total.ygqj }}</p>
          <p class="card-number">{{ total.ygqj }}</p>
          <p>员工请假</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showtj('员工体验','1')">
          <p class="card-number">{{ this.total.ygtj }}</p>
          <p class="card-number">{{ total.ygtj }}</p>
          <p>员工体验</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showcq('员工加班','2')">
          <p class="card-number">{{ this.total.ygjb }}</p>
          <p class="card-number">{{ total.ygjb }}</p>
          <p>员工加班</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showcq('员工旷工','3')">
          <p class="card-number">{{ this.total.ygkg }}</p>
          <p class="card-number">{{ total.ygkg }}</p>
          <p>员工旷工</p>
        </el-card>
      </el-col>
@@ -165,31 +165,31 @@
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showlz('劳资案件','1')">
          <p class="card-number">{{ this.total.lzaj }}</p>
          <p class="card-number">{{ total.lzaj }}</p>
          <p>劳资案件</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showgs('工伤案件','1')">
          <p class="card-number">{{ this.total.gsaj }}</p>
          <p class="card-number">{{ total.gsaj }}</p>
          <p>工伤案件</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showyw('意外险案件','1')">
          <p class="card-number">{{ this.total.ywxaj }}</p>
          <p class="card-number">{{ total.ywxaj }}</p>
          <p>意外险案件</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showsb('社保申请','3')">
          <p class="card-number">{{ this.total.sbsq }}</p>
          <p class="card-number">{{ total.sbsq }}</p>
          <p>社保申请</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showsyj('失业金案件','3')">
          <p class="card-number">{{ this.total.syj }}</p>
          <p class="card-number">{{ total.syj }}</p>
          <p>失业金案件</p>
        </el-card>
      </el-col>
@@ -197,19 +197,19 @@
    <el-row :gutter="20">
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showXzyg('身份证到期','11')">
          <p class="card-number">{{ this.total.sfz }}</p>
          <p class="card-number">{{ total.sfz }}</p>
          <p>身份证到期</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showtg('员工调岗','3')">
          <p class="card-number">{{ this.total.ygtg }}</p>
          <p class="card-number">{{ total.ygtg }}</p>
          <p>员工调岗</p>
        </el-card>
      </el-col>
      <el-col :span="4">
        <el-card shadow="always" class="card-info" @click.native="showbl('不良记录','3')">
          <p class="card-number">{{ this.total.bljl }}</p>
          <p class="card-number">{{ total.bljl }}</p>
          <p>不良记录</p>
        </el-card>
      </el-col>
@@ -525,7 +525,6 @@
      this.total.xinqht = data.xinqht
      this.total.xqht = data.xqht
      this.total.dqht = data.dqht
      debugger
      if (this.selectIndex === 0 || this.selectIndex === 1) {
        this.total.cqrs = '--'
      } else {
@@ -591,7 +590,6 @@
}
.card-info:hover {
    text-align: center;
  height: 12px;
    background-color: #931e1e;
    color: #fff;
    .card-number {
src/views/user/Informationinput.vue
@@ -435,8 +435,20 @@
        </el-col>
      </el-main>
    </el-container>
    <el-dialog title="基本信息" :visible.sync="dialogshowArr[0].show" width="50%">
      <el-form ref="empBaseInfoForm" :model="empBaseInfoForm" :rules="rules" label-position="right" label-width="120px">
    <el-dialog title="基本信息" :visible.sync="dialogshowArr[0].show" width="50%" class="baseinfo">
      <el-container>
        <el-aside width="200px">
          <el-upload
            class="avatar-uploader"
            action="#"
            accept=".jpg, .jpeg, .png"
            :show-file-list="false"
            auto-upload="false"
            :on-success="handleAvatarSuccess"
          >
            <img v-if="empBaseInfoForm.mageUrl" :src="empBaseInfoForm.imageUrl" class="avatar">
            <i v-else class="el-icon-plus avatar-uploader-icon" /></el-upload></el-aside>
        <el-main>      <el-form ref="empBaseInfoForm" :model="empBaseInfoForm" :rules="rules" label-position="right" label-width="120px">
        <el-row>
          <el-col :span="12">
            <el-form-item label="档案号" prop="archivesNumb">
@@ -704,7 +716,9 @@
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
        </el-form></el-main>
      </el-container>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putEmpBase('empBaseInfoForm')">保 存</el-button>
        <el-button type="primary" @click="putEmpBaseContinue('empBaseInfoForm')">保存并继续新增</el-button>
@@ -2512,6 +2526,7 @@
        version: ''
      },
      empBaseInfoForm: {
        imageUrl: '',
        empId: '',
        customerId: '',
        archivesNumb: '',
@@ -4961,11 +4976,23 @@
    },
    calculateSeniority(val) {
      this.empBaseInfoForm.seniority = calculateSeniority(val)
    },
    handleAvatarSuccess(res, file) {
      this.empBaseInfoForm.imageUrl = URL.createObjectURL(file.raw)
    }
  }
}
</script>
<style lang="scss" scoped>
.baseinfo .el-container{
    .el-aside {
    background-color: #fff;
  }
  .el-main {
    background-color: #fff;
  }
}
.el-container {
  height: 770px;
src/views/yunpan/fujian.vue
@@ -432,6 +432,13 @@
    dellabel(formName) {
      this.$refs[formName].validate(valid => {
        if (valid) {
          this.$get('hr/empAccessory/' + this.labelform.labelid).then((r) => {
            if (r.data.data > 0) {
              this.$message({
                message: this.$t('标签内还有' + r.data.data + '个附件,若要删除请先转存附件!'),
                type: 'warning'
              })
            } else {
          this.$delete('hr/label', { ...this.labelform }).then(() => {
            this.dialogFormVisible = false
            this.$message({
@@ -445,6 +452,8 @@
          })
        }
      })
        }
      })
    },
    addlabel(formName) {
      this.$refs[formName].validate(valid => {