Pārlūkot izejas kodu

11482-【CR】【投资系统】增加审批流程-我的任务-待办数量

hxy 3 mēneši atpakaļ
vecāks
revīzija
39a3862644

+ 7 - 0
ruoyi-ui/src/api/project/approval/pool.js

@@ -94,3 +94,10 @@ export function getSumScore(pInstId) {
   })
 }*/
 
+// 查询项目立项待办任务列表数量
+export function getMyTaskApprovalNumber() {
+  return request({
+    url: '/project/approval/getMyTaskList',
+    method: 'get'
+  })
+}

+ 7 - 1
ruoyi-ui/src/api/project/decision/pool.js

@@ -93,4 +93,10 @@ export function getSumScore(pInstId) {
     method: 'delete'
   })
 }*/
-
+// 查询项目投决待办任务列表数量
+export function getMyTaskDecisionNumber() {
+  return request({
+    url: '/project/decision/getMyTaskList',
+    method: 'get'
+  })
+}

+ 7 - 0
ruoyi-ui/src/api/project/investOpp/pool.js

@@ -73,4 +73,11 @@ export function getInvestInfo(pInstId) {
     method: 'delete'
   })
 }*/
+// 查询投资机会待办任务列表数量
+export function getMyTaskInvestOppNumber() {
+  return request({
+    url: '/project/investmentOpportunity/getMyTaskList',
+    method: 'get'
+  })
+}
 

+ 7 - 1
ruoyi-ui/src/api/project/termination/pool.js

@@ -93,4 +93,10 @@ export function getSumScore(pInstId) {
     method: 'delete'
   })
 }*/
-
+// 查询项目终止待办任务列表数量
+export function getMyTaskTerminationNumber() {
+  return request({
+    url: '/project/termination/getMyTaskList',
+    method: 'get'
+  })
+}

+ 31 - 5
ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -33,29 +33,55 @@ export default {
         let projectLXNum = store.getters.projectLXNum; //项目立项
         let dueNum = store.getters.dueNum; //尽职背调
         let projectTJNum = store.getters.projectTJNum; //项目投决
+        //我的任务下的菜单
+        let investOppNum = store.getters.investOppNum; //投资机会
+        let approvalNum = store.getters.approvalNum; //项目立项
+        //let dueNum = store.getters.dueNum; //尽职背调
+        let decisionNum = store.getters.decisionNum; //项目投决
+        let terminationNum = store.getters.terminationNum; //项目终止
         vnodes.push(
           <span slot="title">
             {title}
-            {title === "评估考察" && inspectNum ? (
+            {icon === "#" && title === "评估考察" && inspectNum ? (
               <span class="hint">{inspectNum}</span>
             ) : (
               ""
             )}
-            {title === "项目立项" && projectLXNum ? (
+            {icon === "#" && title === "项目立项" && projectLXNum ? (
               <span class="hint">{projectLXNum}</span>
             ) : (
               ""
             )}
-            {title === "尽职背调" && dueNum ? (
+            {icon === "#" && title === "尽职背调" && dueNum ? (
               <span class="hint">{dueNum}</span>
             ) : (
               ""
             )}
-            {title === "项目投决" && projectTJNum ? (
+            {icon === "#" && title === "项目投决" && projectTJNum ? (
               <span class="hint">{projectTJNum}</span>
             ) : (
               ""
             )}
+            {icon === "select" && title === "投资机会" && investOppNum ? (
+              <span class="hint">{investOppNum}</span>
+            ) : (
+              ""
+            )}
+            {icon === "select" && title === "项目立项" && approvalNum ? (
+              <span class="hint">{approvalNum}</span>
+            ) : (
+              ""
+            )}
+            {icon === "select" && title === "项目投决" && decisionNum ? (
+              <span class="hint">{decisionNum}</span>
+            ) : (
+              ""
+            )}
+            {icon === "select" && title === "项目终止" && terminationNum ? (
+              <span class="hint">{terminationNum}</span>
+            ) : (
+              ""
+            )}
           </span>
         );
       }
@@ -79,4 +105,4 @@ export default {
   font-weight: bold;
   margin-top: -1px;
 }
-</style>
+</style>

+ 4 - 0
ruoyi-ui/src/permission.js

@@ -31,6 +31,10 @@ router.beforeEach((to, from, next) => {
             store.dispatch("getApprovalNumber"); //初始化项目立项代办数量
             store.dispatch("getInvestigateNumber"); //初始化尽职背调代办数量
             store.dispatch("getDecisionNumber"); //初始化项目投决代办数量
+            store.dispatch("getMyTaskInvestOppNumber"); //初始化投资机会代办数量
+            store.dispatch("getMyTaskApprovalNumber"); //初始化项目立项代办数量
+            store.dispatch("getMyTaskDecisionNumber"); //初始化项目投决代办数量
+            store.dispatch("getMyTaskTerminationNumber"); //初始化项目终止代办数量
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
 
           })

+ 5 - 0
ruoyi-ui/src/store/getters.js

@@ -26,5 +26,10 @@ const getters = {
   topbarRouters:state => state.permission.topbarRouters,
   defaultRoutes:state => state.permission.defaultRoutes,
   sidebarRouters:state => state.permission.sidebarRouters,
+  investOppNum:state => state.user.investOppNum,
+  approvalNum:state => state.user.approvalNum,
+  decisionNum:state => state.user.decisionNum,
+  terminationNum:state => state.user.terminationNum,
+
 }
 export default getters

+ 60 - 1
ruoyi-ui/src/store/modules/user.js

@@ -1,6 +1,10 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { getReviewNumber,getApprovalNumber,getInvestigateNumber,getDecisionNumber } from '@/api/invest/pool'
+import { getMyTaskInvestOppNumber } from '@/api/project/investOpp/pool'
+import { getMyTaskApprovalNumber } from '@/api/project/approval/pool'
+import { getMyTaskDecisionNumber } from '@/api/project/decision/pool'
+import { getMyTaskTerminationNumber } from "@/api/project/termination/pool";
 
 const user = {
   state: {
@@ -95,6 +99,11 @@ const user = {
         },
       ],
     ],
+    // 我的任务-各项代办数量
+    investOppNum: 0,//投资机会
+    approvalNum: 0,//项目立项
+    decisionNum: 0,//项目投决
+    terminationNum: 0,//项目终止
 
   },
 
@@ -140,6 +149,19 @@ const user = {
     },
     SET_PROJECTTJNUM: (state, projectTJNum) => {
       state.projectTJNum = projectTJNum
+    },
+    //我的任务
+    SET_INVESTOPPNUM: (state, investOppNum) => {
+      state.investOppNum = investOppNum
+    },
+    SET_APPROVALNUM: (state, approvalNum) => {
+      state.approvalNum = approvalNum
+    },
+    SET_DECISIONNUM: (state, decisionNum) => {
+      state.decisionNum = decisionNum
+    },
+    SET_TERMINATIONNUM: (state, terminationNum ) => {
+      state.terminationNum  = terminationNum
     }
   },
 
@@ -253,8 +275,45 @@ const user = {
           commit('SET_PROJECTTJNUM', projectTJNum);
         })
       })
-    }
+    },
+    //我的任务-待办数量
+    //更新投资机会待办
+    getMyTaskInvestOppNumber({ commit, state }) {
+      return new Promise(resolve => {
+        getMyTaskInvestOppNumber().then(res => {
+          const investOppNum = parseInt(res.total);//项目投决
+          commit('SET_INVESTOPPNUM', investOppNum);
+        })
+      })
+    },
+    //更新项目立项待办
+    getMyTaskApprovalNumber({ commit, state }) {
+      return new Promise(resolve => {
+        getMyTaskApprovalNumber().then(res => {
+          const approvalNum = parseInt(res.total);//项目投决
+          commit('SET_APPROVALNUM', approvalNum);
+        })
+      })
+    },
+    //更新项目投决待办
+    getMyTaskDecisionNumber({ commit, state }) {
+      return new Promise(resolve => {
+        getMyTaskDecisionNumber().then(res => {
+          const decisionNum = parseInt(res.total);//项目投决
+          commit('SET_DECISIONNUM', decisionNum);
+        })
+      })
+    },
 
+    //更新项目终止待办
+    getMyTaskTerminationNumber({ commit, state }) {
+      return new Promise(resolve => {
+        getMyTaskTerminationNumber().then(res => {
+          const terminationNum = parseInt(res.total);//项目投决
+          commit('SET_TERMINATIONNUM', terminationNum);
+        })
+      })
+    }
   }
 }
 

