feat(oa): 添加公司管理功能

- 新增公司管理页面，包括公司列表、字段管理和用户管理
- 实现公司信息的添加、编辑和删除功能
- 添加公司 logo 选择功能
-优化公司列表的展示和操作

src/components/SelectCompany/components/select-data.vue

@@ -29,10 +29,8 @@
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'companyName'">
           <a-space class="cursor-pointer" @click="onRadio(record)">
-            <a-tooltip :title="record.tenantId">
             <a-avatar :src="record.companyLogo" size="small"/>
-            </a-tooltip>
+            <span>{{ record.companyName }}</span>
-            <span>{{ record.tenantName }}</span>
           </a-space>
         </template>
         <template v-if="column.key === 'action'">
@@ -49,12 +47,11 @@
   ColumnItem,
   DatasourceFunction
 } from 'ele-admin-pro/es/ele-pro-table/types';
-  import { pageCompany } from '@/api/system/company';
 import {EleProTable} from 'ele-admin-pro';
-  import { Company, CompanyParam } from '@/api/system/company/model';
+import {OaCompany, OaCompanyParam} from "@/api/oa/oaCompany/model";
-  import {openSpmUrl} from "@/utils/common";
+import {pageOaCompany} from "@/api/oa/oaCompany";
 
-  const props = defineProps<{
+defineProps<{
   // 弹窗是否打开
   visible: boolean;
   // 标题
@@ -62,11 +59,11 @@
   // 企业类型
   companyType?: string;
   // 修改回显的数据
-    data?: Company | null;
+  data?: OaCompany | null;
 }>();
 
 const emit = defineEmits<{
-    (e: 'done', data: Company): void;
+  (e: 'done', data: OaCompany): void;
   (e: 'update:visible', visible: boolean): void;
 }>();
 
@@ -90,13 +87,7 @@
     align: 'center'
   },
   {
-      title: '租户ID',
+    title: '单位名称',
-      dataIndex: 'tenantId',
-      width: 120,
-      key: 'tenantId'
-    },
-    {
-      title: '租户名称',
     dataIndex: 'companyName',
     key: 'companyName',
   },
@@ -109,32 +100,34 @@
   if (searchText.value) {
     where.keywords = searchText.value;
   }
