Merge remote-tracking branch 'origin/master'

luoyb

2021-03-17 fa855a79a71e83de4eab26779fb29e6c6f0c52a2

 src/views/user/archivesEdit.vue

@@ -27,7 +27,7 @@
            </el-upload>
            <!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
            <div class="title-da">
              编号：{{ empBaseInfoForm.empNumb }}
              档案号：{{ empBaseInfoForm.archivesNumb }}
            </div>
          </div>
          <ul class="jbxx-ul" style="height: 68vh;overflow: auto">
@@ -221,8 +221,8 @@
              <el-form ref="empBaseInfoForm" :model="empBaseInfoForm" class="formjbxx" label-width="150px">
                <el-row style="width: 100%;">
                  <el-col :span="8">
                    <el-form-item label="档案号" prop="archivesNumb">
                      <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
                    <el-form-item label="编号" prop="empNumb">
                      <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
@@ -532,7 +532,7 @@
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="相关证件" prop="certificateList">
                      <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件" :disabled="readon ? false : true">
                        <el-option
                          v-for="dict in certificateListOptions"
                          :key="dict.dicItemCode"
@@ -1273,13 +1273,6 @@
            </div>
            <div class="jbxxCon">
              <div class="zs-main">
                <!--                <el-row class="search-title">-->
                <!--                  <el-col :span="18" class="title">-->
                <!--                    &lt;!&ndash;                  <div class="zs-title">上传附件</div>&ndash;&gt;-->
                <!--                    <p />-->
                <!--                  </el-col>-->

                <!--                </el-row>-->
                <el-container style="background-color: #fff;">
                  <el-aside width="210px" style="background-color: #fff;text-align: center;padding-top: 0">
                    <h4 style="margin-top: 0">{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
@@ -1330,6 +1323,7 @@
                          >下载
                          </el-button>
                          <el-button
                            class="pri-del-btn"
                            type="primary"
                            icon="el-icon-search"
                            size="mini"
@@ -1337,7 +1331,7 @@
                          >删除
                          </el-button>
                          <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
                            <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
                            <el-button slot="reference" type="danger">转存</el-button>
                          </el-popconfirm>
                        </el-col>
                      </el-row>
@@ -1377,21 +1371,34 @@
                    <el-main style="background-color: #fff;margin-top: 5%;">
                      <el-row v-for="(data, index) in filesUploadData" :key="index">
                        <template v-for="(node, nodeIndex) in data.node">
                          <el-col v-if="node.isUpload === false" :key="node.filesid" :span="3">
                          <el-col v-if="node.isUpload === false" :key="node.accessoryid" :span="3">
                            <el-card
                              shadow="never"
                              @click.native="clickCard(index * 8 + nodeIndex)"
                            >
                              <img
                              <el-image
                                v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1"
                                :src="showFileImg(node.filesformat)"
                                class="uploading-image"
                              >
                              <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
                                :preview-src-list="srcList"
                                @click="clickImg(node)"
                              />
                              <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
                                <div style="padding-top: 14px;text-align: center">
                                  <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
                                </div>
                              </el-tooltip>
                              <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) != -1" 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-image
                                    style="width: 100px; height: 80px;margin-top: -10px;"
                                    :src="getImg+node.accessoryid"
                                    :preview-src-list="srcList"
                                    @click="clickImg(node)"
                                  />
                                  <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">

                                    {{ node.filesname }}
                                  </el-checkbox>
                                </div>
                              </el-tooltip>
