1、单位信息新增归属单位、单位编号

2、文档管理新增搜索、文件在线查看

src/api/ai/aiCloudFile/model/index.ts

@@ -47,6 +47,7 @@ export interface AiCloudFileParam extends PageParam {
   id?: number;
   keywords?: string;
   docId?: number;
+  fileName?: string;
   workspaceId?: number;
   fileType?: string;
-}
+}

src/api/oa/oaCompany/model/index.ts

@@ -10,6 +10,10 @@ export interface OaCompany {
   shortName?: string;
   // 企业全称
   companyName?: string;
+  // 归属单位
+  parentCompany?: string;
+  // 单位编号
+  companyNo?: string;
   // 企业标识
   companyCode?: string;
   // 类型 10企业 20政府单位

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

@@ -35,6 +35,13 @@
           v-model:value="form.companyName"
         />
       </a-form-item>
+      <a-form-item label="归属单位">
+        <a-input
+          allow-clear
+          placeholder="请输入归属单位(没有时默认'本单位')"
+          v-model:value="form.parentCompany"
+        />
+      </a-form-item>
       <a-form-item label="简称" name="shortName">
         <a-input
           allow-clear
@@ -49,91 +56,101 @@
           v-model:value="form.companyCode"
         />
       </a-form-item>
+      <a-form-item label="单位编号" name="companyNo">
+        <a-input
+          allow-clear
+          placeholder="请输入单位编号"
+          v-model:value="form.companyNo"
+        />
+      </a-form-item>
 
       <a-form-item label="企业性质" name="companyType">
         <DictSelect
-            dict-code="CompanyType"
-            :width="200"
-            :show-search="true"
-            placeholder="企业性质"
-            v-model:value="form.companyType"
-            :field-names="{
-              label: 'dictDataName',
-              value: 'dictDataCode'
-            }"
+          dict-code="CompanyType"
+          :width="200"
+          :show-search="true"
+          placeholder="企业性质"
+          v-model:value="form.companyType"
+          :field-names="{
+            label: 'dictDataName',
+            value: 'dictDataCode'
+          }"
         />
       </a-form-item>
       <a-form-item label="所属行业" name="industryParent">
         <DictSelect
-            dict-code="Industry"
-            :width="200"
-            :show-search="true"
-            placeholder="所属行业"
-            v-model:value="form.industryParent"
-            :field-names="{
-              label: 'dictDataName',
-              value: 'dictDataCode'
-            }"
+          dict-code="Industry"
+          :width="200"
+          :show-search="true"
+          placeholder="所属行业"
+          v-model:value="form.industryParent"
+          :field-names="{
+            label: 'dictDataName',
+            value: 'dictDataCode'
+          }"
         />
       </a-form-item>
 
       <a-form-item label="知识库ID" name="kbId">
         <a-input
-            :class="{ 'disabled-text': !form.kbId }"
-            :style="!form.kbId ? 'cursor: not-allowed; color: #999' : 'background-color: #f5f5f5'"
-            :placeholder="form.kbId ? '' : '未创建'"
-            :value="form.kbId"
-            readonly
+          :class="{ 'disabled-text': !form.kbId }"
+          :style="
+            !form.kbId
+              ? 'cursor: not-allowed; color: #999'
+              : 'background-color: #f5f5f5'
+          "
+          :placeholder="form.kbId ? '' : '未创建'"
+          :value="form.kbId"
+          readonly
         />
       </a-form-item>
 
       <!-- 行业库 -->
       <a-form-item label="行业库" name="bizLibIds">
         <a-select
-            show-search
-            :allow-clear="true"
-            optionFilterProp="label"
-            v-model:value="form.bizLibIds"
-            mode="multiple"
-            style="width: 100%"
-            placeholder="选择行业库"
-            :options="bizLibList"
+          show-search
+          :allow-clear="true"
+          optionFilterProp="label"
+          v-model:value="form.bizLibIds"
+          mode="multiple"
+          style="width: 100%"
+          placeholder="选择行业库"
+          :options="bizLibList"
         ></a-select>
       </a-form-item>
 
       <!-- 公共库 -->
       <a-form-item label="公共库" name="pubLibIds">
         <a-select
-            show-search
-            :allow-clear="true"
-            optionFilterProp="label"
-            v-model:value="form.pubLibIds"
-            mode="multiple"
-            style="width: 100%"
-            placeholder="选择公共库"
-            :options="pubLibList"
+          show-search
+          :allow-clear="true"
+          optionFilterProp="label"
+          v-model:value="form.pubLibIds"
+          mode="multiple"
+          style="width: 100%"
+          placeholder="选择公共库"
+          :options="pubLibList"
         ></a-select>
       </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="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
@@ -141,13 +158,13 @@
           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="phone">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入联系电话"-->
+      <!--          v-model:value="form.phone"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
       <a-form-item label="座机电话" name="tel">
         <a-input
           allow-clear
@@ -155,20 +172,20 @@
           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="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
@@ -176,27 +193,27 @@
           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="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
@@ -242,8 +259,8 @@
   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';
-  import {listPwlProjectLibrary} from '@/api/pwl/pwlProjectLibrary';
-  import DictSelect from "@/components/DictSelect/index.vue";
+  import { listPwlProjectLibrary } from '@/api/pwl/pwlProjectLibrary';
+  import DictSelect from '@/components/DictSelect/index.vue';
 
   // 是否是修改
   const isUpdate = ref(false);