-    if (props.companyType == 'empty') {
+  console.log('请求参数:', { ...where, ...orders, page, limit });
-      where.emptyType = true;
+  return pageOaCompany({
-    } else {
-      where.companyType = props.companyType;
-    }
-    where.isStaff = true;
-    return pageCompany({
     ...where,
     ...orders,
     page,
     limit
+  }).then(result => {
+    console.log('API返回数据:', result);
+    return result;
+  }).catch(error => {
+    console.error('API请求失败:', error);
+    throw error;
   });
 };
 
 /* 搜索 */
-  const reload = (where?: CompanyParam) => {
+const reload = (where?: OaCompanyParam) => {
   tableRef?.value?.reload({page: 1, where});
 };
 
-  const onRadio = (record: Company) => {
+const onRadio = (record: OaCompany) => {
+  console.log('选择的记录:', record);
   updateVisible(false);
   emit('done', record);
 };
 
 /* 自定义行属性 */
-  const customRow = (record: Company) => {
+const customRow = (record: OaCompany) => {
   return {
     // 行点击事件
     // onClick: () => {

src/components/SelectCompany/index.vue

@@ -3,11 +3,14 @@
     <a-input-group compact>
       <a-input
         disabled
-        style="width: calc(100% - 32px)"
+        style="width: calc(100% - 64px)"
         v-model:value="content"
         :placeholder="placeholder"
       />
-      <a-button @click="openEdit">
+      <a-button @click="clearSelection" v-if="content" style="width: 32px;">
+        <template #icon><CloseOutlined /></template>
+      </a-button>
+      <a-button @click="openEdit" style="width: 32px;">
         <template #icon><BulbOutlined class="ele-text-warning" /></template>
       </a-button>
     </a-input-group>
@@ -23,10 +26,10 @@
 </template>
 
 <script lang="ts" setup>
-  import { BulbOutlined } from '@ant-design/icons-vue';
+  import { BulbOutlined, CloseOutlined } from '@ant-design/icons-vue';
-  import { ref } from 'vue';
+  import { ref, watch } from 'vue';
   import SelectData from './components/select-data.vue';
-  import { Company } from '@/api/system/company/model';
+  import {OaCompany} from "@/api/oa/oaCompany/model";
 
   const props = withDefaults(
     defineProps<{
@@ -35,29 +38,44 @@
       placeholder?: string;
     }>(),
     {
-      placeholder: '请选择数据'
+      placeholder: '请选择审计单位'
     }
   );
 
   const emit = defineEmits<{
-    (e: 'done', Customer): void;
+    (e: 'done', data: OaCompany): void;
     (e: 'clear'): void;
+    (e: 'update:value', value: any): void;
   }>();
 
-
+  const content = ref<any>(props.value || '')
-  const content = ref<any>(props.value)
   // 是否显示编辑弹窗
   const showEdit = ref(false);
   // 当前编辑数据
-  const current = ref<Company | null>(null);
+  const current = ref<OaCompany | null>(null);
+
+  // 监听 props.value 变化
+  watch(() => props.value, (newValue) => {
+    content.value = newValue || '';
+  }, { immediate: true });
 
   /* 打开编辑弹窗 */
-  const openEdit = (row?: Company) => {
+  const openEdit = (row?: OaCompany) => {
     current.value = row ?? null;
     showEdit.value = true;
   };
 
-  const onChange = (row) => {
+  /* 清空选择 */
+  const clearSelection = () => {
+    content.value = '';
+    current.value = null;
+    emit('update:value', '');
+    emit('clear');
+  };
+
+  const onChange = (row: OaCompany) => {
+    content.value = row.companyName;
+    emit('update:value', row.companyName);
     emit('done', row);
   };
 </script>

src/views/oa/oaCompany/components/oaCompanyEdit.vue

@@ -0,0 +1,351 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑单位信息' : '添加单位信息'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="LOGO" name="companyLogo">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
+      <a-form-item label="单位名称" name="companyName">
+        <a-input
+          allow-clear
+          placeholder="请输入单位名称"
+          v-model:value="form.companyName"
+        />
+      </a-form-item>
+      <a-form-item label="简称" name="shortName">
+        <a-input
+          allow-clear
+          placeholder="请输入单位简称"
+          v-model:value="form.shortName"
+        />
+      </a-form-item>
+      <a-form-item label="唯一标识" name="companyCode">
+        <a-input
+          allow-clear
+          placeholder="请输入单位唯一标识"
+          v-model:value="form.companyCode"
+        />
+      </a-form-item>
+<!--      <a-form-item label="类型" name="companyType">-->
+<!--        <a-radio-group v-model:value="form.companyType">-->
+<!--          <a-radio :value="10">企业</a-radio>-->
+<!--          <a-radio :value="20">单位</a-radio>-->
+<!--        </a-radio-group>-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入类型 10单位 20政府单位"-->
+<!--          v-model:value="form.companyType"-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      <a-form-item label="应用标识" name="companyLogo">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入应用标识"-->
+<!--          v-model:value="form.companyLogo"-->
+<!--        />-->
+<!--      </a-form-item>-->
+      <a-form-item label="网站域名" name="domain">
+        <a-input
+          allow-clear
+          placeholder="请输入网站域名"
+          v-model:value="form.domain"
+        />
+      </a-form-item>
+<!--      <a-form-item label="联系电话" name="phone">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入联系电话"-->
+<!--          v-model:value="form.phone"-->
+<!--        />-->
+<!--      </a-form-item>-->
+      <a-form-item label="座机电话" name="tel">
+        <a-input
+          allow-clear
+          placeholder="请输入座机电话"
+          v-model:value="form.tel"
+        />
+      </a-form-item>
+<!--      <a-form-item label="邮箱" name="email">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入邮箱"-->
+<!--          v-model:value="form.email"-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      <a-form-item label="发票抬头" name="invoiceHeader">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入发票抬头"-->
+<!--          v-model:value="form.invoiceHeader"-->
+<!--        />-->
+<!--      </a-form-item>-->
+      <a-form-item label="企业法人" name="businessEntity">
+        <a-input
+          allow-clear
+          placeholder="请输入企业法人"
+          v-model:value="form.businessEntity"
+        />
+      </a-form-item>
+<!--      <a-form-item label="所在省份" name="province">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入所在省份"-->
+<!--          v-model:value="form.province"-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      <a-form-item label="所在城市" name="city">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入所在城市"-->
+<!--          v-model:value="form.city"-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      <a-form-item label="所在辖区" name="region">-->
+<!--        <a-input-->
+<!--          allow-clear-->
+<!--          placeholder="请输入所在辖区"-->
+<!--          v-model:value="form.region"-->
+<!--        />-->
+<!--      </a-form-item>-->
+      <a-form-item label="详细地址" name="address">
+        <a-input
+          allow-clear
+          placeholder="请输入详细地址"
+          v-model:value="form.address"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOaCompany, updateOaCompany } from '@/api/oa/oaCompany';
+  import { OaCompany } from '@/api/oa/oaCompany/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: OaCompany | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<OaCompany>({
+    companyId: undefined,
+    shortName: undefined,
+    companyName: undefined,
+    companyCode: undefined,
+    companyType: undefined,
+    companyTypeMultiple: undefined,
+    companyLogo: undefined,
+    appType: undefined,
+    domain: undefined,
+    phone: undefined,
+    tel: undefined,
+    email: undefined,
+    invoiceHeader: undefined,
+    businessEntity: undefined,
+    startTime: undefined,
+    expirationTime: undefined,
+    version: undefined,
+    members: undefined,
+    users: undefined,
+    industryParent: undefined,
+    industryChild: undefined,
+    departments: undefined,
+    storage: undefined,
+    storageMax: undefined,
+    country: undefined,
+    province: undefined,
+    city: undefined,
+    region: undefined,
+    address: undefined,
+    longitude: undefined,
+    latitude: undefined,
+    comments: undefined,
+    authentication: undefined,
+    authoritative: undefined,
+    requestUrl: undefined,
+    socketUrl: undefined,
+    serverUrl: undefined,
+    modulesUrl: undefined,
+    recommend: undefined,
+    likes: undefined,
+    clicks: undefined,
+    buys: undefined,
+    isTax: undefined,
+    planId: undefined,
+    status: undefined,
+    sortNumber: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    oaCompanyId: undefined,
+    oaCompanyName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    oaCompanyName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写单位信息名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.companyLogo = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.companyLogo = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOaCompany : addOaCompany;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.companyLogo){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.companyLogo,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

src/views/oa/oaCompany/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

src/views/oa/oaCompany/index.vue

@@ -0,0 +1,266 @@
+<template>
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+    <a-card :bordered="false" :body-style="{ padding: '16px' }">
+      <ele-pro-table
+        ref="tableRef"
+        row-key="companyId"
+        :columns="columns"
+        :datasource="datasource"
+        :customRow="customRow"
+        tool-class="ele-toolbar-form"
+        class="sys-org-table"
+      >
+        <template #toolbar>
+          <search
+            @search="reload"
+            :selection="selection"
+            @add="openEdit"
+            @remove="removeBatch"
+            @batchMove="openMove"
+          />
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'companyLogo'">
+            <a-image
+              v-if="isImage(record.companyLogo)"
+              :src="record.companyLogo"
+              :width="80"
+            />
+          </template>
+          <template v-if="column.key === 'status'">
+            <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+            <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+          </template>
+          <template v-if="column.key === 'action'">
+            <a-space>
+              <a @click="openEdit(record)">修改</a>
+              <a-divider type="vertical"/>
+              <a-popconfirm
+                title="确定要删除此记录吗？"
+                @confirm="remove(record)"
+              >
+                <a class="ele-text-danger">删除</a>
+              </a-popconfirm>
+            </a-space>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
+
+    <!-- 编辑弹窗 -->
+    <OaCompanyEdit v-model:visible="showEdit" :data="current" @done="reload"/>
+  </a-page-header>
+</template>
+
+<script lang="ts" setup>
+import {createVNode, ref} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {toDateString} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import OaCompanyEdit from './components/oaCompanyEdit.vue';
+import {pageOaCompany, removeOaCompany, removeBatchOaCompany} from '@/api/oa/oaCompany';
+import type {OaCompany, OaCompanyParam} from '@/api/oa/oaCompany/model';
+import {getPageTitle,isImage} from "@/utils/common";
+
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+// 表格选中数据
+const selection = ref<OaCompany[]>([]);
+// 当前编辑数据
+const current = ref<OaCompany | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// 加载状态
+const loading = ref(true);
+
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  return pageOaCompany({
+    ...where,
+    ...orders,
+    page,
+    limit
+  });
+};
+
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: 'ID',
+    dataIndex: 'companyId',
+    key: 'companyId',
+    align: 'center',
+    hideInTable: true,
+    width: 90,
+  },
+  {
+    title: 'LOGO',
+    dataIndex: 'companyLogo',
+    key: 'companyLogo',
+    align: 'center',
+  },
+  {
+    title: '单位名称',
+    dataIndex: 'companyName',
+    key: 'companyName',
+    align: 'center',
+  },
+  {
+    title: '单位标识',
+    dataIndex: 'companyCode',
+    key: 'companyCode',
+    align: 'center',
+  },
+  // {
+  //   title: '类型',
+  //   dataIndex: 'companyType',
+  //   key: 'companyType',
+  //   align: 'center',
+  // },
+  {
+    title: '推荐',
+    dataIndex: 'recommend',
+    key: 'recommend',
+    align: 'center',
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    key: 'status',
+    align: 'center',
+  },
+  // {
+  //   title: '备注',
+  //   dataIndex: 'comments',
+  //   key: 'comments',
+  //   align: 'center',
+  // },
+  {
+    title: '排序号',
+    dataIndex: 'sortNumber',
+    key: 'sortNumber',
+    align: 'center',
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true,
+    ellipsis: true
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: OaCompanyParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: OaCompany) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
+
+/* 删除单个 */
+const remove = (row: OaCompany) => {
+  const hide = message.loading('请求中..', 0);
+  removeOaCompany(row.oaCompanyId)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
+    });
+};
+
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchOaCompany(selection.value.map((d) => d.oaCompanyId))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
+    }
+  });
+};
+
+/* 查询 */
+const query = () => {
+  loading.value = true;
+};
+
+/* 自定义行属性 */
+const customRow = (record: OaCompany) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+query();
+</script>
+
+<script lang="ts">
+export default {
+  name: 'OaCompany'
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/oa/oaCompanyField/components/oaCompanyFieldEdit.vue

@@ -0,0 +1,212 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑企业参数' : '添加企业参数'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="企业ID" name="companyId">
+        <a-input
+          allow-clear
+          placeholder="请输入企业ID"
+          v-model:value="form.companyId"
+        />
+      </a-form-item>
+      <a-form-item label="名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0正常, 1删除" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOaCompanyField, updateOaCompanyField } from '@/api/oa/oaCompanyField';
+  import { OaCompanyField } from '@/api/oa/oaCompanyField/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: OaCompanyField | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<OaCompanyField>({
+    id: undefined,
+    companyId: undefined,
+    name: undefined,
+    comments: undefined,
+    userId: undefined,
+    status: undefined,
+    sortNumber: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    oaCompanyFieldId: undefined,
+    oaCompanyFieldName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    oaCompanyFieldName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写企业参数名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOaCompanyField : addOaCompanyField;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

