diff --git a/env/.env.development b/env/.env.development index 375d2cf..09ee786 100644 --- a/env/.env.development +++ b/env/.env.development @@ -4,6 +4,6 @@ NODE_ENV = 'development' VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot' +VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' \ No newline at end of file diff --git a/src/api/bpm/index.ts b/src/api/bpm/index.ts index 716e0d0..c7cc202 100644 --- a/src/api/bpm/index.ts +++ b/src/api/bpm/index.ts @@ -29,11 +29,11 @@ export function queryZbkhZbByIdApi(id : string) { } /*通过id查询指标考核子表数据*/ -export function queryZbkhFbByIdApi(mainId : string) { +export function queryZbkhFbByIdApi(data : object) { return http({ url: '/jxkh.zbkh/cxcJxkhZbkhZb/listCxcJxkhZbkhDwkhByMainId', method: 'GET', - data: { mainId } + data }) } @@ -46,3 +46,47 @@ export function queryZbkhBtByIdApi(mainId : string) { }) } +/*通过id查询考核实施主表数据*/ +export function queryKhssZbByIdApi(id : string) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/getAllById', + method: 'GET', + data: { id } + }) +} + + /*通过id查询考核实施主表自定义表头*/ + export function queryKhssZbBtByIdApi(mainId : string) { + return http({ + url: '/jxkh.jxkh/cxcJxkhKhssKhjxZb/getByMainId', + method: 'GET', + data: { mainId } + }) + } + + /*通过id查询考核实施子表数据*/ + export function queryKhssFbByIdApi(data : object) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/selectAllByMainId', + method: 'GET', + data + }) + } + + /*通过id查询总金额*/ + export function queryKhssAllSumByIdApi(mainId : string) { + return http({ + url: '/jxkh.khss/cxcJxkhXhss/getAllSum', + method: 'GET', + data: { mainId } + }) + } + + /*通过id查询考核实子表自定义表头*/ + export function queryKhssFbBtByIdApi(mainId : string) { + return http({ + url: '/jxkh.jxfp.bt/cxcJxkhJxfbBtZb/listByMainId', + method: 'GET', + data: { mainId } + }) + } diff --git a/src/api/humanResource/clockin/index.ts b/src/api/humanResource/clockin/index.ts new file mode 100644 index 0000000..57c1f37 --- /dev/null +++ b/src/api/humanResource/clockin/index.ts @@ -0,0 +1,11 @@ +import { http } from '@/utils/http'; + + +/*新增打卡记录*/ +export function addApi(config : Object) { + return http({ + url: '/cxc_rlzy.wbxm.wbdk/cxcRlzyWbdk/add', + method: 'POST', + data: config + }) +} \ No newline at end of file diff --git a/src/pages-bpm/khss/index.vue b/src/pages-bpm/khss/index.vue new file mode 100644 index 0000000..0f7ba0d --- /dev/null +++ b/src/pages-bpm/khss/index.vue @@ -0,0 +1,230 @@ + + + + + \ No newline at end of file diff --git a/src/pages-bpm/zbkh/index.vue b/src/pages-bpm/zbkh/index.vue index 1b27d63..940d603 100644 --- a/src/pages-bpm/zbkh/index.vue +++ b/src/pages-bpm/zbkh/index.vue @@ -1,46 +1,57 @@ - \ No newline at end of file diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue index b383575..23df1bd 100644 --- a/src/pages-humanResource/absence/index.vue +++ b/src/pages-humanResource/absence/index.vue @@ -118,7 +118,6 @@ pageSize }).then((res) => { if (res.success) { - console.log('----',res.result.records) list.value = [...list.value, ...res.result.records] } loading = false diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index a0fe46a..3347dac 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -1,13 +1,16 @@ diff --git a/src/pages.json b/src/pages.json index c5bf3e1..88e5087 100644 --- a/src/pages.json +++ b/src/pages.json @@ -525,6 +525,10 @@ "path": "document/index", "type": "page" }, + { + "path": "khss/index", + "type": "page" + }, { "path": "leaveApplication/index", "type": "page" diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue index f4d1354..ab17ebb 100644 --- a/src/pages/user/people.vue +++ b/src/pages/user/people.vue @@ -52,9 +52,7 @@