diff --git a/env/.env.development b/env/.env.development index 09ee786..c78f0dc 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.249: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 +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 0da8602..716e0d0 100644 --- a/src/api/bpm/index.ts +++ b/src/api/bpm/index.ts @@ -1,10 +1,48 @@ import { http } from '@/utils/http'; -/*通过id查询数据*/ +/*通过id查询公文数据*/ +export function queryDocumentByIdApi(id : string) { + return http({ + url: '/cxcoagwfb/cxcOaGwfb/queryById', + method: 'GET', + data: { id } + }) +} + + +/*通过id查询干租车数据*/ export function queryCarRentalByIdApi(id : string) { return http({ url: '/CarRental/cxcCarRental/queryById', method: 'GET', data: { id } }) -} \ No newline at end of file +} + +/*通过id查询指标考核主表数据*/ +export function queryZbkhZbByIdApi(id : string) { + return http({ + url: '/jxkh.zbkh/cxcJxkhZbkhZb/listById', + method: 'GET', + data: { id } + }) +} + +/*通过id查询指标考核子表数据*/ +export function queryZbkhFbByIdApi(mainId : string) { + return http({ + url: '/jxkh.zbkh/cxcJxkhZbkhZb/listCxcJxkhZbkhDwkhByMainId', + method: 'GET', + data: { mainId } + }) +} + +/*通过id查询指标考核自定义表头*/ +export function queryZbkhBtByIdApi(mainId : string) { + return http({ + url: '/jxkh.dwkhbt/cxcJxkhZbkhDwkhBtZb/listByMainId', + method: 'GET', + data: { mainId } + }) +} + diff --git a/src/pages-bpm/carRental/index.vue b/src/pages-bpm/carRental/index.vue index fb73567..1366a9f 100644 --- a/src/pages-bpm/carRental/index.vue +++ b/src/pages-bpm/carRental/index.vue @@ -37,7 +37,7 @@ }) // 申请信息 - const qjQueryById = () => { + const queryById = () => { queryCarRentalByIdApi(props.formData.dataId).then((res) => { if (res.success) { info.value = res.result.records[0] @@ -49,6 +49,6 @@ } onMounted(() => { - qjQueryById() + queryById() }) \ No newline at end of file diff --git a/src/pages-bpm/document/index.vue b/src/pages-bpm/document/index.vue new file mode 100644 index 0000000..ae44163 --- /dev/null +++ b/src/pages-bpm/document/index.vue @@ -0,0 +1,56 @@ + + + \ No newline at end of file diff --git a/src/pages-bpm/leaveApplication/index.vue b/src/pages-bpm/leaveApplication/index.vue index 20d5ae5..29a49ce 100644 --- a/src/pages-bpm/leaveApplication/index.vue +++ b/src/pages-bpm/leaveApplication/index.vue @@ -41,7 +41,7 @@ }); } // 申请信息 - const qjQueryById = () => { + const queryById = () => { queryByIdApi(props.formData.dataId).then((res) => { if (res.success) { info.value = res.result.records[0] @@ -53,6 +53,6 @@ } onMounted(() => { - qjQueryById() + queryById() }) \ No newline at end of file diff --git a/src/pages-bpm/zbkh/index.vue b/src/pages-bpm/zbkh/index.vue new file mode 100644 index 0000000..1b27d63 --- /dev/null +++ b/src/pages-bpm/zbkh/index.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file diff --git a/src/pages-humanResource/absence/detail.vue b/src/pages-humanResource/absence/detail.vue index 5c45dd6..8fe62d8 100644 --- a/src/pages-humanResource/absence/detail.vue +++ b/src/pages-humanResource/absence/detail.vue @@ -67,7 +67,9 @@ if (res.success) { info.value = res.result.records[0] minDate.value = dateStringToTimestamp(info.value.begintime) - image.value = info.value.path.split(',').map(path => imgUrl(path)) + if(image.value.path){ + image.value = info.value.path.split(',').map(path => imgUrl(path)) + } } }) } diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue index 23df1bd..b383575 100644 --- a/src/pages-humanResource/absence/index.vue +++ b/src/pages-humanResource/absence/index.vue @@ -118,6 +118,7 @@ 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-operate/file/detail.vue b/src/pages-operate/file/detail.vue index 310104f..f93bb7a 100644 --- a/src/pages-operate/file/detail.vue +++ b/src/pages-operate/file/detail.vue @@ -19,7 +19,7 @@ - {{dataSource.jdwj}} + {{getFilename(dataSource.jdwj)}} @@ -33,7 +33,10 @@ import { queryDataById } from '@/api/pages/file' - + import { + getFilename + } from '@/utils' + const appStore = useAppStore() const dataSource = ref({}) diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue index c7873b2..dc9c5e3 100644 --- a/src/pages-process/components/DynamicLink.vue +++ b/src/pages-process/components/DynamicLink.vue @@ -1,18 +1,18 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/pages-process/components/taskDeal.vue b/src/pages-process/components/taskDeal.vue index eed1a6f..3d0e78e 100644 --- a/src/pages-process/components/taskDeal.vue +++ b/src/pages-process/components/taskDeal.vue @@ -189,7 +189,6 @@