提交代码

ruoyi-ui/src/store/modules/flowtask.js

@@ -0,0 +1,42 @@
+import { myAwaitFlowTaskList } from "@/api/flowable/businessKey";
+
+const flowtask = {
+    state: {
+        awaitTaskNum:0
+    },
+  
+    mutations: {
+      SET_AWAIT_TASK: (state, number) => {
+        state.awaitTaskNum = number
+      }
+    },
+  
+    actions: {
+      // 设置代办任务
+      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){
+                  el.style.display="inline";
+                }else{
+                  el.style.display="none";
+                }
+              });
+            }
+            resolve()
+          }).catch(error => {
+            reject(error)
+          });
+        })
+      }
+    }
+  }
+  
+  export default flowtask

ruoyi-ui/src/views/flowable/task/finished/index.vue

@@ -300,6 +300,8 @@ export default {
       }).then(() => {
         this.loading=true;
         revokeProcess(params).then(res => {
+          //刷新代办任务
+          this.$store.dispatch('settingAwaitNum');
           this.$modal.msgSuccess("任务撤回成功");
           this.loading = false;
           //关闭并刷新列表

ruoyi-ui/src/views/system/user/index.vue

@@ -313,6 +313,11 @@
           </el-col>
         </el-row>
       </el-form>
+      <div class="page-warning">
+        <p><strong style="color: #E6A23C;">“总包公司”</strong> 有总包公司所有项目权限。</p>
+        <p><strong style="color: #E6A23C;">“总包公司个人”</strong> 有项目人员中担任职务项目的权限。</p>
+        <p><strong style="color: #67C23A;">监理单位，分包单位同上。总包公司权限大于个人权限，请选择角色时以个人角色为主</strong></p>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -678,4 +683,15 @@ export default {
     }
   }
 };
-</script>
+</script>
+<style lang="scss">
+.page-warning {
+    padding: 8px 16px;
+    background-color: #f0f9eb;
+    border-radius: 4px;
+    border-left: 5px solid #67C23A;
+    margin: 20px 0;
+    font-size: 13px;
+    margin-top: 10px;
+} 
+</style>