更新

ruoyi-ui/src/components/HistoricalProcess/index.vue

@@ -48,6 +48,7 @@ export default {
   name: "HistoricalProcess",
   components: { FormItemComponent, StandardTabletwo, FlowChartShow },
   props: {
+    falg: { type: Number, default: null },
     tabalive: { type: String, default: "" }
   },
   data() {
@@ -144,7 +145,6 @@ export default {
         pageSize: 10,
         searchType: "0,1",
         excuStatus: 2,
-        userId: store.getters.userId,
         updateTime: []
       },
 
@@ -344,6 +344,9 @@ export default {
     }
   },
   created() {
+    if(this.falg){
+      this.searchData.userId = store.getters.userId
+    }
     this.getselectOption();
     this.queryLists();
   }

ruoyi-ui/src/components/todoProcess/index.vue

@@ -80,6 +80,7 @@ export default {
 
   },
   props: {
+    falg: { type: Number, default: null },
     tabalive: { type: String, default: "" }
   },
   data() {
@@ -184,7 +185,7 @@ export default {
         pageSize: 10,
         searchType: "0,1",
         excuStatus: 0,
-        userId: store.getters.userId,
+        userId: null,
         createTime: []
       },
       //表格数据
@@ -492,6 +493,9 @@ export default {
     }
   },
   created() {
+    if(this.falg){
+      this.searchData.userId = store.getters.userId
+    }
     this.getselectOption();
     this.queryLists();
   },

ruoyi-ui/src/router/index.js

@@ -75,14 +75,14 @@ export const constantRoutes = [
         hidden: false,
         component: approval,
         name: '待我审批',
-        meta: { title: '待我审批', icon: '', noCache: false},
+        meta: { title: '待我审批', icon: 'dashboard', noCache: false},
       },
       {
         path: 'index/handled',
         hidden: false,
         component: handled,
         name: '已办理',
-        meta: { title: '已办理', icon: '', noCache: false},
+        meta: { title: '已办理', icon: 'dashboard', noCache: false},
       },
       // {
       //   path: 'index/process',

ruoyi-ui/src/views/workbench/approval/index.vue

@@ -5,7 +5,7 @@
         <BreadcrumbItem  v-if="tabalive==='历史流程'"  @click.native="routeClick(2)">历史流程</BreadcrumbItem>
     </Breadcrumb> -->
     <!-- <Tabs :value="tabalive" @on-click="onClick"> -->
-        <TabPane label="待办流程" name="待办流程"><todoProcess v-if="tabalive === '待办流程'" :tabalive="tabalive"></todoProcess></TabPane>
+        <TabPane label="待办流程" name="待办流程"><todoProcess :falg="1" v-if="tabalive === '待办流程'" :tabalive="tabalive"></todoProcess></TabPane>
         <!-- <TabPane label="历史流程" name="历史流程"><HistoricalProcess v-if="tabalive === '历史流程'" :tabalive="tabalive"></HistoricalProcess></TabPane> -->
     <!-- </Tabs> -->
     </div>

ruoyi-ui/src/views/workbench/handled/index.vue

@@ -6,7 +6,7 @@
     </Breadcrumb> -->
     <!-- <Tabs :value="tabalive" @on-click="onClick"> -->
         <!-- <TabPane label="待办流程" name="待办流程"><todoProcess v-if="tabalive === '待办流程'" :tabalive="tabalive"></todoProcess></TabPane> -->
-        <TabPane label="历史流程" name="历史流程"><HistoricalProcess v-if="tabalive === '历史流程'" :tabalive="tabalive"></HistoricalProcess></TabPane>
+        <TabPane label="历史流程" name="历史流程"><HistoricalProcess :falg="1" v-if="tabalive === '历史流程'" :tabalive="tabalive"></HistoricalProcess></TabPane>
     <!-- </Tabs> -->
     </div>
 </template>