diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue index 79a1388..99816d8 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/business/BusinessList.vue @@ -574,7 +574,13 @@ } }, clickContent: function (item) { - let apply_id = item.data_infomation.apply_id; + let biz_code = item.biz_code; + let apply_id = ""; + if(biz_code === "105001001"){ + apply_id = item.data_infomation.run_id; + }else { + apply_id = item.data_infomation.apply_id; + } if(!apply_id || apply_id === ""){ Modal.warning({ title:"数据有误,请联系管理员处理", @@ -583,7 +589,6 @@ }) return } - let biz_code = item.biz_code; switch (biz_code){ case "108001001": this.infoTitle = "会议室审批"; @@ -605,6 +610,11 @@ this.moduleComponent = ()=>import('../modulComponent/goodsReceiveApprove.vue'); this.moduleParam = item.data_infomation; break; + case "105001001": + this.infoTitle = "请假审批"; + this.moduleComponent = ()=>import('../modulComponent/leaveApprove.vue'); + this.moduleParam = item.data_infomation; + break; case 1: break; } diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js index 2d60183..4688684 100644 --- a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/interConfig.js @@ -54,5 +54,18 @@ const interConfig = { isTestLogin:true, }, + //---------------考勤审批----------------- + //请假详情 + 'getLeaveApplyDetail':{ + url:'/intellioa/attendance/attendanceRule/getApplyDetail', + method:'post', + isTestLogin:true, + }, + //请假审批 + 'leaveCheck':{ + url:'/intellioa/attendance/attendanceRule/check', + method:'post', + isTestLogin:true, + }, } export default interConfig diff --git a/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue new file mode 100644 index 0000000..642234a --- /dev/null +++ b/src/views/screenAdaptation/pages/adminCenter/messageProcessing/todoHandle/modulComponent/leaveApprove.vue @@ -0,0 +1,289 @@ + + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/apply.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/apply.vue index 67b6b12..65b74c5 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/apply.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/apply.vue @@ -335,6 +335,9 @@ display: flex; flex-wrap: wrap; justify-content: flex-start; + /deep/ label{ + color:var(--moduleFontColor) !important; + } .form-button-div{ /deep/ .ant-form-item-children{ display: flex; @@ -344,6 +347,9 @@ } } + /deep/ label{ + color:var(--moduleFontColor) !important; + } /deep/ .ant-form-item-control { position: relative; .ant-form-item-children { @@ -353,6 +359,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + color:var(--moduleFontColor) !important; .upload-container-style { .file-style { .file-name-style { diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/copyDom.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/copyDom.vue index 1dc6800..7416e54 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/copyDom.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/meetingRoom/copyDom.vue @@ -99,6 +99,9 @@ justify-content: flex-start; .ant-checkbox-wrapper { margin-left: 8px !important; + /deep/ span{ + color:var(--moduleFontColor) !important; + } } } } diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/officeCar/apply.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/officeCar/apply.vue index cde0396..0e234b8 100644 --- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/officeCar/apply.vue +++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/officeCar/apply.vue @@ -391,6 +391,9 @@ display: flex; flex-wrap: wrap; justify-content: flex-start; + /deep/ label{ + color:var(--moduleFontColor) !important; + } .form-button-div { /deep/ .ant-form-item-children { display: flex; @@ -400,6 +403,9 @@ } } + /deep/ label{ + color:var(--moduleFontColor) !important; + } /deep/ .ant-form-item-control { position: relative; .ant-form-item-children { @@ -409,6 +415,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + color:var(--moduleFontColor) !important; .upload-container-style { .file-style { .file-name-style { diff --git a/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue b/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue index 1f2cee9..1e033f7 100644 --- a/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue +++ b/src/views/screenAdaptation/pages/adminCenter/workBench/myApplication.vue @@ -196,7 +196,7 @@ line-height: 20px; margin-top: 10px; text-align: center; - color: white; + color: #d3d6dd; } } }