Merge remote-tracking branch 'origin/master'

楚江漓i

2021-03-12 9d81bcda287b576069266642d69cd126532e36b5

 src/views/user/archivesEdit.vue

@@ -578,7 +578,7 @@
                <el-table-column show-overflow-tooltip="true" prop="jobContent" label="主要工作内容" />
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editWorkExperience(scope.row)">编辑</span>
                    <span class="table-button" @click="editWorkExperience(scope.row,1)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'workExperienceDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -618,19 +618,19 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editPhysicalExam(scope.row)">编辑</span>
                    <span class="table-button" @click="editPhysicalExam(scope.row,2)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'physicalExamDataselection')">删除</span>
                  </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
@@ -668,7 +668,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editContractInfo(scope.row)">编辑</span>
                    <span class="table-button" @click="editContractInfo(scope.row,3)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'contractInfoDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -714,6 +714,7 @@
                <el-table-column show-overflow-tooltip="true" prop="oldJobName" label="原岗位" />
                <el-table-column show-overflow-tooltip="true" prop="changeDate" label="调岗日期" />
                <el-table-column show-overflow-tooltip="true" prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="changeReason" label="调岗理由" />
              </el-table>
              <pagination
                v-show="jobChangeDatatotal>0"
@@ -750,7 +751,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editLeaveInfo(scope.row)">编辑</span>
                    <span class="table-button" @click="editLeaveInfo(scope.row,5)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onleaveInfoDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -798,14 +799,14 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editResign(scope.row)">编辑</span>
                    <span class="table-button" @click="editResign(scope.row,5)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onresignDataselection')">删除</span>
                  </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
@@ -843,18 +844,18 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editDimissionAttend(scope.row)">编辑</span>
                    <span class="table-button" @click="editDimissionAttend(scope.row,6)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'dimissionAttendDataselection')">删除</span>
                  </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
@@ -927,7 +928,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editUnemployment(scope.row)">编辑</span>
                    <span class="table-button" @click="editUnemployment(scope.row,7)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'unemploymentDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -973,7 +974,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editInsurance(scope.row)">编辑</span>
                    <span class="table-button" @click="editInsurance(scope.row,8)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'oninsuranceDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -1021,7 +1022,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editAccidentCases(scope.row)">编辑</span>
                    <span class="table-button" @click="editAccidentCases(scope.row,9)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'accidentCasesDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -1040,6 +1041,7 @@
                <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="innsureFee" label="保险赔付费用" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
              </el-table>
              <pagination
                v-show="accidentCasesDatatotal>0"
@@ -1076,7 +1078,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editOccupational(scope.row)">编辑</span>
                    <span class="table-button" @click="editOccupational(scope.row,10)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'occupationalDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -1095,6 +1097,7 @@
                <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="80" />
                <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="compensated" label="已赔付医药费用" width="120" />
                <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
              </el-table>
              <pagination
                v-show="occupationalDatatotal>0"
@@ -1131,7 +1134,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editLaborTrouble(scope.row)">编辑</span>
                    <span class="table-button" @click="editLaborTrouble(scope.row,11)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'laborTroubleDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -1142,7 +1145,7 @@
                <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="100" />
                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
                <el-table-column show-overflow-tooltip="true" prop="arbitrationPay" label="仲裁赔付（元）" width="180" />
                <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
                <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="是否结案" width="100" :formatter="arbitrationStatusFormat" />
                <el-table-column show-overflow-tooltip="true" prop="settleDate" label="案结日期" width="100" />
              </el-table>
              <pagination
@@ -1180,7 +1183,7 @@
                </el-table-column>
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editBadRecord(scope.row)">编辑</span>
                    <span class="table-button" @click="editBadRecord(scope.row,12)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onbadRecordDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -1232,7 +1235,7 @@
                    <!--                    @click="singleDelete(scope.row, 'onremarkInfoDataselection')"-->
                    <!--                  >删除-->
                    <!--                  </el-button>-->
                    <span class="table-button" @click="editRemarkInfo(scope.row)">编辑</span>
                    <span class="table-button" @click="editRemarkInfo(scope.row,13)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onremarkInfoDataselection')">删除</span>
                  </template>
                </el-table-column>
