法人注册部门选择问题修改 11.12

jeecgboot-vue3/src/views/declarant/declarantList.vue

@@ -33,7 +33,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)"/>
       </template>
     </BasicTable>
     <!--用户抽屉-->
@@ -69,7 +69,9 @@
   import { columns, searchFormSchema } from './user.data';
   import { listNoCareTenant, deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch} from './user.api';
   import {usePermission} from "/@/hooks/web/usePermission";
-
+  import {useUserStore} from "@/store/modules/user";
+  const userStore = useUserStore();
+  console.log("the current user role:",userStore.getUserInfo.roleCode);
   const { createMessage, createConfirm } = useMessage();
   const { isDisabledAuth } = usePermission();
   //注册drawer
@@ -84,7 +86,6 @@
   const [registerQuitAgentModal, { openModal: openQuitAgentModal }] = useModal();
   //离职用户列表model
   const [registerQuitModal, { openModal: openQuitModal }] = useModal();
-
   // 列表页面公共参数、方法
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     designScope: 'user-list',
@@ -233,7 +234,7 @@
   /**
    * 操作栏
    */
-  function getTableAction(record): ActionItem[] {
+  /*function getTableAction(record): ActionItem[] {
     return [
       {
         label: '编辑',
@@ -241,31 +242,25 @@
         // ifShow: () => hasPermission('system:user:edit'),
       },
     ];
-  }
+  }*/
   /**
    * 下拉操作栏
    */
-  function getDropDownAction(record): ActionItem[] {
+  // function getDropDownAction(record): ActionItem[] {
+  function getTableAction(record): ActionItem[] {
     return [
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
       },
-      {
+      /*{
         label: '密码',
         //auth: 'user:changepwd',
         onClick: handleChangePassword.bind(null, record.username),
-      },
+      },*/
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
       {
         label: '驳回',
-        ifShow: record.status == 1,
+        ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 1,
         popConfirm: {
           title: '确定驳回吗?',
           confirm: handleFrozen.bind(null, record, 2),
@@ -273,12 +268,20 @@
       },
       {
         label: '通过',
-        ifShow: record.status == 2,
+        ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 2,
         popConfirm: {
           title: '确定通过吗?',
           confirm: handleFrozen.bind(null, record, 1),
         },
       },
+      {
+        label: '删除',
+        ifShow: userStore.getUserInfo.roleCode != 'shenbaoren_role',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
       // {
       //   label: '代理人',
       //   onClick: handleAgentSettings.bind(null, record.username),

jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue

@@ -196,6 +196,11 @@ function getTableAction(record) {
         confirm: handleFrozen.bind(null, record, 1),
       },
     },
+    {
+      ifShow: userStore.getUserInfo.roleCode =='faren_admin',
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+    },
     {
       label: '删除',
       ifShow: userStore.getUserInfo.roleCode !='faren_admin',

jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts

@@ -92,6 +92,7 @@ export const formSchema: FormSchema[] = [
     componentProps:{
       dictCode:"depart_status"
     },
+    dynamicDisabled: true,
   },
   {
     label: '名称',
@@ -107,6 +108,7 @@ export const formSchema: FormSchema[] = [
     label: '编码',
     field: 'orgCode',
     component: 'Input',
+    dynamicDisabled: true,
   },
   {
     label: '手机号',