src/views/oa/oaCompanyField/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

src/views/oa/oaCompanyField/index.vue

@@ -0,0 +1,251 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="oaCompanyFieldId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <OaCompanyFieldEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import OaCompanyFieldEdit from './components/oaCompanyFieldEdit.vue';
+  import { pageOaCompanyField, removeOaCompanyField, removeBatchOaCompanyField } from '@/api/oa/oaCompanyField';
+  import type { OaCompanyField, OaCompanyFieldParam } from '@/api/oa/oaCompanyField/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<OaCompanyField[]>([]);
+  // 当前编辑数据
+  const current = ref<OaCompanyField | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageOaCompanyField({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '自增ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '企业ID',
+      dataIndex: 'companyId',
+      key: 'companyId',
+      align: 'center',
+    },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: '状态, 0正常, 1删除',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '排序(数字越小越靠前)',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: OaCompanyFieldParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: OaCompanyField) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: OaCompanyField) => {
+    const hide = message.loading('请求中..', 0);
+    removeOaCompanyField(row.oaCompanyFieldId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchOaCompanyField(selection.value.map((d) => d.oaCompanyFieldId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: OaCompanyField) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'OaCompanyField'
+  };
+</script>
+
+<style lang="less" scoped></style>

src/views/oa/oaCompanyUser/components/oaCompanyUserEdit.vue

@@ -0,0 +1,201 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑成员管理' : '添加成员管理'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="角色，10体验成员 20开发者成员 30管理员 " name="role">
+        <a-input
+          allow-clear
+          placeholder="请输入角色，10体验成员 20开发者成员 30管理员 "
+          v-model:value="form.role"
+        />
+      </a-form-item>
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="企业ID" name="companyId">
+        <a-input
+          allow-clear
+          placeholder="请输入企业ID"
+          v-model:value="form.companyId"
+        />
+      </a-form-item>
+      <a-form-item label="昵称" name="nickname">
+        <a-input
+          allow-clear
+          placeholder="请输入昵称"
+          v-model:value="form.nickname"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0正常, 1待确认" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOaCompanyUser, updateOaCompanyUser } from '@/api/oa/oaCompanyUser';
+  import { OaCompanyUser } from '@/api/oa/oaCompanyUser/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: OaCompanyUser | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<OaCompanyUser>({
+    companyUserId: undefined,
+    role: undefined,
+    userId: undefined,
+    companyId: undefined,
+    nickname: undefined,
+    status: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    oaCompanyUserId: undefined,
+    oaCompanyUserName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    oaCompanyUserName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写成员管理名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOaCompanyUser : addOaCompanyUser;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

src/views/oa/oaCompanyUser/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

src/views/oa/oaCompanyUser/index.vue

@@ -0,0 +1,245 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="oaCompanyUserId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <OaCompanyUserEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import OaCompanyUserEdit from './components/oaCompanyUserEdit.vue';
+  import { pageOaCompanyUser, removeOaCompanyUser, removeBatchOaCompanyUser } from '@/api/oa/oaCompanyUser';
+  import type { OaCompanyUser, OaCompanyUserParam } from '@/api/oa/oaCompanyUser/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<OaCompanyUser[]>([]);
+  // 当前编辑数据
+  const current = ref<OaCompanyUser | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageOaCompanyUser({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '自增ID',
+      dataIndex: 'companyUserId',
+      key: 'companyUserId',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '角色，10体验成员 20开发者成员 30管理员 ',
+      dataIndex: 'role',
+      key: 'role',
+      align: 'center',
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: '企业ID',
+      dataIndex: 'companyId',
+      key: 'companyId',
+      align: 'center',
+    },
+    {
+      title: '昵称',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
+    },
+    {
+      title: '状态, 0正常, 1待确认',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: OaCompanyUserParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: OaCompanyUser) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: OaCompanyUser) => {
+    const hide = message.loading('请求中..', 0);
+    removeOaCompanyUser(row.oaCompanyUserId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchOaCompanyUser(selection.value.map((d) => d.oaCompanyUserId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: OaCompanyUser) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'OaCompanyUser'
+  };
+</script>
+
+<style lang="less" scoped></style>

src/views/pwl/pwlProject/components/pwlProjectEdit.vue

@@ -19,6 +19,9 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
+      <a-form-item label="被审计单位" name="name">
+        <SelectCompany v-model:value="form.name" @done="onCompany" />
+      </a-form-item>
       <a-form-item label="项目类型" name="type">
         <DictSelect
           dict-code="Type"
@@ -37,14 +40,6 @@
           v-model:value="form.expirationTime"
         />
       </a-form-item>
-      <a-form-item label="被审计单位" name="name">
-        <a-input
-          allow-clear
-          style="width: 400px"
-          placeholder="请输入审计单位"
-          v-model:value="form.name"
-        />
-      </a-form-item>
       <a-form-item label="报告编号" name="code">
         <a-input
           allow-clear
@@ -278,10 +273,11 @@ import {FormInstance} from 'ant-design-vue/es/form';
 import DictSelect from "@/components/DictSelect/index.vue";
 import {DictData} from "@/api/system/dict-data/model";
 import {pageUsers} from "@/api/system/user";
-import {User, UserParam} from "@/api/system/user/model";
+import {User} from "@/api/system/user/model";
 import {hasRole} from "@/utils/permission";
-import useSearch from "@/utils/use-search";
+import SelectCompany from "@/components/SelectCompany/index.vue";
-import SelectUser from "@/components/ThinkSelectUsers/components/select-user.vue";
+import {Company} from "@/api/system/company/model";
+import {OaCompany} from "@/api/oa/oaCompany/model";
 
 // 是否是修改
 const isUpdate = ref(false);
@@ -457,6 +453,13 @@ const chooseType = (data: DictData) => {
 //   form.image = '';
 // };
 
+
+const onCompany = (item: OaCompany) => {
+  console.log('选择的公司:', item);
+  form.name = item.companyName;
+  console.log('设置后的form.name:', form.name);
+};
+
 const handleSearch = (item) => {
   keywords.value = item
   fetchUsers();

src/views/pwl/pwlProject/index.vue

@@ -69,7 +69,8 @@
             </a-tooltip>
           </template>
           <template v-if="column.key === 'action'">
-            <a-space>
+              <a class="text-pink-500" @click="openEdit(record)">生成报告</a>
+              <a-divider type="vertical"/>
               <a @click="openEdit(record)">修改</a>
               <a-divider type="vertical"/>
               <a-popconfirm
@@ -78,7 +79,6 @@
               >
                 <a class="ele-text-danger">删除</a>
               </a-popconfirm>
-            </a-space>
           </template>
         </template>
       </ele-pro-table>
@@ -361,7 +361,7 @@ const columns = ref<ColumnItem[]>([
   {
     title: '操作',
     key: 'action',
-    width: 180,
+    width: 220,
     fixed: 'right',
     align: 'center',
     hideInSetting: true