@@ -1457,8 +1460,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="workExperienceForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="workExperienceForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="workExperienceForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="workExperienceForm.jobName" />
@@ -1504,7 +1507,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putWorkExperience('workExperienceForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="体检信息" append-to-body :visible.sync="dialogshowArr[2].show" width="50%">
@@ -1559,8 +1562,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="physicalExamForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="physicalExamForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="physicalExamForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="physicalExamForm.jobName" />
@@ -1608,7 +1611,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putPhysicalExam('physicalExamForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="合同信息" append-to-body :visible.sync="dialogshowArr[3].show" width="50%">
@@ -1668,8 +1671,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="contractInfoForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="contractInfoForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="contractInfoForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="contractInfoForm.jobName" />
@@ -1697,7 +1700,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putContractInfo('contractInfoForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="离职当月考勤" append-to-body :visible.sync="dialogshowArr[4].show" width="50%">
@@ -1750,8 +1753,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="dimissionAttendForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="dimissionAttendForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="dimissionAttendForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="dimissionAttendForm.jobName" />
@@ -1779,7 +1782,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putDimissionAttend('dimissionAttendForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="请假记录" append-to-body :visible.sync="dialogshowArr[5].show" width="50%">
@@ -1839,8 +1842,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="leaveInfoForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="leaveInfoForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="leaveInfoForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="leaveInfoForm.jobName" />
@@ -1880,7 +1883,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putLeaveInfo('leaveInfoForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="辞职申请" append-to-body :visible.sync="dialogshowArr[6].show" width="50%">
@@ -1918,8 +1921,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="resignForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="resignForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="resignForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="resignForm.jobName" />
@@ -1946,7 +1949,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putResign('resignForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="失业金领取" append-to-body :visible.sync="dialogshowArr[7].show" width="50%">
@@ -1993,8 +1996,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="unemploymentForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="unemploymentForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="unemploymentForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="unemploymentForm.jobName" />
@@ -2018,7 +2021,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putUnemployment('unemploymentForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="社保申请" append-to-body :visible.sync="dialogshowArr[8].show" width="50%">
@@ -2082,8 +2085,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="insuranceForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="insuranceForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="insuranceForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="insuranceForm.jobName" />
@@ -2116,7 +2119,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putInsurance('insuranceForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="意外险案件" append-to-body :visible.sync="dialogshowArr[9].show" width="50%">
@@ -2163,8 +2166,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="accidentCasesForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="accidentCasesForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="accidentCasesForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="accidentCasesForm.jobName" />
@@ -2268,7 +2271,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="工伤案件" append-to-body :visible.sync="dialogshowArr[10].show" width="50%">
@@ -2315,8 +2318,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="occupationalForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="occupationalForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="occupationalForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="occupationalForm.jobName" />
@@ -2465,7 +2468,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="劳资案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
@@ -2507,7 +2510,7 @@
              <el-form-item label="汇报人" prop="reporter">
                <el-input v-model="laborTroubleForm.reporter" />
              </el-form-item>
              <el-form-item label="状态" prop="arbitrationStatus">
              <el-form-item label="是否结案" prop="arbitrationStatus">
                <el-select v-model="laborTroubleForm.arbitrationStatus" placeholder="">
                  <el-option
                    v-for="dict in settleStatusOptions"
@@ -2522,8 +2525,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="laborTroubleForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="laborTroubleForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="laborTroubleForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="laborTroubleForm.jobName" />
@@ -2572,7 +2575,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putLaborTrouble('laborTroubleForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="不良记录" append-to-body :visible.sync="dialogshowArr[12].show" width="50%">
@@ -2616,8 +2619,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="badRecordForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="badRecordForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="badRecordForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="badRecordForm.jobName" />
@@ -2644,7 +2647,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putBadRecord('badRecordForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
      <el-dialog title="备注信息" append-to-body :visible.sync="dialogshowArr[13].show" width="50%">
@@ -2688,8 +2691,8 @@
              <el-form-item label="员工编号" prop="empNumb">
                <el-input v-model="remarkInfoForm.empNumb" />
              </el-form-item>
              <el-form-item label="部门(护卫点)" prop="deptName">
                <el-input v-model="remarkInfoForm.deptName" />
              <el-form-item label="部门(护卫点)" prop="allDeptName">
                <el-input v-model="remarkInfoForm.allDeptName" />
              </el-form-item>
              <el-form-item label="岗位" prop="jobName">
                <el-input v-model="remarkInfoForm.jobName" />
@@ -2706,7 +2709,7 @@
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putRemarkInfo('remarkInfoForm')">保 存</el-button>
          <el-button @click="dialogIsShow()">取 消</el-button>

        </div>
      </el-dialog>
    </el-dialog>
@@ -3741,6 +3744,9 @@
    arbitrationStatusFormat(row, column) {
      return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
    },
    settleStatusFormat(row, column) {
      return this.selectDictLabel(this.settleStatusOptions, row.settleStatus)
    },
    beforeAvatarUpload(file) {
      this.fileDate.labelid = this.activities[this.beforeIndex].id
      const isLt50M = file.size / 1024 / 1024 < 50
@@ -4186,6 +4192,10 @@
      this.readon = true
    },
    gzupdate1() {
      const empBaseInfoForm = this.empBaseInfoForm
      if (empBaseInfoForm.imagePath.indexOf('data:image/jpeg') === -1) {
        this.empBaseInfoForm.imagePath = ''
      }
      this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
        this.$message({
          message: this.$t('tips.updateSuccess'),
@@ -4980,6 +4990,7 @@
      this.remarkInfoForm.version = ''
    },
    dialogIsShow() {
      debugger
      this.workExperienceModal = false
      this.isAdd = true
      this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
@@ -5057,6 +5068,7 @@
      this.workExperienceForm.modifier = row.modifier
      this.workExperienceForm.delFlag = row.delFlag
      this.workExperienceForm.version = row.version
      this.thisShowIndex = 1
      this.dialogshowArr[1].show = true
    },
    editPhysicalExam(row) {
@@ -5086,7 +5098,7 @@
      this.physicalExamForm.modifier = row.modifier
      this.physicalExamForm.delFlag = row.delFlag
      this.physicalExamForm.version = row.version

      this.thisShowIndex = 2
      this.dialogshowArr[2].show = true
    },
    editContractInfo(row) {
@@ -5115,7 +5127,7 @@
      this.contractInfoForm.modifier = row.modifier
      this.contractInfoForm.delFlag = row.delFlag
      this.contractInfoForm.version = row.version

      this.thisShowIndex = 3
      this.dialogshowArr[3].show = true
    },
    editDimissionAttend(row) {
@@ -5143,6 +5155,7 @@
      this.dimissionAttendForm.delFlag = row.delFlag
      this.dimissionAttendForm.version = row.version
      this.dimissionAttendForm.remark = row.remark
      this.thisShowIndex = 4
      this.dialogshowArr[4].show = true
    },
    editLeaveInfo(row) {
@@ -5171,7 +5184,7 @@
      this.leaveInfoForm.delFlag = row.delFlag
      this.leaveInfoForm.version = row.version
      this.leaveInfoForm.remark = row.remark

      this.thisShowIndex = 5
      this.dialogshowArr[5].show = true
    },
    editResign(row) {
@@ -5197,7 +5210,7 @@
      this.resignForm.delFlag = row.delFlag
      this.resignForm.version = row.version
      this.resignForm.remark = row.remark

      this.thisShowIndex = 6
      this.dialogshowArr[6].show = true
    },
    editUnemployment(row) {
@@ -5224,7 +5237,7 @@
      this.unemploymentForm.modifier = row.modifier
      this.unemploymentForm.delFlag = row.delFlag
      this.unemploymentForm.version = row.version

      this.thisShowIndex = 7
      this.dialogshowArr[7].show = true
    },
    editInsurance(row) {
@@ -5252,7 +5265,7 @@
      this.insuranceForm.delFlag = row.delFlag
      this.insuranceForm.version = row.version
      this.insuranceForm.remark = row.remark

      this.thisShowIndex = 8
      this.dialogshowArr[8].show = true
    },
    editAccidentCases(row) {
@@ -5293,7 +5306,7 @@
      this.accidentCasesForm.modifier = row.modifier
      this.accidentCasesForm.delFlag = row.delFlag
      this.accidentCasesForm.version = row.version

      this.thisShowIndex = 9
      this.dialogshowArr[9].show = true
    },
    editOccupational(row) {
@@ -5343,7 +5356,7 @@
      this.occupationalForm.delFlag = row.delFlag
      this.occupationalForm.version = row.version
      this.occupationalForm.remark = row.remark

      this.thisShowIndex = 10
      this.dialogshowArr[10].show = true
    },
    editLaborTrouble(row) {
@@ -5373,7 +5386,7 @@
      this.laborTroubleForm.delFlag = row.delFlag
      this.laborTroubleForm.version = row.version
      this.laborTroubleForm.remark = row.remark

      this.thisShowIndex = 11
      this.dialogshowArr[11].show = true
    },
    editBadRecord(row) {
@@ -5398,6 +5411,7 @@
      this.badRecordForm.delFlag = row.delFlag
      this.badRecordForm.version = row.version
      this.badRecordForm.remark = row.remark
      this.thisShowIndex = 12
      this.dialogshowArr[12].show = true
    },
    editRemarkInfo(row) {
@@ -5420,7 +5434,7 @@
      this.remarkInfoForm.modifier = row.modifier
      this.remarkInfoForm.delFlag = row.delFlag
      this.remarkInfoForm.version = row.version

      this.thisShowIndex = 13
      this.dialogshowArr[13].show = true
    },
    gzadd(index) {
@@ -5923,9 +5937,10 @@
  }

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

@@ -5959,6 +5974,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 {
@@ -6081,8 +6103,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 {