角色

src/views/flowable/startMyProcess/index.vue

@@ -25,7 +25,7 @@
         </el-dropdown>
       </div>
 
-      <el-row>
+      <el-row :gutter="15">
         <el-col :span="12" v-for="row in records" :key="row.name">
           <div
             class="filter-container"
@@ -59,12 +59,16 @@
           </div>
         </el-col>
       </el-row>
-      <pagination
-        v-show="total > 0"
+      <el-pagination
+        :current-page="listQuery.current"
+        :page-size="listQuery.size"
         :total="total"
-        :current.sync="listQuery.current"
-        :size.sync="listQuery.size"
-        @pagination="list"
+        :background="true"
+        @size-change="(d) => (page.limit = d) && query()"
+        @current-change="(d) => (page.page = d) && query()"
+        layout="total, prev, pager, next, jumper"
+        :pager-count="5"
+        class="ele-pagination-circle"
       />
     </el-card>
 
@@ -201,3 +205,14 @@
     }
   };
 </script>
+<style scoped>
+  .filter-container .filter-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 5px;
+    margin-right: 4px;
+  }
+  .filter-container {
+    padding-bottom: 5px;
+  }
+</style>

src/views/system/role/components/role-edit.vue

@@ -120,8 +120,9 @@
         if (visible) {
           if (this.data != null) {
             this.$util.assignObject(this.form, this.data);
-            this.form = this.data;
+            // this.form = this.data;
             this.isUpdate = true;
+            console.log(1111111);
           } else {
             this.isUpdate = false;
           }

src/views/system/role/index.vue

@@ -173,7 +173,8 @@
         // 是否显示编辑弹窗
         showEdit: false,
         // 是否显示导入弹窗
-        showAuth: false
+        showAuth: false,
+        isUpdate: false
       };
     },
     created() {},
@@ -199,13 +200,21 @@
       },
       /* 显示编辑 */
       openEdit(row) {
-        this.current = Object.assign({}, row);
-
+        if (row) {
+          this.current = Object.assign({}, row);
+        } else {
+          this.current = null;
+        }
         this.showEdit = true;
       },
       /* 显示分配权限 */
       openAuth(row) {
-        this.current = Object.assign({}, row);
+        if (row) {
+          this.isUpdate = true;
+          this.current = Object.assign({}, row);
+        } else {
+          this.isUpdate = false;
+        }
 
         this.showAuth = true;
       },