diff --git a/ruoyi-ui/src/api/publics.js b/ruoyi-ui/src/api/publics.js index acbbf782..0f15e766 100644 --- a/ruoyi-ui/src/api/publics.js +++ b/ruoyi-ui/src/api/publics.js @@ -76,6 +76,13 @@ const selectProjectAuditinfo = (query) => { }) } +export function findMyTask(){ + return request({ + url: '/publics/findTask', + method: 'get' + }) +} + export default{ getMyDeptList, getDeptTree, diff --git a/ruoyi-ui/src/components/flow/Listener/index.vue b/ruoyi-ui/src/components/flow/Listener/index.vue index 7daa266d..00e16d15 100644 --- a/ruoyi-ui/src/components/flow/Listener/index.vue +++ b/ruoyi-ui/src/components/flow/Listener/index.vue @@ -27,7 +27,7 @@ - + diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue index 6ec1daf8..ad1bec5d 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Item.vue @@ -27,18 +27,8 @@ export default { vnodes.push({(title)}) } let name=context?.parent?.item?.name; - if(['Todo','Task'].includes(name)){ - vnodes.push(h('span',{ - class:"todo_num_tips tips_"+name, - on:{ - click:function(e){ - context?.parent.$bus.$emit("todo_tips_click",name) - e.preventDefault(); - e.stopPropagation(); - } - } - },1 - )) + if(['Todo','Task','Approve'].includes(name)){ + vnodes.push(h('span',{class:"todo_num_tips tips_"+name},1)) } } return vnodes diff --git a/ruoyi-ui/src/store/modules/flowtask.js b/ruoyi-ui/src/store/modules/flowtask.js index 8804f221..2553cba1 100644 --- a/ruoyi-ui/src/store/modules/flowtask.js +++ b/ruoyi-ui/src/store/modules/flowtask.js @@ -1,4 +1,4 @@ -import { myAwaitFlowTaskList } from "@/api/flowable/businessKey"; +import { findMyTask } from "@/api/publics"; const flowtask = { state: { @@ -16,14 +16,36 @@ const flowtask = { settingAwaitNum({ commit }) { return new Promise((resolve, reject) => { //查询当前登录人的代办任务数量 - let params={ pageNum: 1,pageSize: 1 }; - myAwaitFlowTaskList(params).then(response => { - let els=document.querySelectorAll(".todo_num_tips"); - commit('SET_AWAIT_TASK',response.total) - if(els.length>0){ - els.forEach(el=>{ - el.innerHTML=response.total; - if(response.total>0){ + findMyTask({}).then(response => { + let todos=document.querySelectorAll(".tips_Todo"); + let approves=document.querySelectorAll(".tips_Approve"); + let tasks=document.querySelectorAll(".tips_Task"); + //commit('SET_AWAIT_TASK',response.total) + if(todos.length>0){ + todos.forEach(el=>{ + el.innerHTML=response.data.todo; + if(response.data.todo>0){ + el.style.display="inline"; + }else{ + el.style.display="none"; + } + }); + } + if(approves.length>0){ + approves.forEach(el=>{ + el.innerHTML=response.data.approve; + if(response.data.approve>0){ + el.style.display="inline"; + }else{ + el.style.display="none"; + } + }); + } + if(tasks.length>0){ + let sum = parseInt(response.data.todo)+parseInt(response.data.approve); + tasks.forEach(el=>{ + el.innerHTML=sum; + if(sum>0){ el.style.display="inline"; }else{ el.style.display="none"; diff --git a/ruoyi-ui/src/views/flowable/definition/index.vue b/ruoyi-ui/src/views/flowable/definition/index.vue index 76207373..19d2416f 100644 --- a/ruoyi-ui/src/views/flowable/definition/index.vue +++ b/ruoyi-ui/src/views/flowable/definition/index.vue @@ -113,7 +113,7 @@
4、id参数设置为{processDefinitionKey}:{processDefinitionVersion}:{generated-id},其中generated-id是一个唯一数字,用以保证在集群环境下,流程定义缓存中,流程id的唯一性。
- + diff --git a/ruoyi-ui/src/views/flowable/task/finished/index.vue b/ruoyi-ui/src/views/flowable/task/finished/index.vue index afdf6576..81e75e13 100644 --- a/ruoyi-ui/src/views/flowable/task/finished/index.vue +++ b/ruoyi-ui/src/views/flowable/task/finished/index.vue @@ -73,7 +73,7 @@ --> - + diff --git a/ruoyi-ui/src/views/flowable/task/form/index.vue b/ruoyi-ui/src/views/flowable/task/form/index.vue index ab17d858..6591899f 100644 --- a/ruoyi-ui/src/views/flowable/task/form/index.vue +++ b/ruoyi-ui/src/views/flowable/task/form/index.vue @@ -62,7 +62,7 @@ - + diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue index 0e7c9b10..62e10d18 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/index.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/index.vue @@ -87,7 +87,7 @@ - + diff --git a/ruoyi-ui/src/views/flowable/task/project/index.vue b/ruoyi-ui/src/views/flowable/task/project/index.vue index f5b9f44c..1b07b064 100644 --- a/ruoyi-ui/src/views/flowable/task/project/index.vue +++ b/ruoyi-ui/src/views/flowable/task/project/index.vue @@ -97,7 +97,7 @@ - + diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue index 92e63f36..6f1f42ea 100644 --- a/ruoyi-ui/src/views/flowable/task/record/index.vue +++ b/ruoyi-ui/src/views/flowable/task/record/index.vue @@ -128,7 +128,7 @@ :data="userList" border style="width: 100%" - @selection-change="handleSelectionChange"> + @selection-change="handleSelectionChange" stripe> diff --git a/ruoyi-ui/src/views/flowable/task/todo/index.vue b/ruoyi-ui/src/views/flowable/task/todo/index.vue index 7c78df7c..c22f973b 100644 --- a/ruoyi-ui/src/views/flowable/task/todo/index.vue +++ b/ruoyi-ui/src/views/flowable/task/todo/index.vue @@ -42,7 +42,7 @@ - + @@ -161,25 +161,7 @@ export default { // this.total = response.data.total; // this.loading = false; // }); - myAwaitFlowTaskList(this.queryParams).then(response => { - this.todoList = response.rows; - this.total = response.total; - this.loading = false; - //设置缓存值 - //this.$store.dispatch('settingAwaitNum'); - //重新刷新代办任务 - let els=document.querySelectorAll(".todo_num_tips"); - if(els.length>0){ - els.forEach(el=>{ - el.innerHTML=response.total; - if(response.total>0){ - el.style.display="inline"; - }else{ - el.style.display="none"; - } - }); - } - }); + this.$store.dispatch('settingAwaitNum'); }, // 跳转到处理页面 handleProcess(row){ diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 37c8fc11..b7bc4381 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -91,7 +91,7 @@ - + diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 60bee1de..3f83d1ad 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -101,7 +101,7 @@ - + diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index 3601bc4b..9834d90a 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -98,7 +98,7 @@ - + diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index 34a3ce34..e4b0c56e 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -102,7 +102,7 @@ - + diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue index a0cf67a1..a9512b3f 100644 --- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue +++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue @@ -78,7 +78,7 @@ - + + - + + - + + diff --git a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue index 7326659a..89ce0497 100644 --- a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue +++ b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue @@ -70,7 +70,7 @@ - + + diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue index 7a50cd11..dc3f1310 100644 --- a/ruoyi-ui/src/views/project/projectChecking/index.vue +++ b/ruoyi-ui/src/views/project/projectChecking/index.vue @@ -60,7 +60,7 @@ @keyup.enter.native="handleQuery" /> - + + {{ parseTime(scope.row.checkingDate, "{y}-{m}-{d} {h}:{i}") }} - + + diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue index c8e3e188..becb1d21 100644 --- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue +++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue @@ -70,7 +70,7 @@ - + + diff --git a/ruoyi-ui/src/views/project/projectDeptWroks/index.vue b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue index d40ee405..dc95bc2a 100644 --- a/ruoyi-ui/src/views/project/projectDeptWroks/index.vue +++ b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue @@ -85,7 +85,7 @@ diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index fcc63dd1..a811f32d 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -52,7 +52,7 @@ /> - + - - - + + + + + - + + @@ -532,6 +538,7 @@ export default { qualityUser: null, superviseUser: null, isDel: null, + approveStatus: null, }, // 表单参数 form: {}, diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue index 923fcfca..babc57c1 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue @@ -70,7 +70,7 @@