浏览代码

[FE]修改参数orgCode为orgId

luoxu5 4 年之前
父节点
当前提交
1d09305a0c

+ 7 - 7
security-protection-platform/src/api/attendance/index.js

@ -6,7 +6,7 @@ const { $default } = http
6 6
const mapping = {
7 7
  userid: 'id',
8 8
  current: 'pageNumber',
9
  orgId: 'orgCode',
9
  // orgId: 'orgCode',
10 10
  duty: 'mainJobPositionId',
11 11
  daysAttendance: 'clockingDays', // 出勤天数
12 12
  timesLate: 'lateDays', // 迟到次数
@ -21,31 +21,31 @@ const mapping = {
21 21
const api = {
22 22
  // 获取考勤日报表格数据
23 23
  // 新接口合并了 depId和orgId
24
  getDayAttendance({params}) {
24
  getDayAttendance ({ params }) {
25 25
    params.orgId = params.depId || params.orgId
26 26
    delete params.depId
27 27
    params = keysMapping(params, mapping)
28
    return $default.get('/sp/attendanceReport/queryDailyAttendanceReport', {params}).then(resp => {
28
    return $default.get('/sp/attendanceReport/queryDailyAttendanceReport', { params }).then(resp => {
29 29
      console.log('queryDailyAttendanceReport', resp)
30 30
      resp.data = keysMappingReverse(resp.data.data, mapping)
31 31
      return resp
32 32
    })
33 33
  },
34 34
  // 获取考勤月报表格数据
35
  getMonthAttendance({params}) {
35
  getMonthAttendance ({ params }) {
36 36
    params.orgId = params.depId || params.orgId
37 37
    delete params.depId
38 38
    params = keysMapping(params, mapping)
39
    return $default.get('/sp/attendanceReport/queryMonthlyAttendanceReport', {params}).then(resp => {
39
    return $default.get('/sp/attendanceReport/queryMonthlyAttendanceReport', { params }).then(resp => {
40 40
      console.log('queryMonthlyAttendanceReport', resp)
41 41
      resp.data = keysMappingReverse(resp.data.data, mapping)
42 42
      return resp
43 43
    })
44 44
  },
45 45
  // 获取考勤月报详情数据
46
  getAttendanceDetail({params}) {
46
  getAttendanceDetail ({ params }) {
47 47
    params = keysMapping(params, mapping)
48
    return $default.get('/sp/attendanceReport/queryAttendanceDetailReport', {params}).then(resp => {
48
    return $default.get('/sp/attendanceReport/queryAttendanceDetailReport', { params }).then(resp => {
49 49
      resp.data = resp.data.data
50 50
      return resp
51 51
    })

+ 7 - 6
security-protection-platform/src/api/common/index.js

@ -1,8 +1,8 @@
1 1
import http from '@/http'
2 2
import { keysMappingReverse } from '@/utils/keysMapping'
3
const mapping = {
4
  id: 'code'
5
}
3
// const mapping = {
4
//   id: 'code'
5
// }
6 6
const $default = http.$default
7 7
const api = {
8 8
  /**
@ -41,14 +41,15 @@ const api = {
41 41
      // resp.data = newData
42 42
      // console.log(newData)
43 43
      // console.log('queryAllOrganize', resp)
44
      resp.data = keysMappingReverse(nest(data), mapping)
44
      resp.data = nest(data)
45
      // resp.data = keysMappingReverse(nest(data), mapping)
45 46
      return resp
46 47
    })
47 48
  },
48 49
49
  getEmployeeByOrgid (orgCode) {
50
  getEmployeeByOrgid (orgId) {
50 51
    return $default
51
      .get(`/sp/workEmployee/queryEmployeeByOrg?orgCode=${orgCode}`)
52
      .get(`/sp/workEmployee/queryEmployeeByOrg?orgId=${orgId}`)
52 53
      .then((resp) => {
53 54
        const data = resp.data.data || []
54 55
        resp.data = data.map((row) => {