feat: 员工档案编辑时入职类型丢失问题解决

luoyb

2024-06-21 fcd8d7f55ab468e538a91ce168d5f3be144e140e

feat: 员工档案编辑时入职类型丢失问题解决

 src/settings_local.js

@@ -3,23 +3,23 @@
  // 获取令牌时，请求头信息(Basic Base64.encode(client_id:client_secret))
  authorizationValue: 'Basic ZmViczoxMjM0NTY=',
  // 社交登录后台地址
  socialLoginUrl: 'http://localhost:8301/auth/social/login',
  socialLoginUrl: 'http://120.24.23.155:8301/auth/social/login',
  // 请替换为您的实际地址
  pages: {
    // FEBS-Admin 控制台地址
    springBootAdminUrl: 'http://localhost:8401/login',
    springBootAdminUrl: 'http://120.24.23.155:8401/login',
    // kibana 控制台地址
    kibanaUrl: 'http://localhost:5601',
    kibanaUrl: 'http://120.24.23.155:5601',
    // nacos 控制台地址
    nacosUrl: 'http://localhost:8001/nacos',
    nacosUrl: 'http://120.24.23.155:8001/nacos',
    // skywalking地址
    skywalkingUrl: 'http://localhost:8080/',
    skywalkingUrl: 'http://120.24.23.155:8080/',
    // 文档中心
    docUrl: 'http://localhost:8301/doc.html',
    docUrl: 'http://120.24.23.155:8301/doc.html',
    // Granfana控制台
    grafanaUrl: 'http://localhost:8404/',
    grafanaUrl: 'http://120.24.23.155:8404/',
    // tx-manager控制台
    txUrl: 'http://localhost:8501/admin/index.html#/login',
    txUrl: 'http://120.24.23.155:8501/admin/index.html#/login',
    // 文件上传地址
    filesUploadUrl: 'http://120.24.23.155:8301/hr/filesUpload',
    // 个人文件上传地址
@@ -29,7 +29,7 @@
    // 下载员工导入模版
    downloadEmpExcel: 'http://120.24.23.155:8000/员工信息.xls',
    // 导入员工
    uploadEmpExcel: 'http://localhost:8301/hr/empBaseInfo/importEmp',
    uploadEmpExcel: 'http://120.24.23.155:8301/hr/empBaseInfo/importEmp',
    // 获取图片
    getFilesUploadImage: 'http://120.24.23.155:8301/hr/filesUpload/image/',
    // 获取图片

 src/views/user/archivesChange.vue

@@ -924,7 +924,11 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="accidentId" label="" />
                <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
                <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="110">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editAccidentCases(scope.row,9)">{{ scope.row.injuredTime }}</span>
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="200" />
                <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
                <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="300" />
@@ -971,7 +975,11 @@
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="occupationalId" label="" />
                <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" />
                <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="110">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editOccupational(scope.row)">{{ scope.row.injuredTime }}</span>
                  </template>
                </el-table-column>
                <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
                <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="100" />
                <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="140" />
@@ -1994,7 +2002,6 @@
        <el-form
          ref="accidentCasesForm"
          :model="accidentCasesForm"
          :rules="accidentCasesRules"
          label-position="right"
          label-width="120px"
        >
@@ -2141,15 +2148,13 @@
          </el-row>
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>

          <el-button v-if="dialogshowArr[9].read" type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
        </div>
      </el-dialog>
      <el-dialog title="工伤案件" append-to-body :visible.sync="dialogshowArr[10].show" width="50%">
        <el-form
          ref="occupationalForm"
          :model="occupationalForm"
          :rules="occupationalRules"
          label-position="right"
          label-width="140px"
        >
@@ -2338,7 +2343,7 @@
          </el-row>
        </el-form>
        <div slot="footer" class="dialog-footer">
          <el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
          <el-button v-if="dialogshowArr[10].read" type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>

        </div>
      </el-dialog>
@@ -2674,10 +2679,12 @@
          show: false
        },
        {
          show: false
          show: false,
          read: false
        },
        {
          show: false
          show: false,
          read: false
        },
        {
          show: false
@@ -5204,6 +5211,7 @@
      this.accidentCasesForm.version = row.version
      this.thisShowIndex = 9
      this.dialogshowArr[9].show = true
      this.dialogshowArr[9].read = false
    },
    editOccupational(row) {
      this.isAdd = false
@@ -5254,6 +5262,7 @@
      this.occupationalForm.remark = row.remark
      this.thisShowIndex = 10
      this.dialogshowArr[10].show = true
      this.dialogshowArr[10].read = false
    },
    editLaborTrouble(row) {
      this.isAdd = false

 src/views/user/inemployees.vue

@@ -1614,6 +1614,7 @@
      this.empBaseInfoForm.stature = row.stature
      this.empBaseInfoForm.politics = row.politics
      this.empBaseInfoForm.entryDate = row.entryDate
      this.empBaseInfoForm.entryType = row.entryType
      this.empBaseInfoForm.education = row.education
      this.empBaseInfoForm.seniority = row.seniority
      this.empBaseInfoForm.nativePlace = row.nativePlace