@@ -282,7 +299,9 @@
     companyId: undefined,
     shortName: undefined,
     companyName: undefined,
+    parentCompany: '本单位',
     companyCode: undefined,
+    companyNo: undefined,
     companyType: undefined,
     companyTypeMultiple: undefined,
     companyLogo: undefined,
@@ -330,13 +349,9 @@
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    oaCompanyId: undefined,
     oaCompanyName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100,
     kbId: undefined,
-    libraryIds: undefined,
+    libraryIds: undefined
   });
 
   /* 更新visible */
@@ -372,24 +387,24 @@
 
   // 获取资料库列表
   const fetchLibraries = () => {
-    return listPwlProjectLibrary().then(res => {
+    return listPwlProjectLibrary().then((res) => {
       allLibraries.value = res;
 
       // 过滤行业库 (type='biz')
       bizLibList.value = res
-          .filter(item => item.type === 'biz')
-          .map(item => ({
-            label: item.name,
-            value: String(item.id)  // 将 ID 转换为字符串
-          }));
+        .filter((item) => item.type === 'biz')
+        .map((item) => ({
+          label: item.name,
+          value: String(item.id) // 将 ID 转换为字符串
+        }));
 
       // 过滤公共库 (type='pub')
       pubLibList.value = res
-          .filter(item => item.type === 'pub')
-          .map(item => ({
-            label: item.name,
-            value: String(item.id)  // 将 ID 转换为字符串
-          }));
+        .filter((item) => item.type === 'pub')
+        .map((item) => ({
+          label: item.name,
+          value: String(item.id) // 将 ID 转换为字符串
+        }));
 
       return res;
     });
@@ -411,12 +426,13 @@
         const allLibraryIds = [
           ...(form.bizLibIds || []),
           ...(form.pubLibIds || [])
-        ]
+        ];
 
         const formData = {
           ...form,
-          libraryIds: allLibraryIds.join(','), // 保存为逗号分隔的字符串
+          libraryIds: allLibraryIds.join(',') // 保存为逗号分隔的字符串
         };
+        if (!formData.parentCompany) formData.parentCompany = '本单位';
         const saveOrUpdate = isUpdate.value ? updateOaCompany : addOaCompany;
         saveOrUpdate(formData)
           .then((msg) => {
@@ -438,24 +454,30 @@
     if (props.data?.libraryIds) {
       // 如果是字符串，按逗号分割成数组
       if (typeof props.data.libraryIds === 'string') {
-        const libraryIdsArray = props.data.libraryIds.split(',').filter(id => id.trim() !== '');
+        const libraryIdsArray = props.data.libraryIds
+          .split(',')
+          .filter((id) => id.trim() !== '');
 
         // 清空当前的选择
         form.bizLibIds = [];
         form.pubLibIds = [];
 
         // 根据资料库类型分别设置回显
-        libraryIdsArray.forEach(id => {
+        libraryIdsArray.forEach((id) => {
           // 检查是否在行业库列表中
-          const isBizLib = bizLibList.value.some(lib => lib.value === String(id));  // 转换为字符串比较
+          const isBizLib = bizLibList.value.some(
+            (lib) => lib.value === String(id)
+          ); // 转换为字符串比较
           // 检查是否在公共库列表中
-          const isPubLib = pubLibList.value.some(lib => lib.value === String(id));  // 转换为字符串比较
+          const isPubLib = pubLibList.value.some(
+            (lib) => lib.value === String(id)
+          ); // 转换为字符串比较
 
           if (isBizLib) {
-            form.bizLibIds.push(String(id));  // 确保存储为字符串
+            form.bizLibIds.push(String(id)); // 确保存储为字符串
           }
           if (isPubLib) {
-            form.pubLibIds.push(String(id));  // 确保存储为字符串
+            form.pubLibIds.push(String(id)); // 确保存储为字符串
           }
         });
       } else {
@@ -463,9 +485,13 @@
         form.bizLibIds = [];
         form.pubLibIds = [];
 
-        props.data.libraryIds.forEach(id => {
-          const isBizLib = bizLibList.value.some(lib => lib.value === String(id));
-          const isPubLib = pubLibList.value.some(lib => lib.value === String(id));
+        props.data.libraryIds.forEach((id) => {
+          const isBizLib = bizLibList.value.some(
+            (lib) => lib.value === String(id)
+          );
+          const isPubLib = pubLibList.value.some(
+            (lib) => lib.value === String(id)
+          );
 
           if (isBizLib) {
             form.bizLibIds.push(String(id));
@@ -483,21 +509,20 @@
 
   watch(
     () => props.visible,
-      async (visible) => {
+    async (visible) => {
       if (visible) {
-
         // 等待资料库列表加载完成后再设置回显
         await fetchLibraries();
 
         images.value = [];
         if (props.data) {
           assignObject(form, props.data);
-          if(props.data.companyLogo){
+          if (props.data.companyLogo) {
             images.value.push({
               uid: uuid(),
               url: props.data.companyLogo,
               status: 'done'
-            })
+            });
           }
 
           // 设置资料库回显