Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

src/api/modules/role.js

@@ -0,0 +1,44 @@
+import $http from "@/utils/httpRequest.js";
+
+export const role = {
+  //角色列表
+  roleList: (data) => {
+    return $http.request({
+      url: `/merchant-api/role/list`,
+      method: "get",
+      params: data,
+    });
+  },
+  //新增角色列表
+  addRoleList: (data) => {
+    return $http.request({
+      url: `/merchant-api/role/add`,
+      method: "post",
+      data,
+    });
+  },
+  //编辑角色列表
+  updateRoleList: (data) => {
+    return $http.request({
+      url: `/merchant-api/role/update`,
+      method: "post",
+      data,
+    });
+  },
+  //更新角色权限
+  updateRoleList: (data) => {
+    return $http.request({
+      url: `/merchant-api/role/permission/update`,
+      method: "put",
+      data,
+    });
+  },
+  //获取角色权限列表
+  updateRoleList: (data) => {
+    return $http.request({
+      url: `/merchant-api/role/permission/update`,
+      method: "put",
+      data,
+    });
+  },
+};

src/views/modules/operation-management/role/index.vue

@@ -33,7 +33,7 @@
         </template>
       </obj-table-plus>
     </div>
-    <!-- 轮播图 -->
+    <!-- 新增角色 -->
     <addOrUpdate
       ref="addOrUpdate"
       @queryList="$refs.oTable.reload()"
@@ -100,72 +100,22 @@ export default {
       this.$refs.addOrUpdate.toggle().add(this.formInline);
     },
     queryList(pageNo, pageSize) {
-      console.log(FULL_ROUTERS);
-      this.data = FULL_ROUTERS.menuList;
-
-      setTimeout(() => {
-        let data = [
-          {
-            col: "market_id",
-            id: null,
-            name: "市场经营者",
-            operator: "eq",
-            role: "ROLE_MANAGER",
-          },
-          {
-            col: null,
-            id: null,
-            name: "商户",
-            operator: null,
-            role: "ROLE_MERCHANT",
-          },
-          {
-            col: null,
-            id: null,
-            name: "专员",
-            operator: null,
-            role: "ROLE_ASSISTANT",
-          },
-          {
-            col: null,
-            id: null,
-            name: "代理商",
-            operator: null,
-            role: "ROLE_AGENT",
-          },
-          {
-            col: "MarketId",
-            id: null,
-            name: "老师",
-            operator: null,
-            role: "123",
-          },
-          {
-            col: "",
-            id: null,
-            name: "测试",
-            operator: "",
-            role: "ROLE_cheshi",
-          },
-        ];
-        this.$refs.oTable.complete(data, Number(5));
-      }, 500);
-      //   this.$api.mer_admin
-      //     .noticePage({
-      //       pageNumber: pageNo,
-      //       pageSize: pageSize,
-      //       ...this.formInline,
-      //     })
-      //     .then((res) => {
-      //       console.log(res);
-      //       this.$refs.oTable.complete(
-      //         res.data.data.data,
-      //         Number(res.data.data.total)
-      //       );
-      //     })
-      //     .catch((err) => {
-      //       this.$refs.oTable.complete(false);
-      //     });
+      this.$api.role
+        .roleList({
+          ownerId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+        })
+        .then((res) => {
+          console.log(res);
+          this.$refs.oTable.complete(
+            res.data.data,
+            Number(res.data.total)
+          );
+        })
+        .catch((err) => {
+          this.$refs.oTable.complete(false);
+        });
     },
     Reset() {
       this.formInline = {
@@ -209,7 +159,9 @@ export default {
             let updateBanner = () => {
               this.$refs.addOrUpdate.toggle(row).update();
             };
-            let deleteBanner = () => {};
+            let deleteBanner = () => {
+              // this.$api.
+            }
             let onCancel = () => {};
             return (
               <div>

src/views/modules/operation-management/role/popup/add-or-update.vue

@@ -56,14 +56,15 @@ export default {
         add: (row) => {
           console.log(row);
           this.modalData = {
-            targetId: row.targetId,
-            title: "",
-            position: row.position,
-            type: 0,
-            status: true,
-            app: 1,
+            roleCode: "",
+            name: "",
+            col: "",
+            operator: "",
+            remark: "",
+            ownerId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+              ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+              : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
           };
-          this.fileList = [];
           this.modalConfig.title = "添加角色";
           this.isAdd = true;
         },
@@ -74,6 +75,8 @@ export default {
       };
     },
     init(row) {
+      console.log(row);
+
       this.modalData = row;
     },
   },
@@ -115,7 +118,7 @@ export default {
         },
         {
           label: "数据范围",
-          prop: "range",
+          prop: "operator",
           maxlength: "30",
           rules: {
             required: true,
@@ -126,7 +129,7 @@ export default {
           render: () => {
             return (
               <el-select
-                v-model={this.modalData.range}
+                v-model={this.modalData.operator}
                 placeholder="请选择销售单位"
               >
                 {[
@@ -158,14 +161,8 @@ export default {
           label: "备注",
           prop: "remark",
           type: "Textarea",
-          required: true,
           maxlength: "120",
           rows: "5",
-          rules: {
-            required: true,
-            message: "请输入备注内容",
-            trigger: "blur",
-          },
         },
       ];
     },
@@ -183,18 +180,25 @@ export default {
           submit: true,
           handle: () => {
             console.log(this.modalData);
-            this.toggle();
-            // if (this.isAdd) {
-            //   this.$api.mer_admin.noticeAdd(this.modalData).then((res) => {
-            //     this.toggle();
-            //     this.$emit("queryList");
-            //   });
-            // } else {
-            //   this.$api.mer_admin.noticeUpdate(this.modalData).then((res) => {
-            //     this.toggle();
-            //     this.$emit("queryList");
-            //   });
-            // }
+            if (this.isAdd) {
+              this.$api.role.addRoleList(this.modalData).then((res) => {
+                this.toggle();
+                this.$emit("queryList");
+              });
+            } else {
+              this.$api.role
+                .updateRoleList({
+                  ...this.modalData,
+                  ownerId: JSON.parse(sessionStorage.getItem("userInfo"))
+                    .managerId
+                    ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+                    : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+                })
+                .then((res) => {
+                  this.toggle();
+                  this.$emit("queryList");
+                });
+            }
           },
         },
       ];