5.0

sop-admin/sop-admin-frontend/src/api/isvList.ts

@@ -11,7 +11,7 @@ const apiUrl: any = createUrl({
   updateStatus: "/isv/updateStatus",
   createKeys: "/isv/createKeys",
   updateKeys: "/isv/updateKeys",
-  listGroup: "perm/isv/group/listIsvCode",
+  listGroup: "perm/isv/group/listIsvGroupId",
   updateGroup: "perm/isv/group/setting"
 });
 
@@ -104,11 +104,11 @@ export const api: any = {
    */
   updateGroup(
     isvId: Number,
-    groupCodes: Array<string>
+    groupIds: Array<number>
   ): Promise<Result<KeyStore>> {
     const data = {
       isvId: isvId,
-      groupCodeList: groupCodes
+      groupIds: groupIds
     };
     return http.post<Result<any>, any>(apiUrl.updateGroup, { data });
   }

sop-admin/sop-admin-frontend/src/views/isv/list/index.ts

@@ -156,7 +156,6 @@ actionButtons.value = [
   {
     // 启用/禁用
     text: row => (row.status === StatusEnum.ENABLE ? "禁用" : "启用"),
-    code: "delete",
     confirm: {
       message: data => {
         const opt = data.row.status === StatusEnum.ENABLE ? "禁用" : "启用";

sop-admin/sop-admin-frontend/src/views/isv/list/isvGroup.ts

@@ -11,7 +11,7 @@ import { search } from "@/views/isv/list/index";
 export const dlgGroupSetting = ref(false);
 export const settingGroupFormData = ref<any>({
   isvId: 0,
-  groupCodeList: []
+  groupIds: []
 });
 
 const groupList: Ref<OptionsRow[]> = ref([]);
@@ -28,7 +28,7 @@ const loadGroup = () => {
     groupList.value = rows.map(row => {
       return {
         label: row.groupName,
-        value: row.groupCode
+        value: row.id
       };
     });
   });
@@ -39,7 +39,7 @@ export const groupColumns: PlusColumn[] = [
   {
     label: "分组",
     width: 120,
-    prop: "groupCodeList",
+    prop: "groupIds",
     valueType: "checkbox",
     // options推荐写法
     // 3. 用 computed 返回 ref 的 value
@@ -51,7 +51,7 @@ export const settingGroup = (row: any) => {
   api.listGroup(row.id).then(resp => {
     settingGroupFormData.value = {
       isvId: row.id,
-      groupCodeList: resp.data
+      groupIds: resp.data
     };
     dlgGroupSetting.value = true;
   });
@@ -60,7 +60,7 @@ export const settingGroup = (row: any) => {
 export const handleUpdateGroup = () => {
   const data = settingGroupFormData.value;
 
-  api.updateGroup(data.isvId, data.groupCodeList).then(() => {
+  api.updateGroup(data.isvId, data.groupIds).then(() => {
     ElMessage({
       message: "保存成功",
       type: "success"

sop-admin/sop-admin-frontend/src/views/isv/perm/permGroup.ts

@@ -14,7 +14,6 @@ const isAdd = ref(false);
 
 // 查询表单对象
 export const searchFormData = ref({
-  groupCode: "",
   groupName: "",
   pageIndex: 1,
   pageSize: 10
@@ -23,11 +22,7 @@ export const searchFormData = ref({
 // 查询表单字段定义
 export const searchFormColumns: PlusColumn[] = [
   {
-    label: "分组代码",
-    prop: "groupCode"
-  },
-  {
-    label: "角色描述",
+    label: "分组描述",
     prop: "groupName"
   }
 ];
@@ -47,11 +42,7 @@ pageInfo.value.pageSize = 10;
 // 表格字段定义
 export const tableColumns: PlusColumn[] = [
   {
-    label: "分组代码",
-    prop: "groupCode"
-  },
-  {
-    label: "角色描述",
+    label: "分组名称",
     prop: "groupName"
   },
   {
@@ -93,7 +84,7 @@ actionButtons.value = [
       options: { draggable: false }
     },
     onConfirm(params: ButtonsCallBackParams) {
-      api.del(params).then(() => {
+      api.del(params.row).then(() => {
         ElMessage({
           message: "删除成功",
           type: "success"
@@ -113,25 +104,18 @@ export const dlgTitle = ref("");
 // 表单值
 const editFormDataGen = () => {
   return {
-    groupCode: "",
     groupName: ""
   };
 };
 export const editFormData = ref<any>(editFormDataGen());
 export const editFormRules = {
-  groupCode: [{ required: true, message: "请输入角色代码" }],
-  groupName: [{ required: true, message: "请输入角色描述" }]
+  groupName: [{ required: true, message: "请输入分组描述" }]
 };
 
 // 表单内容
 export const editFormColumns: PlusColumn[] = [
   {
-    label: "分组代码",
-    prop: "groupCode",
-    valueType: "input"
-  },
-  {
-    label: "角色描述",
+    label: "分组名称",
     prop: "groupName",
     valueType: "input"
   }