@@ -2774,6 +2781,33 @@
      },
      readon: false,
      workExperienceModal: true,
      restaurJob: [{ value: '总经理', code: '2942725270000031' },
        { value: '总秘', code: '2942725270000032' },
        { value: '总助', code: '2942725270000033' },
        { value: '经理', code: '2942725270000022' },
        { value: '副经理', code: '2942725270000015' },
        { value: '助理', code: '2942725270000030' },
        { value: '项目经理', code: '2942725270000027' },
        { value: '大队长', code: '2942725270000006' },
        { value: '大队长兼内勤', code: '2942725270000007' },
        { value: '中队长', code: '2942725270000029' },
        { value: '队长', code: '2942725270000011' },
        { value: '分队长', code: '2942725270000013' },
        { value: '副队长', code: '2942725270000014' },
        { value: '班长', code: '2942725270000002' },
        { value: '保安员', code: '2942725270000003' },
        { value: '内勤', code: '2942725270000024' },
        { value: '保洁', code: '2942725270000004' },
        { value: '电工', code: '2942725270000010' },
        { value: '绿化工', code: '2942725270000023' },
        { value: '出纳', code: '2942725270000005' },
        { value: '人事专员', code: '2942725270000025' },
        { value: '司机', code: '2942725270000026' },
        { value: '购买保险', code: '2942725270000016' },
        { value: '广州燃气中队长', code: '2942725270000018' },
        { value: '管理员', code: '2942725270000017' },
        { value: '监控员', code: '2942725270000021' },
        { value: '员工', code: '2942725270000028' }],
      dialogshowArr: [
        {
          show: false
@@ -3090,33 +3124,6 @@
        { value: '台湾省', code: '710000' },
        { value: '香港特别行政区', code: '810000' },
        { value: '澳门特别行政区', code: '820000' }],
      restaurJob: [{ value: '总经理', code: '2942725270000031' },
        { value: '总秘', code: '2942725270000032' },
        { value: '总助', code: '2942725270000033' },
        { value: '经理', code: '2942725270000022' },
        { value: '副经理', code: '2942725270000015' },
        { value: '助理', code: '2942725270000030' },
        { value: '项目经理', code: '2942725270000027' },
        { value: '大队长', code: '2942725270000006' },
        { value: '大队长兼内勤', code: '2942725270000007' },
        { value: '中队长', code: '2942725270000029' },
        { value: '队长', code: '2942725270000011' },
        { value: '分队长', code: '2942725270000013' },
        { value: '副队长', code: '2942725270000014' },
        { value: '班长', code: '2942725270000002' },
        { value: '保安员', code: '2942725270000003' },
        { value: '内勤', code: '2942725270000024' },
        { value: '保洁', code: '2942725270000004' },
        { value: '电工', code: '2942725270000010' },
        { value: '绿化工', code: '2942725270000023' },
        { value: '出纳', code: '2942725270000005' },
        { value: '人事专员', code: '2942725270000025' },
        { value: '司机', code: '2942725270000026' },
        { value: '购买保险', code: '2942725270000016' },
        { value: '广州燃气中队长', code: '2942725270000018' },
        { value: '管理员', code: '2942725270000017' },
        { value: '监控员', code: '2942725270000021' },
        { value: '员工', code: '2942725270000028' }],
      types: '',
      physicalExamData: [],
      physicalExamDataselection: [],
@@ -3617,7 +3624,9 @@
      arbitrationTypeOptions: [],
      changeTypeOptions: [],
      dimissionTypeOptions: [],
      sexOptions: []
      sexOptions: [],
      srcList: [],
      getImg: pages.getAccessoryImage
    }
  },
  computed: {
@@ -3708,6 +3717,12 @@
    })
  },
  methods: {
    clickImg(node) {
      this.srcList = []
      if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
        this.srcList.push(this.getImg + node.accessoryid)
      }
    },
    typeFormat(row, column) {
      return this.selectDictLabel(this.physicalExamTypeOptions, row.physicalExamType)
    },
@@ -3792,6 +3807,10 @@
    },
    showFileImg(type) {
      switch (type) {
        case 'xls':
          return require('../../assets/uploading/xls.png')
        case 'xlsx':
          return require('../../assets/uploading/xls.png')
        case 'txt':
          return require('../../assets/uploading/txt.png')
        case 'apk':
@@ -4102,6 +4121,11 @@
      })
    },
    setArchives(val) {
      let certificateList = []
      if (val.certificateList && typeof val.certificateList === 'string') {
        certificateList = val.certificateList.split(',')
        val.certificateList = certificateList
      }
      this.empBaseInfoForm = { ...val }
      this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
      this.fileDate.empId = this.empBaseInfoForm.empId
@@ -4165,6 +4189,8 @@
    initdimissionLogData(params = {}) {
      params.pageSize = this.pagination.size
      params.pageNum = this.pagination.num
      params.empStatus = this.empBaseInfoForm.empStatus
      params.empId = this.empBaseInfoForm.empId
      params.dimissionType = ''
      params.delFlag = '0'
      this.$get('hr/empDimissionlog/list', {
@@ -5562,6 +5588,11 @@
      // 调用 callback 返回建议列表的数据
      cb(results)
    },
    createFilter(queryString) {
      return (restaurant) => {
        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
      }
    },
    jobNameSelect(items) {
      this.empBaseInfoForm.jobName = items.value
      this.empBaseInfoForm.JobId = items.code
@@ -6143,5 +6174,9 @@
    color: #333 !important;
  }
}
.pri-del-btn {
  background-color: rgb(64, 158, 255) !important;
  border-color: rgb(64, 158, 255) !important;
}
</style>