Merge remote-tracking branch 'origin/master'

yz_08

2021-02-26 e6505dfd6607c8fbc2e89ebf7cb5c66179ee77d4

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/user/selectuser.vue

 src/views/user/Informationinput.vue

@@ -16,7 +16,7 @@
            <span :class="thisShowIndex===3?'selectedTimeline':''">合同信息</span>
          </el-timeline-item>
          <el-timeline-item @click.native="isShow(showArr[4].show, 4)">
            <span :class="thisShowIndex===4?'selectedTimeline':''">考勤情况</span>
            <span :class="thisShowIndex===4?'selectedTimeline':''">离职当月考勤</span>
          </el-timeline-item>
          <el-timeline-item @click.native="isShow(showArr[5].show, 5)">
            <span :class="thisShowIndex===5?'selectedTimeline':''">请假记录</span>
@@ -850,6 +850,7 @@
              >
                <el-option label="普通体检" value="1" />
                <el-option label="员工体检" value="2" />
                <el-option label="入职体检" value="03" />
              </el-select>
            </el-form-item>
            <el-form-item label="转氨酶" prop="transaminase">
@@ -2558,14 +2559,14 @@
        empId: '',
        customerId: '',
        archivesNumb: '',
        deptId: '',
        deptId: '1',
        deptName: '',
        empNumb: '',
        empName: '',
        sex: '1',
        JobId: '',
        jobName: '',
        empType: '1',
        empType: '01',
        certificateType: '',
        certificateNumb: '',
        nation: '01',
@@ -2833,6 +2834,11 @@
              })
              this.selectEmpBase()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 1:
@@ -2848,6 +2854,11 @@
                type: 'success'
              })
              this.selectWorkExperience()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2865,6 +2876,11 @@
              })
              this.selectPhysicalExam()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 3:
@@ -2880,6 +2896,11 @@
                type: 'success'
              })
              this.selectContractInfo()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2913,6 +2934,11 @@
              })
              this.selectLeaveInfo()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 6:
@@ -2928,6 +2954,11 @@
                type: 'success'
              })
              this.selectResign()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2945,6 +2976,11 @@
              })
              this.selectUnemployment()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 8:
@@ -2960,6 +2996,11 @@
                type: 'success'
              })
              this.selectInsurance()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2977,6 +3018,11 @@
              })
              this.selectAccidentCases()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 10:
@@ -2992,6 +3038,11 @@
                type: 'success'
              })
              this.selectOccupational()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -3009,6 +3060,11 @@
              })
              this.selectLaborTrouble()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 12:
@@ -3025,6 +3081,11 @@
              })
              this.selectBadRecord()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 13:
@@ -3040,6 +3101,11 @@
                type: 'success'
              })
              this.selectBadRecord()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -3174,6 +3240,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 1:
@@ -3192,6 +3263,11 @@
              this.tableDataName = 'workExperienceData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3212,6 +3288,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 3:
@@ -3230,6 +3311,11 @@
              this.tableDataName = 'contractInfoData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3250,6 +3336,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 5:
@@ -3268,6 +3359,11 @@
              this.tableDataName = 'leaveInfoData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3288,6 +3384,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 7:
@@ -3306,6 +3407,11 @@
              this.tableDataName = 'unemploymentData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3326,6 +3432,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 9:
@@ -3344,6 +3455,11 @@
              this.tableDataName = 'accidentCasesData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3364,6 +3480,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 11:
@@ -3382,6 +3503,11 @@
              this.tableDataName = 'laborTroubleData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3402,6 +3528,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 13:
@@ -3421,6 +3552,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
      }

 src/views/user/inemployees.vue

@@ -1251,7 +1251,7 @@
        <el-row>
          <el-col span="24">
            <el-form-item label="离职类型" prop="dimissionType">
              <el-radio-group v-model="gbdaForm.dimissionType">
              <el-radio-group v-model="gbdaForm.dimissionType" @change="changeDimissionType">
                <el-radio :label="1">正常离职</el-radio>
                <el-radio :label="2">自动离职</el-radio>
                <el-radio :label="3">公司劝退</el-radio>
