12741 -【bug】【投资系统】待办任务提醒的bug处理

ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -12,9 +12,13 @@ export default {
       type: String,
       default: "",
     },
+    path: {
+      type: String,
+      default: "",
+    },
   },
   render(h, context) {
-    const { icon, title } = context.props;
+    const { icon, title, path } = context.props;
     const vnodes = [];
 
     if (icon) {
@@ -62,27 +66,27 @@ export default {
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目机会" && investOppNum ? (
+            {icon === "#" && path.includes("/myTask") && title === "项目机会" && investOppNum ? (
               <span class="hint">{investOppNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目立项" && approvalNum ? (
+            {icon === "#" && path.includes("/myTask") && title === "项目立项" && approvalNum ? (
               <span class="hint">{approvalNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目背调" && investigateNum ? (
+            {icon === "#" && path.includes("/myTask") && title === "项目背调" && investigateNum ? (
               <span class="hint">{investigateNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目投决" && decisionNum ? (
+            {icon === "#"&& path.includes("/myTask")  && title === "项目投决" && decisionNum ? (
               <span class="hint">{decisionNum}</span>
             ) : (
               ""
             )}
-            {icon === "select" && title === "项目终止" && terminationNum ? (
+            {icon === "#" && path.includes("/myTask") && title === "项目终止" && terminationNum ? (
               <span class="hint">{terminationNum}</span>
             ) : (
               ""

ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -18,6 +18,7 @@
           <item
             :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"
             :title="onlyOneChild.meta.title"
+            :path="basePath"
           />
         </el-menu-item>
       </app-link>
@@ -34,6 +35,7 @@
           v-if="item.meta"
           :icon="item.meta && item.meta.icon"
           :title="item.meta.title"
+          :path="basePath"
         />
       </template>
       <sidebar-item

ruoyi-ui/src/views/project/decision/myTask.vue

@@ -630,7 +630,7 @@ export default {
       this.loading = true;
       // 调用待办任务接口（示例）
       getMyTaskList(this.queryParams).then((response) => {
-        console.log( response.rows);
+        //console.log( response.rows);
         this.myTaskList = response.rows; // 表格数据
         this.myTaskTotal = response.total; // 分页总条数
         this.loading = false;
@@ -803,7 +803,7 @@ export default {
     handleReadImage(row){
       this.readImage.title = "流程图";
       this.readImage.open = true;
-      console.log(row)
+      //console.log(row)
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
       flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
         this.flowData = res.data;

ruoyi-ui/src/views/project/investOpp/detail.vue

@@ -876,7 +876,7 @@ export default {
           formData.auditPass=flag;
           Object.assign(this.taskForm.variables, formData);
           this.taskForm.variables.formJson = this.formJson;
-          console.log(this.taskForm, "流程审批提交表单数据1")
+          //console.log(this.taskForm, "流程审批提交表单数据1")
         }).catch(error => {
           // this.$modal.msgError(error)
         })

ruoyi-ui/src/views/project/investigate/audit.vue

@@ -584,7 +584,7 @@ export default {
         this.duePeportForm.projectPoolId = this.dueForm.projectPoolId;
         this.duePeportForm.projectInvestigateId = this.dueForm.id;
         this.duePeportForm.listFile = this.reportFileList;
-        console.log(this.duePeportForm);
+        //console.log(this.duePeportForm);
         this.$refs["duePeportForm"].validate((valid) => {
           if (!valid) {
             allValid = false;

ruoyi-ui/src/views/project/investigate/dueDiligenceList.vue

@@ -943,7 +943,7 @@ export default {
     },
     // 上传尽调报告-按钮
     handleShowReportPop(row) {
-      console.log("row=", row);
+      //console.log("row=", row);
       let that = this;
       this.dueForm = row.tProjectInvestigate;
       this.dueForm.projectName = row.projectName;

ruoyi-ui/src/views/project/investigate/myTask.vue

@@ -627,7 +627,7 @@ export default {
       this.loading = true;
       // 调用待办任务接口（示例）
       getMyTaskList(this.queryParams).then((response) => {
-        console.log( response.rows);
+        //console.log( response.rows);
         this.myTaskList = response.rows; // 表格数据
         this.myTaskTotal = response.total; // 分页总条数
         this.loading = false;
@@ -800,7 +800,7 @@ export default {
     handleReadImage(row){
       this.readImage.title = "流程图";
       this.readImage.open = true;
-      console.log(row)
+      //console.log(row)
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
       flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
         this.flowData = res.data;