+ 1 - 1
ruoyi-ui/src/views/invest/components/businessUpdate.vue

@@ -218,4 +218,4 @@ export default {
     },
   },
 };
-</script>
+</script>

+ 12 - 1
ruoyi-ui/src/views/login.vue

@@ -188,12 +188,23 @@ export default {
               let inspectNum = 0, //评估考察
                 projectLXNum = 0, //项目立项
                 dueNum = 0, //尽职背调
-                projectTJNum = 0; //项目投决
+                projectTJNum = 0,//项目投决
+                //我的任务下的菜单
+                investOppNum=0,//投资机会
+                approvalNum = 0, //项目立项
+              //let dueNum = store.getters.dueNum; //尽职背调
+                decisionNum = 0, //项目投决
+                terminationNum = 0; //项目终止
               // 获取代办任务数量
               this.$store.commit("SET_INSPECTNUM", inspectNum);
               this.$store.commit("SET_PROJECTLXNUM", projectLXNum);
               this.$store.commit("SET_DUENUM", dueNum);
               this.$store.commit("SET_PROJECTTJNUM", projectTJNum);
+              //我的任务下的代办任务数量
+              this.$store.commit("SET_INVESTOPPNUM", investOppNum);
+              this.$store.commit("SET_APPROVALNUM", approvalNum);
+              this.$store.commit("SET_DECISIONNUM", decisionNum);
+              this.$store.commit("SET_TERMINATIONNUM", terminationNum);
             })
             .catch(() => {
               this.loading = false;

+ 1 - 26
ruoyi-ui/src/views/project/termination/applyList.vue

@@ -86,18 +86,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          plain
-          :disabled="multiple"
-          type="warning"
-          size="mini"
-          icon="el-icon-document"
-          @click="handleSelectData(11)"
-          v-hasPermi="['invest:pool:tj:apply']"
-          >投决申请</el-button
-        >
-      </el-col>
       <el-col :span="1.5">
         <el-button
           plain
@@ -107,20 +95,7 @@
           icon="el-icon-document"
           @click="handleSelectData(14)"
           v-hasPermi="['invest:pool:zz:apply']"
-        >终止申请</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          @click="handleSelectData(4)"
-          type="danger"
-          plain
-          icon="el-icon-switch-button"
-          size="mini"
-          :disabled="multiple"
-          v-hasPermi="['invest:pool:remove']"
-        >终止</el-button
-        >
+        >终止申请</el-button>
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"