Merge remote-tracking branch 'origin/sqy_dev'

@@ -40,11 +40,12 @@ export const sysDictPage = (params: SysDictParams) =>
  * 获取SysDictItem列表
  * 获取SysDictItem列表
  * @param params 查询参数
  * @param params 查询参数
  */
  */
-export const sysDictItemPage = (params: SysDictItemParams) =>
-  defHttp.get<SysDictItemResultModel>({
+export const sysDictItemPage = (params: SysDictItemParams) => {
+  return defHttp.get<SysDictItemResultModel>({
     url: SysDictApi.CONFIG_ITEM_URL,
     url: SysDictApi.CONFIG_ITEM_URL,
     params,
     params,
   });
   });
+};
 
 
 /**
 /**
  * 保存或更新字典值表
  * 保存或更新字典值表

@@ -5,20 +5,19 @@
 </template>
 </template>
 
 
 <script>
 <script>
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent } from 'vue';
   import { useRoute } from 'vue-router';
   import { useRoute } from 'vue-router';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
   import { useGo } from '/@/hooks/web/usePage';
   import { useGo } from '/@/hooks/web/usePage';
   import { Description } from '../../../components/Description';
   import { Description } from '../../../components/Description';
   import { useTabs } from '/@/hooks/web/useTabs';
   import { useTabs } from '/@/hooks/web/useTabs';
-  import { Tabs } from 'ant-design-vue';
   import { getAccountInfo } from '../../../api/system/system';
   import { getAccountInfo } from '../../../api/system/system';
   import { accountSchema } from './account.detail.data';
   import { accountSchema } from './account.detail.data';
   import { useDescription } from '../../../components/Description';
   import { useDescription } from '../../../components/Description';
   const accountData = {};
   const accountData = {};
   export default defineComponent({
   export default defineComponent({
     name: 'AccountDetail',
     name: 'AccountDetail',
-    components: { PageWrapper, ATabs: Tabs, ATabPane: Tabs.TabPane, Description },
+    components: { PageWrapper, Description },
     setup() {
     setup() {
       const route = useRoute();
       const route = useRoute();
       const go = useGo();
       const go = useGo();
@@ -44,7 +43,6 @@
         Reflect.set(accountData, 'createTime', result.createTime);
         Reflect.set(accountData, 'createTime', result.createTime);
         Reflect.set(accountData, 'updateTime', result.updateTime);
         Reflect.set(accountData, 'updateTime', result.updateTime);
         Reflect.set(accountData, 'deptId', result.deptId);
         Reflect.set(accountData, 'deptId', result.deptId);
-        console.log(accountData, 'accountData');
         // 设置Tab的标题（不会影响页面标题）
         // 设置Tab的标题（不会影响页面标题）
         setTitle('详情：用户' + result.realName);
         setTitle('详情：用户' + result.realName);
         methods.setDescProps(accountData);
         methods.setDescProps(accountData);

@@ -58,6 +58,7 @@
         setModalProps({ confirmLoading: false });
         setModalProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
         const groupListModel = await findCurrentUserGroups();
         const groupListModel = await findCurrentUserGroups();
+
         if (unref(organizationTreeData).length === 0) {
         if (unref(organizationTreeData).length === 0) {
           let treeValues = new Array<TreeItem>();
           let treeValues = new Array<TreeItem>();
           groupListModel.map((item) => {
           groupListModel.map((item) => {
@@ -74,9 +75,10 @@
 
 
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
           rowId.value = data.record.id;
           rowId.value = data.record.id;
-          console.log(data.record);
+
           const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
           const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
           findCurrentUserRelation(roleParams).then((result) => {
           findCurrentUserRelation(roleParams).then((result) => {
+            console.log(result);
             Reflect.set(data.record, 'roleIds', result);
             Reflect.set(data.record, 'roleIds', result);
             Reflect.set(data.record, 'password', '******');
             Reflect.set(data.record, 'password', '******');
             setFieldsValue({
             setFieldsValue({
@@ -93,7 +95,7 @@
             dynamicDisabled: unref(isUpdate),
             dynamicDisabled: unref(isUpdate),
           },
           },
           {
           {
-            field: 'deptId',
+            field: 'organizationIds',
             componentProps: {
             componentProps: {
               treeData: deptData,
               treeData: deptData,
             },
             },
@@ -107,6 +109,7 @@
         try {
         try {
           const { createMessage } = useMessage();
           const { createMessage } = useMessage();
           const values = await validate();
           const values = await validate();
+          console.log(values);
           values.accountExpireTime =
           values.accountExpireTime =
             typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
             typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
               ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')
               ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')

@@ -33,6 +33,7 @@
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         await resetFields();
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
+        console.log(data);
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
           id = data.record.id;
           id = data.record.id;

@@ -41,18 +41,18 @@
   import ItemDrawer from '/@/views/system/dict/item/ItemDrawer.vue';
   import ItemDrawer from '/@/views/system/dict/item/ItemDrawer.vue';
 
 
   import { columns, searchFormSchema } from './dict.item.data';
   import { columns, searchFormSchema } from './dict.item.data';
-  import { Tag } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'ItemIndex',
     name: 'ItemIndex',
-    components: { BasicDrawer, BasicTable, ItemDrawer, TableAction, Tag },
+    components: { BasicDrawer, BasicTable, ItemDrawer, TableAction },
     setup() {
     setup() {
       let dictId;
       let dictId;
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [register] = useDrawerInner((data) => {
       const [register] = useDrawerInner((data) => {
         dictId = data.id;
         dictId = data.id;
+        reload();
       });
       });
       const [registerTable, { reload }] = useTable({
       const [registerTable, { reload }] = useTable({
         title: '字典值列表',
         title: '字典值列表',