Merge remote-tracking branch 'origin/master'

luoyb

2021-03-06 9bda7c9508b724a6ae0c1c2ffcfa7467925b8d5b

 src/views/user/Informationinput.vue

@@ -50,7 +50,7 @@
      <el-main>
        <el-row>
          <el-col :span="24">
            <el-button class="commonBtn" @click.native="dialogIsShow()">新增</el-button>
            <el-button class="commonBtn" @click.native="dialogIsShow('0')">新增</el-button>
            <el-button class="commonBtn" style="background-color: #409EFF" @click.native="butDelete()">删除</el-button>
            <el-button class="commonBtn" style="float: right" @click.native="showDryg(0)">导入员工信息</el-button>
          </el-col>
@@ -79,7 +79,12 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
          <el-table-column label="照片" width="80">
            <template slot-scope="scope" width="90">
              <img :src="scope.row.imagePath">
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
@@ -89,7 +94,7 @@
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <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="80" :formatter="educationFormat" />
          <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
          <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
          <el-table-column prop="insuranceType" show-overflow-tooltip label="保险类型" width="80" :formatter="insuranceTypeFormat" />
          <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
@@ -120,7 +125,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column prop="empNumb" label="员工编号" width="100" />
          <el-table-column prop="empNumb" label="编号" width="100" />
          <el-table-column prop="empName" label="员工姓名" width="100" />
          <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
          <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
@@ -152,7 +157,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
          <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="empName" label="员工姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -191,7 +196,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
          <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 prop="empName" label="员工姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -221,7 +226,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
          <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="empName" label="员工姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -253,7 +258,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
          <el-table-column show-overflow-tooltip prop="deptName" 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" />
@@ -286,7 +291,7 @@
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名" width="100" />
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
          <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="applayDate" label="辞职申请日期" width="150" />
@@ -312,7 +317,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
          <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="jobName" label="岗位名称" width="100" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
@@ -341,7 +346,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
          <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="jobName" label="岗位名称" width="100" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
@@ -372,7 +377,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
          <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="jobName" label="岗位名称" width="60" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
@@ -410,7 +415,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
          <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="jobName" label="岗位" width="60" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
@@ -448,7 +453,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
          <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="jobName" label="岗位" width="70" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
@@ -486,7 +491,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="120" />
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" />
          <el-table-column show-overflow-tooltip prop="deptName" 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" />
@@ -514,7 +519,7 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
          <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="jobName" label="岗位" width="120" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
@@ -549,9 +554,11 @@
              <el-upload
                ref="upload"
                class="upload-demo"
                action="http://127.0.0.1:8301/hr/empBaseInfo/importEmp"
                action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
                accept=".xls, .xlsx, .excel"
                :headers="headers()"
                :on-success="importHandleAvatarSuccess"
                :on-error="importHandleAvatarError"
                :file-list="fileList"
                :auto-upload="false"
              >
@@ -588,7 +595,7 @@
                <el-form-item label="档案号" prop="archivesNumb">
                  <el-input v-model="empBaseInfoForm.archivesNumb" />
                </el-form-item>
                <el-form-item label="员工编号" prop="empNumb">
                <el-form-item label="编号" prop="empNumb">
                  <el-input v-model="empBaseInfoForm.empNumb" />
                </el-form-item>
                <el-form-item label="身份证号码" prop="certificateNumb">
@@ -640,8 +647,8 @@
                    />
                  </el-select>
                </el-form-item>
                <el-form-item label="最高学历" prop="education">
                  <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历">
                <el-form-item label="学历" prop="education">
                  <el-select v-model="empBaseInfoForm.education" placeholder="请选择学历">
                    <el-option
                      v-for="dict in educationOptions"
                      :key="dict.dicItemCode"
@@ -820,7 +827,7 @@

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putEmpBase('empBaseInfoForm')">保 存</el-button>
        <el-button type="primary" @click="putEmpBaseContinue('empBaseInfoForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putEmpBaseContinue('empBaseInfoForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -841,7 +848,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="workExperienceForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -892,6 +899,7 @@
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putWorkExperience('workExperienceForm')">保 存</el-button>
        <el-button
          v-if="isAdd"
          type="primary"
          @click="putWorkExperienceContinue('workExperienceForm')"
        >保存并继续新增
