src/api/modules/role.js

@@ -1,44 +0,0 @@
-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,22 +100,72 @@ export default {
       this.$refs.addOrUpdate.toggle().add(this.formInline);
     },
     queryList(pageNo, pageSize) {
-      this.$api.role
+      console.log(FULL_ROUTERS);
-        .roleList({
+      this.data = FULL_ROUTERS.menuList;
-          ownerId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+
-            ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+      setTimeout(() => {
-            : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+        let data = [
-        })
+          {
-        .then((res) => {
+            col: "market_id",
-          console.log(res);
+            id: null,
-          this.$refs.oTable.complete(
+            name: "市场经营者",
-            res.data.data,
+            operator: "eq",
-            Number(res.data.total)
+            role: "ROLE_MANAGER",
-          );
+          },
-        })
+          {
-        .catch((err) => {
+            col: null,
-          this.$refs.oTable.complete(false);
+            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);
+      //     });
     },
     Reset() {
       this.formInline = {
@@ -159,9 +209,7 @@ 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,15 +56,14 @@ export default {
         add: (row) => {
           console.log(row);
           this.modalData = {
-            roleCode: "",
+            targetId: row.targetId,
-            name: "",
+            title: "",
-            col: "",
+            position: row.position,
-            operator: "",
+            type: 0,
-            remark: "",
+            status: true,
-            ownerId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            app: 1,
-              ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
-              : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
           };
+          this.fileList = [];
           this.modalConfig.title = "添加角色";
           this.isAdd = true;
         },
@@ -75,8 +74,6 @@ export default {
       };
     },
     init(row) {
-      console.log(row);
-
       this.modalData = row;
     },
   },
@@ -118,7 +115,7 @@ export default {
         },
         {
           label: "数据范围",
-          prop: "operator",
+          prop: "range",
           maxlength: "30",
           rules: {
             required: true,
@@ -129,7 +126,7 @@ export default {
           render: () => {
             return (
               <el-select
-                v-model={this.modalData.operator}
+                v-model={this.modalData.range}
                 placeholder="请选择销售单位"
               >
                 {[
@@ -161,8 +158,14 @@ export default {
           label: "备注",
           prop: "remark",
           type: "Textarea",
+          required: true,
           maxlength: "120",
           rows: "5",
+          rules: {
+            required: true,
+            message: "请输入备注内容",
+            trigger: "blur",
+          },
         },
       ];
     },
@@ -180,25 +183,18 @@ export default {
           submit: true,
           handle: () => {
             console.log(this.modalData);
-            if (this.isAdd) {
+            this.toggle();
-              this.$api.role.addRoleList(this.modalData).then((res) => {
+            // if (this.isAdd) {
-                this.toggle();
+            //   this.$api.mer_admin.noticeAdd(this.modalData).then((res) => {
-                this.$emit("queryList");
+            //     this.toggle();
-              });
+            //     this.$emit("queryList");
-            } else {
+            //   });
-              this.$api.role
+            // } else {
-                .updateRoleList({
+            //   this.$api.mer_admin.noticeUpdate(this.modalData).then((res) => {
-                  ...this.modalData,
+            //     this.toggle();
-                  ownerId: JSON.parse(sessionStorage.getItem("userInfo"))
+            //     this.$emit("queryList");
-                    .managerId
+            //   });
-                    ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            // }
-                    : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
-                })
-                .then((res) => {
-                  this.toggle();
-                  this.$emit("queryList");
-                });
-            }
           },
         },
       ];