@pubinfo/module-rbac 2.2.0-beta.2 → 2.2.0-beta.3

package/src/api/modules/rbac/yonghujiekou.ts

@@ -1,5 +1,30 @@
 import { basic as request } from '@/api/request';
 
+/**
+ * @description 验证码-修改登录密码
+ * @url /rbac/user/captcha/changePasswordWithVerifyCode
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserCaptchaChangePasswordWithVerifyCode<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.postRbacUserCaptchaChangePasswordWithVerifyCodeParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>(
+    '/rbac/user/captcha/changePasswordWithVerifyCode',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
 /**
  * @description 修改登录密码
  * @url /rbac/user/changePassword
@@ -75,6 +100,85 @@ export function postRbacUserChangePasswordWithVerifyCode<
   );
 }
 
+/**
+ * @description 根据id查询
+ * @url /rbac/user/getUser
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUser<
+  R = API.ResponseDataPubUser,
+  T = API.ResponseDataPubUser,
+>(
+  params: API.postRbacUserGetUserParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>(
+    '/rbac/user/getUser',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
+/**
+ * @description 通过用户ID查询用户们
+ * @url /rbac/user/getUserList
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUserList<
+  R = API.ResponseDataListPubUser,
+  T = API.ResponseDataListPubUser,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/getUserList', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 获得指定组织的用户数组
+ * @url /rbac/user/getUserListByOrgIds
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUserListByOrgIds<
+  R = API.ResponseDataListPubUser,
+  T = API.ResponseDataListPubUser,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/getUserListByOrgIds', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 获得指定岗位的用户数组
+ * @url /rbac/user/getUserListByPostIds
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUserListByPostIds<
+  R = API.ResponseDataListPubUser,
+  T = API.ResponseDataListPubUser,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/getUserListByPostIds', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 编辑角色和授权数据权限
  * @url /rbac/user/grantUserRoleAndDatPermission
@@ -325,3 +429,21 @@ export function postRbacUserUserUpdateV2<
     ...(options || {}),
   });
 }
+
+/**
+ * @description 校验用户们是否有效
+ * @url /rbac/user/validateUserList
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserValidateUserList<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/validateUserList', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}

package/src/api/modules/rbac/ziyuanjiekou.ts

@@ -160,6 +160,27 @@ export function postRbacResourceMineOrAllResourceTree<
   );
 }
 
+/**
+ * @description 资源拖拉拽更新
+ * @url /rbac/resource/reSortUpdate
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacResourceReSortUpdate<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  body: API.PubResourceReSortUpdateDTO[],
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>('/rbac/resource/reSortUpdate', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 资源删除
  * @url /rbac/resource/resourceDelete

package/src/api/modules/rbac/zuzhijiekou.ts

@@ -187,3 +187,21 @@ export function postRbacOrgUpdateOrg<
     ...(options || {}),
   });
 }
+
+/**
+ * @description 校验组织们是否有效
+ * @url /rbac/org/validateOrgList
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacOrgValidateOrgList<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/org/validateOrgList', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}

package/src/views/organization/components/drawerOrganization.vue

@@ -5,6 +5,7 @@ import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
 import { getDictItemList } from '@/api/modules/configData';
 import { getRbacOrgInfo, postRbacOrgAddOrg, postRbacOrgUpdateOrg } from '@/api/modules/rbac';
+import { selectUser } from '@/components/OrgUserSelector';
 import { ACTION } from '../enum';
 
 defineOptions({
@@ -41,13 +42,25 @@ getDictItemList({ dictCode: 'orgType' }).then((res: API.ResponseDataListDictItem
   });
 });
 const form = ref<Partial<API.PubOrg & { parentName: string }>>({ parentId: '', enable: true });
+const selectedUsers = ref<
+  {
+    orgId?: string
+    userId?: string
+    userName?: string
+  }[]>([]);
 async function onOpen(key: ACTION, record?: API.PubOrg) {
   setOpen(true);
   state.title = key;
+  selectedUsers.value = [];
   if (key === ACTION.EDIT) {
     const res = await getRbacOrgInfo({ id: record?.id as string });
     if (res.success) {
       form.value = res.data ?? {};
+      selectedUsers.value = [{
+        orgId: res.data?.leaderUserOrgId ?? '',
+        userId: res.data?.leaderUserId ?? '',
+        userName: res.data?.leaderUserName ?? '',
+      }];
     }
   }
   else if (key === ACTION.ADDNEXT) {
@@ -67,12 +80,34 @@ async function onOpen(key: ACTION, record?: API.PubOrg) {
   }
 }
 
+function chooseLeader() {
+  selectUser({
+    modelValue: selectedUsers.value, // 回显时选中的数据
+    multiple: false,
+    onSubmit(selected = []) {
+      // console.log(selected); // 点击确认后返回选中的数据
+      selectedUsers.value = selected.map((user) => {
+        return {
+          orgId: user.orgId as string,
+          userId: user.userId as string,
+          userName: user.userName as string,
+        };
+      });
+    },
+  });
+}
+
 const [loading, setLoading] = useToggle(false);
 function onSubmit() {
   const request = state.title === ACTION.EDIT ? postRbacOrgUpdateOrg : postRbacOrgAddOrg;
   formRef.value?.validate().then(() => {
     setLoading(true);
     const params: any = { ...form.value };
+    if (selectedUsers.value.length > 0) {
+      params.leaderUserId = selectedUsers.value[0].userId;
+      params.leaderUserName = selectedUsers.value[0].userName;
+      params.leaderUserOrgId = selectedUsers.value[0].orgId;
+    }
     request(params)
       .then((res: API.ResponseDataPubOrg) => {
         if (res.success) {
@@ -137,6 +172,14 @@ defineExpose({
       <a-form-item label="排序">
         <a-input-number v-model:value="form.sort" />
       </a-form-item>
+      <a-form-item label="组织负责人">
+        <div flex items-center>
+          <span v-if="selectedUsers.length > 0" mr-6px>{{ selectedUsers[0]?.userName }}</span>
+          <a-button type="primary" @click="chooseLeader">
+            选择负责人
+          </a-button>
+        </div>
+      </a-form-item>
       <a-form-item label="统一社会信用代码" name="creditCode">
         <a-input v-model:value="form.creditCode" />
       </a-form-item>

package/dist/api/modules/assist/gonggaofuwu.d.ts

@@ -1,43 +0,0 @@
-import { basic as request } from '@/api/request';
-/**
- * @description 删除公告服务
- * @url /notice/deleteNotice
- * @method GET
- * @author @pubinfo/openapi
- */
-export declare function getNoticeDeleteNotice<R = API.ResponseData, T = API.ResponseData>(params: API.getNoticeDeleteNoticeParams, options?: Parameters<typeof request.Get<R, T>>[1]): import("alova").Method<import("alova").RespondedAlovaGenerics<import("pubinfo").AG, R, T>>;
-/**
- * @description 删除公告推送基本信息
- * @url /notice/deleteNoticeSend
- * @method GET
- * @author @pubinfo/openapi
- */
-export declare function getNoticeDeleteNoticeSend<R = API.ResponseData, T = API.ResponseData>(params: API.getNoticeDeleteNoticeSendParams, options?: Parameters<typeof request.Get<R, T>>[1]): import("alova").Method<import("alova").RespondedAlovaGenerics<import("pubinfo").AG, R, T>>;
-/**
- * @description 公告服务详情
- * @url /notice/detailNotice
- * @method GET
- * @author @pubinfo/openapi
- */
-export declare function getNoticeDetailNotice<R = API.ResponseData, T = API.ResponseData>(params: API.getNoticeDetailNoticeParams, options?: Parameters<typeof request.Get<R, T>>[1]): import("alova").Method<import("alova").RespondedAlovaGenerics<import("pubinfo").AG, R, T>>;
-/**
- * @description 公告分页查询
- * @url /notice/pageNotice
- * @method POST
- * @author @pubinfo/openapi
- */
-export declare function postNoticePageNotice<R = API.ResponseDataPageDataPubNotice, T = API.ResponseDataPageDataPubNotice>(body: API.PubNoticePageDto, options?: Parameters<typeof request.Post<R, T>>[2]): import("alova").Method<import("alova").RespondedAlovaGenerics<import("pubinfo").AG, R, T>>;
-/**
- * @description 新增或编辑公告服务
- * @url /notice/saveOrUpdateNotice
- * @method POST
- * @author @pubinfo/openapi
- */
-export declare function postNoticeSaveOrUpdateNotice<R = API.ResponseData, T = API.ResponseData>(body: API.PubNoticeDto, options?: Parameters<typeof request.Post<R, T>>[2]): import("alova").Method<import("alova").RespondedAlovaGenerics<import("pubinfo").AG, R, T>>;
-/**
- * @description 新增或编辑公告推送基本信息
- * @url /notice/saveOrUpdateNoticeSend
- * @method POST
- * @author @pubinfo/openapi
- */
-export declare function postNoticeSaveOrUpdateNoticeSend<R = API.ResponseData, T = API.ResponseData>(body: API.PubNoticeSendDto, options?: Parameters<typeof request.Post<R, T>>[2]): import("alova").Method<import("alova").RespondedAlovaGenerics<import("pubinfo").AG, R, T>>;