@@ -935,7 +943,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="physicalExamForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -988,6 +996,7 @@
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putPhysicalExam('physicalExamForm')">保 存</el-button>
        <el-button
          v-if="isAdd"
          type="primary"
          @click="putPhysicalExamContinue('physicalExamForm')"
        >保存并继续新增
@@ -1036,7 +1045,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="contractInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1069,6 +1078,7 @@
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putContractInfo('contractInfoForm')">保 存</el-button>
        <el-button
          v-if="isAdd"
          type="primary"
          @click="putContractInfoContinue('contractInfoForm')"
        >保存并继续新增
@@ -1110,7 +1120,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="dimissionAttendForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1142,7 +1152,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putDimissionAttend('dimissionAttendForm')">保 存</el-button>
        <el-button type="primary" @click="putDimissionAttendContinue('dimissionAttendForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putDimissionAttendContinue('dimissionAttendForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1187,7 +1197,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="leaveInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1231,7 +1241,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putLeaveInfo('leaveInfoForm')">保 存</el-button>
        <el-button type="primary" @click="putLeaveInfoContinue('leaveInfoForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putLeaveInfoContinue('leaveInfoForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1260,7 +1270,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="resignForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1291,7 +1301,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putResign('resignForm')">保 存</el-button>
        <el-button type="primary" @click="putResignContinue('resignForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putResignContinue('resignForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1323,7 +1333,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="unemploymentForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1351,7 +1361,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putUnemployment('unemploymentForm')">保 存</el-button>
        <el-button type="primary" @click="putUnemploymentContinue('unemploymentForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putUnemploymentContinue('unemploymentForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1400,7 +1410,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="insuranceForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1437,7 +1447,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putInsurance('insuranceForm')">保 存</el-button>
        <el-button type="primary" @click="putInsuranceContinue('insuranceForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putInsuranceContinue('insuranceForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1469,7 +1479,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="accidentCasesForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1577,7 +1587,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
        <el-button type="primary" @click="putAccidentCasesContinue('accidentCasesForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putAccidentCasesContinue('accidentCasesForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1609,7 +1619,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="occupationalForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1762,7 +1772,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
        <el-button type="primary" @click="putOccupationalContinue('occupationalForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putOccupationalContinue('occupationalForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1804,7 +1814,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="laborTroubleForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1853,7 +1863,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putLaborTrouble('laborTroubleForm')">保 存</el-button>
        <el-button type="primary" @click="putLaborTroubleContinue('laborTroubleForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putLaborTroubleContinue('laborTroubleForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1882,7 +1892,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="badRecordForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1913,7 +1923,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putBadRecord('badRecordForm')">保 存</el-button>
        <el-button type="primary" @click="putBadRecordContinue('badRecordForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putBadRecordContinue('badRecordForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1948,7 +1958,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="remarkInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
@@ -1969,7 +1979,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putRemarkInfo('remarkInfoForm')">保 存</el-button>
        <el-button type="primary" @click="putRemarkInfoContinue('remarkInfoForm')">保存并继续新增</el-button>
        <el-button v-if="isAdd" type="primary" @click="putRemarkInfoContinue('remarkInfoForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
@@ -1999,7 +2009,7 @@
      queryParams: {}, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
        size: 10,
        size: 15,
        num: 1
      },
      tableUrl: '',
@@ -2013,7 +2023,7 @@
        }],
        empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
          { min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
        empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
        empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
          { min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
        deptName: [
          { required: true, message: '请选择护卫点', trigger: 'input' }
@@ -2857,6 +2867,25 @@
    this.isShow(false, 0)
  },
  methods: {
    importHandleAvatarError() {
      this.$notify.error({
        title: '错误',
        message: '导入失败'
      })
    },
    importHandleAvatarSuccess(res, file) {
      if (res.data === null) {
        this.$notify({
          title: '成功',
          message: '导入成功!',
          type: 'success'
        })
      } else {
        this.$alert(JSON.stringify(res.data), '导入失败原因', {
          confirmButtonText: '确定'
        })
      }
    },
    headers() {
      const token = getToken()
      if (token) {
@@ -2944,8 +2973,12 @@
        this[this.tableDataName] = data.rows
      })
    },
    dialogIsShow() {
      this.isAdd = true
    dialogIsShow(val) {
      if (val === '0') {
        this.isAdd = true
      } else {
        this.isAdd = false
      }
      this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
        .show
    },