diff --git a/.env.development b/.env.development index a0af6a8..ad77649 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # 开发环境 # 请求接口地址 VITE_REQUEST_BASE_URL = https://36.112.48.190 -#VITE_REQUEST_BASE_URL = http://10.75.15.247:8080 +#VITE_REQUEST_BASE_URL = http://10.75.15.249:8080 diff --git a/api/api.js b/api/api.js index 7fd5110..f910e8d 100644 --- a/api/api.js +++ b/api/api.js @@ -72,7 +72,7 @@ export function indexChartScdtDataApi(config) { // 首页 data: config }) } -export function bpmlistApi(config) { // 公文 +export function gongwenlistApi(config) { // 公文 return https({ url: '/cxcoagwfb/cxcOaGwfb/bpmlist', method: 'get', diff --git a/api/pages.js b/api/leaveApi.js similarity index 70% rename from api/pages.js rename to api/leaveApi.js index eb755bb..1d4e7d1 100644 --- a/api/pages.js +++ b/api/leaveApi.js @@ -10,6 +10,7 @@ export function qjAddApi(config) { // 发起请假流程申请 }) } + export function queryZwmcAndExaApi(username) { // 根据username获取职位名称和审批领导列表 return https({ url: '/CxcQxj/cxcQxj/queryZwmcByUsername', @@ -36,4 +37,20 @@ export function queryHisDateApi(username) { // 根据username获取最新请假 username } }) +} + +export function queryLeaveListApi(params) { // 获取所有请假信息 + return https({ + url: '/CxcQxj/cxcQxj/list', + method: 'get', + data: params + }) +} + +export function countByOrgApi(params) { // 获取所有请假信息 + return https({ + url: '/CxcQxj/cxcQxj/countByOrg', + method: 'get', + data: params + }) } \ No newline at end of file diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue index 4a79283..9e033aa 100644 --- a/bpm/leaveApplication/index.vue +++ b/bpm/leaveApplication/index.vue @@ -3,6 +3,7 @@ 申请信息 + 历史查询 @@ -44,7 +45,7 @@ 请假天数： - {{info.days}} + {{info.days}}天 @@ -110,11 +111,9 @@ } from '@/api/api.js'; import { qjQueryByIdApi - } from '@/api/pages.js'; + } from '@/api/leaveApi.js'; import { ref, - onBeforeMount, - watch, onMounted } from 'vue' import { @@ -161,7 +160,6 @@ } } }) - } /**审批步骤*/ @@ -193,16 +191,16 @@ } }) } - // watch(() => props.dataId, (nval, oval) => { - // if (nval) { - // qjQueryById() - // extActFlowData() - // } - // }) onMounted(() => { qjQueryById() extActFlowData() }) + + const goToHis = () => { + uni.navigateTo({ + url: `/pages/views/renliziyuan/qingjiaxinxi/index?username=${info.value.username}` + }); + } \ No newline at end of file diff --git a/pages/views/renliziyuan/qingjiaxinxi/index.vue b/pages/views/renliziyuan/qingjiaxinxi/index.vue new file mode 100644 index 0000000..409dad3 --- /dev/null +++ b/pages/views/renliziyuan/qingjiaxinxi/index.vue @@ -0,0 +1,251 @@ + + + + + + \ No newline at end of file diff --git a/static/office/absence.png b/static/office/absence.png deleted file mode 100644 index b8e5686..0000000 Binary files a/static/office/absence.png and /dev/null differ diff --git a/static/office/duty.png b/static/office/duty.png index bf1c7a0..780998c 100644 Binary files a/static/office/duty.png and b/static/office/duty.png differ diff --git a/static/office/leaveApplication.png b/static/office/leaveApplication.png new file mode 100644 index 0000000..fca89fe Binary files /dev/null and b/static/office/leaveApplication.png differ diff --git a/static/office/leaveRecord.png b/static/office/leaveRecord.png new file mode 100644 index 0000000..cb75ebb Binary files /dev/null and b/static/office/leaveRecord.png differ diff --git a/static/office/person.png b/static/office/person.png index 45a62ea..caf0332 100644 Binary files a/static/office/person.png and b/static/office/person.png differ diff --git a/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue b/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue index 2e7dae6..0252e97 100644 --- a/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue +++ b/uni_modules/trq-depart-select/components/trq-depart-select/trq-depart-select.vue @@ -57,7 +57,6 @@ watch( tempSelectDepartID, (newVal,oldVal)=>{ //通过监听触发change by 闵 - console.log(newVal) $emit('change', newVal, departInfo) },{ immediate:true, @@ -69,7 +68,6 @@ const getDepartList = () => { queryMyDeptTreeListApi().then((res) => { if (res.success) { - console.log(res) departList.value = res.result } }).catch((err) => { @@ -77,7 +75,6 @@ }) } const onnodeclick = ((e) => { - console.log(e) departInfo.value = e; if (props.returnCodeOrID == "orgCode") { tempSelectDepartID.value = e.orgCode @@ -90,13 +87,11 @@ }) const onchange = ((e) => { - console.log(e) selectDepartID.value = e.detail.value[e.detail.value.length - 1].value // $emit('change', e.detail.value[e.detail.value.length - 1].value, {}) }) const onpopupclosed = ((e) => { - console.log(e) selectDepartID.value = tempSelectDepartID.value // $emit('change', selectDepartID.value, departInfo) })