package/dist/drawerOrganization-DWhTc1fB.js

@@ -1,253 +0,0 @@
-import { r as e } from "./chunk-WQLz0Won.js";
-import { n as t } from "./dist-DxAYQq3U.js";
-import { l as n, n as r, o as i } from "./rbac-B59CVHDt.js";
-import { r as a } from "./index.js";
-import { createBlock as o, createCommentVNode as s, createTextVNode as c, createVNode as l, defineComponent as u, isRef as d, openBlock as f, reactive as p, ref as m, toDisplayString as h, unref as g, withCtx as _ } from "vue";
-import { message as v } from "ant-design-vue";
-import { Button as y, Drawer as b, Form as x, FormItem as S, Input as C, InputNumber as w, Select as T, Space as E, Switch as D } from "ant-design-vue/es";
-//#region src/views/organization/enum.ts
-var O = /* @__PURE__ */ function(e) {
-	return e.AUTHORIZE = "授权", e.ADD = "新增", e.ADDNEXT = "新增下级", e.EDIT = "编辑", e.REMOVE = "删除", e;
-}({}), k = /* @__PURE__ */ function(e) {
-	return e.OWNER = "1", e.ALL = "2", e;
-}({}), A = /* @__PURE__ */ function(e) {
-	return e[e.ON = 1] = "ON", e[e.OFF = 0] = "OFF", e;
-}({});
-k.OWNER, k.ALL, A.ON, A.OFF;
-//#endregion
-//#region src/views/organization/components/drawerOrganization.vue?vue&type=script&setup=true&lang.ts
-var j = /* @__PURE__ */ u({
-	name: "OrganizationEdit",
-	__name: "drawerOrganization",
-	emits: ["submit"],
-	setup(e, { expose: u, emit: k }) {
-		let A = k, j = {
-			name: [{
-				required: !0,
-				message: "请输入组织名称",
-				trigger: "blur"
-			}, {
-				max: 128,
-				message: "长度不能超过128位",
-				trigger: "change"
-			}],
-			code: [{
-				required: !0,
-				message: "请输入组织编码",
-				trigger: "blur"
-			}, {
-				max: 50,
-				message: "长度不能超过50位",
-				trigger: "change"
-			}],
-			type: [{
-				required: !0,
-				message: "请输入组织类型",
-				trigger: "blur"
-			}],
-			areaCode: [{
-				max: 16,
-				message: "长度不能超过16位",
-				trigger: "change"
-			}],
-			creditCode: [{
-				max: 50,
-				message: "长度不能超过50位",
-				trigger: "change"
-			}],
-			contactPerson: [{
-				max: 50,
-				message: "长度不能超过50位",
-				trigger: "change"
-			}],
-			contactMobile: [{
-				max: 20,
-				message: "长度不能超过20位",
-				trigger: "change"
-			}]
-		}, M = p({
-			title: "",
-			type: ""
-		}), [N, P] = t(!1), F = m(), I = m([]);
-		a({ dictCode: "orgType" }).then((e) => {
-			I.value = e.data?.map((e) => ({
-				label: e.dictLabel,
-				value: e.dictValue
-			}));
-		});
-		let L = m({
-			parentId: "",
-			enable: !0
-		});
-		async function R(e, t) {
-			if (P(!0), M.title = e, e === O.EDIT) {
-				let e = await r({ id: t?.id });
-				e.success && (L.value = e.data ?? {});
-			} else e === O.ADDNEXT ? L.value = {
-				parentName: t?.name,
-				parentId: t?.id,
-				enable: !0,
-				district: !1
-			} : L.value = {
-				parentId: "",
-				enable: !0,
-				district: !1
-			};
-		}
-		let [z, B] = t(!1);
-		function V() {
-			let e = M.title === O.EDIT ? n : i;
-			F.value?.validate().then(() => {
-				B(!0), e({ ...L.value }).then((e) => {
-					e.success && (v.success(`${M.title}成功！`), P(!1), A("submit", { ...L.value }));
-				}).finally(() => B(!1));
-			});
-		}
-		function H() {
-			L.value = { enable: !1 }, P(!1);
-		}
-		return u({ open: R }), (e, t) => {
-			let n = S, r = C, i = T, a = D, u = w, p = x, m = y, v = E, O = b;
-			return f(), o(O, {
-				open: g(N),
-				"onUpdate:open": t[11] ||= (e) => d(N) ? N.value = e : null,
-				title: `${g(M).title}组织`,
-				placement: "right",
-				width: 600,
-				"destroy-on-close": "",
-				"footer-style": { textAlign: "right" },
-				onClose: H
-			}, {
-				footer: _(() => [l(v, null, {
-					default: _(() => [l(m, { onClick: H }, {
-						default: _(() => [...t[12] ||= [c(" 取消 ", -1)]]),
-						_: 1
-					}), l(m, {
-						type: "primary",
-						loading: g(z),
-						onClick: t[10] ||= (e) => V()
-					}, {
-						default: _(() => [...t[13] ||= [c(" 提交 ", -1)]]),
-						_: 1
-					}, 8, ["loading"])]),
-					_: 1
-				})]),
-				default: _(() => [l(p, {
-					ref_key: "formRef",
-					ref: F,
-					model: g(L),
-					rules: j,
-					"label-col": { span: 6 },
-					"label-wrap": !0
-				}, {
-					default: _(() => [
-						g(L).parentId !== "" && g(L).parentId !== "0" ? (f(), o(n, {
-							key: 0,
-							label: "所属上级"
-						}, {
-							default: _(() => [c(h(g(L).parentName), 1)]),
-							_: 1
-						})) : s("", !0),
-						l(n, {
-							label: "组织名称",
-							name: "name"
-						}, {
-							default: _(() => [l(r, {
-								value: g(L).name,
-								"onUpdate:value": t[0] ||= (e) => g(L).name = e
-							}, null, 8, ["value"])]),
-							_: 1
-						}),
-						l(n, {
-							label: "组织编码",
-							name: "code"
-						}, {
-							default: _(() => [l(r, {
-								value: g(L).code,
-								"onUpdate:value": t[1] ||= (e) => g(L).code = e
-							}, null, 8, ["value"])]),
-							_: 1
-						}),
-						l(n, {
-							label: "组织类型",
-							name: "type"
-						}, {
-							default: _(() => [l(i, {
-								value: g(L).type,
-								"onUpdate:value": t[2] ||= (e) => g(L).type = e,
-								options: g(I)
-							}, null, 8, ["value", "options"])]),
-							_: 1
-						}),
-						l(n, { label: "是否行政区划" }, {
-							default: _(() => [l(a, {
-								checked: g(L).district,
-								"onUpdate:checked": t[3] ||= (e) => g(L).district = e
-							}, null, 8, ["checked"])]),
-							_: 1
-						}),
-						g(L).district ? (f(), o(n, {
-							key: 1,
-							label: "行政区划编码",
-							name: "areaCode"
-						}, {
-							default: _(() => [l(r, {
-								value: g(L).areaCode,
-								"onUpdate:value": t[4] ||= (e) => g(L).areaCode = e
-							}, null, 8, ["value"])]),
-							_: 1
-						})) : s("", !0),
-						l(n, { label: "是否启用" }, {
-							default: _(() => [l(a, {
-								checked: g(L).enable,
-								"onUpdate:checked": t[5] ||= (e) => g(L).enable = e
-							}, null, 8, ["checked"])]),
-							_: 1
-						}),
-						l(n, { label: "排序" }, {
-							default: _(() => [l(u, {
-								value: g(L).sort,
-								"onUpdate:value": t[6] ||= (e) => g(L).sort = e
-							}, null, 8, ["value"])]),
-							_: 1
-						}),
-						l(n, {
-							label: "统一社会信用代码",
-							name: "creditCode"
-						}, {
-							default: _(() => [l(r, {
-								value: g(L).creditCode,
-								"onUpdate:value": t[7] ||= (e) => g(L).creditCode = e
-							}, null, 8, ["value"])]),
-							_: 1
-						}),
-						l(n, {
-							label: "联系人",
-							name: "contactPerson"
-						}, {
-							default: _(() => [l(r, {
-								value: g(L).contactPerson,
-								"onUpdate:value": t[8] ||= (e) => g(L).contactPerson = e
-							}, null, 8, ["value"])]),
-							_: 1
-						}),
-						l(n, {
-							label: "联系方式",
-							name: "contactMobile"
-						}, {
-							default: _(() => [l(r, {
-								value: g(L).contactMobile,
-								"onUpdate:value": t[9] ||= (e) => g(L).contactMobile = e
-							}, null, 8, ["value"])]),
-							_: 1
-						})
-					]),
-					_: 1
-				}, 8, ["model"])]),
-				_: 1
-			}, 8, ["open", "title"]);
-		};
-	}
-}), M = /* @__PURE__ */ e({ default: () => N }), N = j;
-//#endregion
-export { M as n, O as r, N as t };

