luoyb
2021-03-03 8435ea9da0a454abc0db7f8a5402720abd680f4e
fix(bug修复): 信息录入

https://www.teambition.com/task/6030acc203e3bd00451d120e
2个文件已修改
71 ■■■■ 已修改文件
src/views/user/inemployees.vue 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/inemployees.vue
@@ -171,7 +171,13 @@
            <el-button type="danger" class="hr-but-all" @click="showGbda(0)">关闭档案</el-button>
          </el-col>
        </el-row>
        <el-table ref="multipleTable" :data="tableData" :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}" stripe style="width: 100%;color: #000;">
        <el-table
          ref="multipleTable"
          :data="tableData"
          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
          stripe
          style="width: 100%;color: #000;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column label="操作" width="120">
            <template slot-scope="scope">
@@ -183,8 +189,14 @@
              <!--                档案</el-button>-->
              <!--              <el-button type="text" size="small" @click="editEmpBase(scope.row)">编辑</el-button>-->
              <span style="color: #a00515;display: inline-block;width: 50%;cursor: pointer" @click="editArchives(scope.row)">档案</span>
              <span style="color: #a00515;display: inline-block;width: 50%;cursor: pointer" @click="editEmpBase(scope.row)">编辑</span>
              <span
                style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
                @click="editArchives(scope.row)"
              >档案</span>
              <span
                style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
                @click="editEmpBase(scope.row)"
              >编辑</span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" />
@@ -228,7 +240,14 @@
            <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-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">
@@ -501,7 +520,8 @@
              </el-form-item>
            </el-col>
          </el-row>
        </el-form></el-main>
          </el-form>
        </el-main>
      </el-container>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putEmpBase('empBaseInfoForm')">保 存</el-button>
@@ -613,6 +633,14 @@
          <el-col v-if="selectDimissionType === 2" span="12">
            <el-form-item label="报告人" prop="reporter">
              <el-input v-model="gbdaForm.reporter" />
            </el-form-item>
          </el-col>
          <el-col span="24">
            <el-form-item label="离职操作" prop="afterOperation">
              <el-checkbox-group v-model="gbdaForm.afterOperation">
                <el-checkbox label="1">解除劳动合同</el-checkbox>
                <el-checkbox label="2">禁用登录账号</el-checkbox>
              </el-checkbox-group>
            </el-form-item>
          </el-col>
          <el-col span="24">
@@ -865,8 +893,7 @@
        size: 10,
        num: 1
      },
      baseicInformationForm: {
      },
      baseicInformationForm: {},
      empBaseInfoImageUrl: '',
      empBaseInfoForm: {
        imagePath: '',
@@ -924,7 +951,8 @@
        dgryIds: '',
        dimissionType: 1,
        dimissionDate: new Date(),
        remark: ''
        remark: '',
        afterOperation: []
      },
      depts: [],
      fileList: [],
@@ -944,12 +972,20 @@
        certificateNumb: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
        jobName: [{ required: true, message: '请选择岗位', trigger: 'change' }],
        nativePlaceName: [{ required: true, message: '请选择籍贯', trigger: 'change' }],
        bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }, { max: 36, message: '长度不超过36个字符', trigger: 'blur' }],
        bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }, {
          max: 36,
          message: '长度不超过36个字符',
          trigger: 'blur'
        }],
        insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
        entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
        seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
        archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
        bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }, { max: 32, message: '长度不超过32个字符', trigger: 'blur' }],
        bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }, {
          max: 32,
          message: '长度不超过32个字符',
          trigger: 'blur'
        }],
        empType: [{ required: true, message: '请选择员工类型', trigger: 'change' }],
        censusAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
        currentAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
@@ -1572,11 +1608,13 @@
            var ids = []
            var names = []
            var dates = []
            var numbers = []
            for (var i = 0; i < selection.length; i++) {
              var data = selection[i]
              ids.push(data.empId)
              names.push(data.empName)
              dates.push(data.entryDate)
              numbers.push(data.certificateNumb)
            }
            const nowDate = new Date()
            const year = nowDate.getFullYear()
@@ -1588,7 +1626,9 @@
              entryDates: dates.join(','),
              dimissionType: 1,
              dimissionDate: year + '-' + month + '-' + day,
              remark: ''
              remark: '',
              afterOperation: ['1'],
              certificateNumb: numbers.join(',')
            }
            this.dialogShowGbda = true
          }
@@ -1715,6 +1755,7 @@
      border-color: #a32c30;;
      background: #a32c30;;
  }
  .el-checkbox__label {
    color: #000 !important;
  }
@@ -1731,6 +1772,7 @@
    }
  }
.el-main {
  height: 600px;
}
@@ -1757,17 +1799,21 @@
    margin-top: 10px;
    border-collapse: collapse;
    width: 100%;
  tr {
    border-bottom: 1px dashed #d9dadb;
  }
  .td {
    width: 90px;
    text-align: right;
  }
  .td-group {
    padding-left: 20px;
  }
}
.searchTable td,
.searchTable th {
    color: #000;
@@ -1842,6 +1888,7 @@
  cursor: pointer;
  vertical-align: middle;
}
.sup-search-btn {
  display: inline-block;
  width: 5.2vw;
vue.config.js
@@ -36,7 +36,7 @@
      // change xxx-api/login => mock/login
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target: 'http://120.24.23.155:8301/',
        // target: 'http://120.24.23.155:7301/',
        target: 'http://127.0.0.1:8301/',
        changeOrigin: true,
        pathRewrite: {