@@ -1260,12 +1260,12 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col span="12">
          <el-col v-if="selectDimissionType === 2" span="12">
            <el-form-item label="自离天数" prop="selfLeaveDay">
              <el-input v-model="gbdaForm.selfLeaveDay" onkeyup="value=value.replace(/[^0-9.]/g,'')" />
            </el-form-item>
          </el-col>
          <el-col span="12">
          <el-col v-if="selectDimissionType === 2" span="12">
            <el-form-item label="报告人" prop="reporter">
              <el-input v-model="gbdaForm.reporter" />
            </el-form-item>
@@ -1713,7 +1713,8 @@
      isIndeterminate: false,
      cityOptions: ['sex', 'empName', 'archivesNumb', 'deptName', 'jobName', 'empType', 'nation', 'certificateNumb', 'age', 'marriage', 'certificateValidity', 'stature', 'politics', 'birthdate', 'education', 'nativePlace', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatus', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceType', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatus', 'family'],
      checkedCities: [],
      tableData: []
      tableData: [],
      selectDimissionType: 1
    }
  },
  mounted() {
@@ -2138,6 +2139,10 @@
          break
      }
    },
    changeDimissionType(value) {
      this.selectDimissionType = value
      console.log('值:' + value)
    },
    validSelfLeaveDay(rule, value, callback) {
      const type = this.gbdaForm.dimissionType
      if (type === 2) {

 src/views/user/selectuser.vue

@@ -17,8 +17,9 @@
              </el-checkbox-group>
            </el-form-item>
          </el-col>
          <el-col :span="2">
            <el-button type="primary" @click="search">查询</el-button>
          <el-col :span="4">
            <el-button size="mini" class="hr-but-all" type="primary" @click="vagueSearch">查询</el-button>
            <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
          </el-col>
        </el-row>
      </el-form>
@@ -28,17 +29,17 @@
        ref="multipleTable"
        :data="list"
        row-key="prop1"
        width="50%"
        width="80%"
        @selection-change="handleSelectionChange"
        @row-dblclick="rowDblclick"
      >
        <el-table-column type="selection" :reserve-selection="false" width="55" />
        <el-table-column type="selection" :reserve-selection="false" width="50" />
        <el-table-column v-if="show" prop="empId" label="员工Id" />
        <el-table-column prop="empNumb" label="员工编号" />
        <el-table-column prop="empName" label="姓名" />
        <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
        <el-table-column v-if="show" prop="deptId" label="部门Id" />
        <el-table-column prop="deptName" label="护卫点" />
        <el-table-column prop="deptName" label="护卫点" width="180" />
        <el-table-column v-if="show" prop="jobId" label="岗位Id" />
        <el-table-column prop="jobName" label="岗位" />
        <el-table-column prop="empTypeName" label="员工类别" />
@@ -104,18 +105,31 @@
  methods: {
    // 翻页方法
    search() {
      this.queryParams.empName = this.queryParams.empNumb
      this.queryParams.deptName = this.queryParams.empNumb
      this.queryParams.delFlag = 0
      this.fetch({
        ...this.queryParams,
        ...this.sort
      })
    },
    vagueSearch() {
      this.fetch({
        empNumb: this.queryParams.empNumb,
        empName: this.queryParams.empNumb,
        deptName: this.queryParams.empNumb
      })
    },
    resetSearch() {
      this.queryParams = {
        empNumb: '',
        empName: '',
        deptName: ''
      }
      this.search()
    },
    fetch(params = {}) {
      var that = this
      params.pageSize = this.pagination.size
      params.pageNum = this.pagination.num
      params.delFlag = 0
      this.$get('hr/empBaseInfo/list', {
        ...params
      }).then((r) => {
@@ -143,6 +157,7 @@
    },
    rowDblclick(row, column, event) {
      this.$refs.multipleTable.toggleRowSelection(row, true)
      this.sureChoose()
    }
  }
}

 vue.config.js

@@ -36,8 +36,8 @@
      // 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://127.0.0.1:8301/',
        // target: 'http://120.24.23.155:8301/',
        target: 'http://127.0.0.1:8301/',
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''