Merge remote-tracking branch 'origin/master'

luoyb

2021-03-11 9170720fb6d59ddcd693ac9fb1b32241f7da3921

Merge remote-tracking branch 'origin/master'

 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,7 +618,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="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>
@@ -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>
@@ -750,7 +750,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,7 +798,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="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>
@@ -843,7 +843,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="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>
@@ -927,7 +927,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 +973,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 +1021,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 +1040,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 +1077,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 +1096,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 +1133,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 +1144,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 +1182,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 +1234,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>
@@ -1504,7 +1506,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%">
@@ -1608,7 +1610,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%">
@@ -1697,7 +1699,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%">
@@ -1779,7 +1781,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%">
@@ -1880,7 +1882,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%">
@@ -1946,7 +1948,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%">
@@ -2018,7 +2020,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%">
@@ -2116,7 +2118,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%">
@@ -2268,7 +2270,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%">
@@ -2465,7 +2467,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 +2509,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"
@@ -2572,7 +2574,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%">
@@ -2644,7 +2646,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%">
@@ -2706,7 +2708,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 +3743,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 +4191,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 +4989,7 @@
      this.remarkInfoForm.version = ''
    },
    dialogIsShow() {
      debugger
      this.workExperienceModal = false
      this.isAdd = true
      this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
@@ -5057,6 +5067,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 +5097,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 +5126,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 +5154,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 +5183,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 +5209,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 +5236,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 +5264,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 +5305,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 +5355,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 +5385,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 +5410,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 +5433,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) {