package/src/api/modules/assist/gonggaofuwu.ts

@@ -1,124 +0,0 @@
-import { basic as request } from '@/api/request';
-
-/**
- * @description 删除公告服务
- * @url /notice/deleteNotice
- * @method GET
- * @author @pubinfo/openapi
- */
-export function getNoticeDeleteNotice<
-  R = API.ResponseData,
-  T = API.ResponseData,
->(
-  params: API.getNoticeDeleteNoticeParams,
-  options?: Parameters<typeof request.Get<R, T>>[1],
-) {
-  return request.Get<R, T>('/notice/deleteNotice', {
-    params: {
-      ...params,
-    },
-    ...(options || {}),
-  });
-}
-
-/**
- * @description 删除公告推送基本信息
- * @url /notice/deleteNoticeSend
- * @method GET
- * @author @pubinfo/openapi
- */
-export function getNoticeDeleteNoticeSend<
-  R = API.ResponseData,
-  T = API.ResponseData,
->(
-  params: API.getNoticeDeleteNoticeSendParams,
-  options?: Parameters<typeof request.Get<R, T>>[1],
-) {
-  return request.Get<R, T>('/notice/deleteNoticeSend', {
-    params: {
-      ...params,
-    },
-    ...(options || {}),
-  });
-}
-
-/**
- * @description 公告服务详情
- * @url /notice/detailNotice
- * @method GET
- * @author @pubinfo/openapi
- */
-export function getNoticeDetailNotice<
-  R = API.ResponseData,
-  T = API.ResponseData,
->(
-  params: API.getNoticeDetailNoticeParams,
-  options?: Parameters<typeof request.Get<R, T>>[1],
-) {
-  return request.Get<R, T>('/notice/detailNotice', {
-    params: {
-      ...params,
-    },
-    ...(options || {}),
-  });
-}
-
-/**
- * @description 公告分页查询
- * @url /notice/pageNotice
- * @method POST
- * @author @pubinfo/openapi
- */
-export function postNoticePageNotice<
-  R = API.ResponseDataPageDataPubNotice,
-  T = API.ResponseDataPageDataPubNotice,
->(
-  body: API.PubNoticePageDto,
-  options?: Parameters<typeof request.Post<R, T>>[2],
-) {
-  return request.Post<R, T>('/notice/pageNotice', body, {
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    ...(options || {}),
-  });
-}
-
-/**
- * @description 新增或编辑公告服务
- * @url /notice/saveOrUpdateNotice
- * @method POST
- * @author @pubinfo/openapi
- */
-export function postNoticeSaveOrUpdateNotice<
-  R = API.ResponseData,
-  T = API.ResponseData,
->(body: API.PubNoticeDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
-  return request.Post<R, T>('/notice/saveOrUpdateNotice', body, {
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    ...(options || {}),
-  });
-}
-
-/**
- * @description 新增或编辑公告推送基本信息
- * @url /notice/saveOrUpdateNoticeSend
- * @method POST
- * @author @pubinfo/openapi
- */
-export function postNoticeSaveOrUpdateNoticeSend<
-  R = API.ResponseData,
-  T = API.ResponseData,
->(
-  body: API.PubNoticeSendDto,
-  options?: Parameters<typeof request.Post<R, T>>[2],
-) {
-  return request.Post<R, T>('/notice/saveOrUpdateNoticeSend', body, {
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    ...(options || {}),
-  });
-}