Bläddra i källkod

Merge branch 'master' of http://192.168.101.10:13000/gogs/jiaoyuju

yrik 4 år sedan
förälder
incheckning
ab1d9ff641
1 ändrade filer med 49 tillägg och 4 borttagningar
  1. 49 4
      ruoyi-ui/src/views/system/table/index.vue

+ 49 - 4
ruoyi-ui/src/views/system/table/index.vue

@@ -28,8 +28,28 @@
           </el-collapse-item>
         </el-form>
         <div>
-          <el-dialog :close-on-click-modal="false" title="流程进度" :visible.sync="modalShow" width="980px" append-to-body>
-           <Flowshoe  :instanceId="instanceId"></Flowshoe>
+          <el-dialog :close-on-click-modal="false" title="选择人员" :visible.sync="modalShow" width="980px" append-to-body>
+           <!-- <Flowshoe  :instanceId="instanceId"></Flowshoe> -->
+          <div class="tab_bott">
+            <div class="tabBot_oje">
+              <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+                  <el-tab-pane label="按部门" name="first">用户管理</el-tab-pane>
+                  <el-tab-pane label="按角色" name="second">配置管理</el-tab-pane>
+                  <el-tab-pane label="按组" name="third">角色管理</el-tab-pane>
+                </el-tabs>
+            </div>
+            <div class="tabBot_two">
+              <el-card class="box-card" shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>人员对应的单位</span>
+                  <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
+                </div>
+                <ul class="infinite-list infinite-listty" v-infinite-scroll="load" style="overflow:auto">
+                 <li v-for="i in count" class="infinite-list-item">{{ i }}</li>
+                </ul>
+              </el-card>
+            </div>
+          </div>
           </el-dialog>
         </div>
       </el-collapse>
@@ -113,7 +133,9 @@
           businessCode:0
         },
         instanceId: 0,
-        modalShow:false
+        modalShow:false,
+        // 无限滚动
+        count: 0
       };
     },
     mounted() {
@@ -432,6 +454,9 @@
           this.$store.dispatch("tagsView/delView", this.$route);
           this.$router.go(-1)
         })
+      },
+      load(){
+        this.count += 2
       }
     },
   };
@@ -479,7 +504,19 @@
       border-top: 0;
     }
   }
-
+   .infinite-list{
+     height: 200px;
+   }
+   .tab_bott{
+     display: flex;
+   }
+  .tabBot_oje{
+    width: 40%;
+  }
+  .tabBot_two{
+    width: 50%;
+    margin-left: 30px;
+  }
 </style>
 
 
@@ -535,6 +572,14 @@
     right: 0;
     top: 5px;
   }
+  .infinite-list{
+    // border: 1px solid #eee;
+    padding: 30px;
+  }
+  .infinite-listty{
+    margin-top: 20px;
+    // border: 1px solid #eee;
+  }
 </style>