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

2、文档管理新增搜索、文件在线查看
This commit is contained in:
2026-05-05 22:38:16 +08:00
parent 0f08415f28
commit ba55625181
4 changed files with 992 additions and 908 deletions

View File

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

View File

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

View File

@@ -35,6 +35,13 @@
v-model:value="form.companyName" v-model:value="form.companyName"
/> />
</a-form-item> </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-form-item label="简称" name="shortName">
<a-input <a-input
allow-clear allow-clear
@@ -49,91 +56,101 @@
v-model:value="form.companyCode" v-model:value="form.companyCode"
/> />
</a-form-item> </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"> <a-form-item label="企业性质" name="companyType">
<DictSelect <DictSelect
dict-code="CompanyType" dict-code="CompanyType"
:width="200" :width="200"
:show-search="true" :show-search="true"
placeholder="企业性质" placeholder="企业性质"
v-model:value="form.companyType" v-model:value="form.companyType"
:field-names="{ :field-names="{
label: 'dictDataName', label: 'dictDataName',
value: 'dictDataCode' value: 'dictDataCode'
}" }"
/> />
</a-form-item> </a-form-item>
<a-form-item label="所属行业" name="industryParent"> <a-form-item label="所属行业" name="industryParent">
<DictSelect <DictSelect
dict-code="Industry" dict-code="Industry"
:width="200" :width="200"
:show-search="true" :show-search="true"
placeholder="所属行业" placeholder="所属行业"
v-model:value="form.industryParent" v-model:value="form.industryParent"
:field-names="{ :field-names="{
label: 'dictDataName', label: 'dictDataName',
value: 'dictDataCode' value: 'dictDataCode'
}" }"
/> />
</a-form-item> </a-form-item>
<a-form-item label="知识库ID" name="kbId"> <a-form-item label="知识库ID" name="kbId">
<a-input <a-input
:class="{ 'disabled-text': !form.kbId }" :class="{ 'disabled-text': !form.kbId }"
:style="!form.kbId ? 'cursor: not-allowed; color: #999' : 'background-color: #f5f5f5'" :style="
:placeholder="form.kbId ? '' : '未创建'" !form.kbId
:value="form.kbId" ? 'cursor: not-allowed; color: #999'
readonly : 'background-color: #f5f5f5'
"
:placeholder="form.kbId ? '' : '未创建'"
:value="form.kbId"
readonly
/> />
</a-form-item> </a-form-item>
<!-- 行业库 --> <!-- 行业库 -->
<a-form-item label="行业库" name="bizLibIds"> <a-form-item label="行业库" name="bizLibIds">
<a-select <a-select
show-search show-search
:allow-clear="true" :allow-clear="true"
optionFilterProp="label" optionFilterProp="label"
v-model:value="form.bizLibIds" v-model:value="form.bizLibIds"
mode="multiple" mode="multiple"
style="width: 100%" style="width: 100%"
placeholder="选择行业库" placeholder="选择行业库"
:options="bizLibList" :options="bizLibList"
></a-select> ></a-select>
</a-form-item> </a-form-item>
<!-- 公共库 --> <!-- 公共库 -->
<a-form-item label="公共库" name="pubLibIds"> <a-form-item label="公共库" name="pubLibIds">
<a-select <a-select
show-search show-search
:allow-clear="true" :allow-clear="true"
optionFilterProp="label" optionFilterProp="label"
v-model:value="form.pubLibIds" v-model:value="form.pubLibIds"
mode="multiple" mode="multiple"
style="width: 100%" style="width: 100%"
placeholder="选择公共库" placeholder="选择公共库"
:options="pubLibList" :options="pubLibList"
></a-select> ></a-select>
</a-form-item> </a-form-item>
<!-- <a-form-item label="类型" name="companyType">-->
<!-- <a-form-item label="类型" name="companyType">--> <!-- <a-radio-group v-model:value="form.companyType">-->
<!-- <a-radio-group v-model:value="form.companyType">--> <!-- <a-radio :value="10">企业</a-radio>-->
<!-- <a-radio :value="10">企业</a-radio>--> <!-- <a-radio :value="20">单位</a-radio>-->
<!-- <a-radio :value="20">单位</a-radio>--> <!-- </a-radio-group>-->
<!-- </a-radio-group>--> <!-- <a-input-->
<!-- <a-input--> <!-- allow-clear-->
<!-- allow-clear--> <!-- placeholder="请输入类型 10单位 20政府单位"-->
<!-- placeholder="请输入类型 10单位 20政府单位"--> <!-- v-model:value="form.companyType"-->
<!-- v-model:value="form.companyType"--> <!-- />-->
<!-- />--> <!-- </a-form-item>-->
<!-- </a-form-item>--> <!-- <a-form-item label="应用标识" name="companyLogo">-->
<!-- <a-form-item label="应用标识" name="companyLogo">--> <!-- <a-input-->
<!-- <a-input--> <!-- allow-clear-->
<!-- allow-clear--> <!-- placeholder="请输入应用标识"-->
<!-- placeholder="请输入应用标识"--> <!-- v-model:value="form.companyLogo"-->
<!-- v-model:value="form.companyLogo"--> <!-- />-->
<!-- />--> <!-- </a-form-item>-->
<!-- </a-form-item>-->
<a-form-item label="网站域名" name="domain"> <a-form-item label="网站域名" name="domain">
<a-input <a-input
allow-clear allow-clear
@@ -141,13 +158,13 @@
v-model:value="form.domain" v-model:value="form.domain"
/> />
</a-form-item> </a-form-item>
<!-- <a-form-item label="联系电话" name="phone">--> <!-- <a-form-item label="联系电话" name="phone">-->
<!-- <a-input--> <!-- <a-input-->
<!-- allow-clear--> <!-- allow-clear-->
<!-- placeholder="请输入联系电话"--> <!-- placeholder="请输入联系电话"-->
<!-- v-model:value="form.phone"--> <!-- v-model:value="form.phone"-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<a-form-item label="座机电话" name="tel"> <a-form-item label="座机电话" name="tel">
<a-input <a-input
allow-clear allow-clear
@@ -155,20 +172,20 @@
v-model:value="form.tel" v-model:value="form.tel"
/> />
</a-form-item> </a-form-item>
<!-- <a-form-item label="邮箱" name="email">--> <!-- <a-form-item label="邮箱" name="email">-->
<!-- <a-input--> <!-- <a-input-->
<!-- allow-clear--> <!-- allow-clear-->
<!-- placeholder="请输入邮箱"--> <!-- placeholder="请输入邮箱"-->
<!-- v-model:value="form.email"--> <!-- v-model:value="form.email"-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- <a-form-item label="发票抬头" name="invoiceHeader">--> <!-- <a-form-item label="发票抬头" name="invoiceHeader">-->
<!-- <a-input--> <!-- <a-input-->
<!-- allow-clear--> <!-- allow-clear-->
<!-- placeholder="请输入发票抬头"--> <!-- placeholder="请输入发票抬头"-->
<!-- v-model:value="form.invoiceHeader"--> <!-- v-model:value="form.invoiceHeader"-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<a-form-item label="企业法人" name="businessEntity"> <a-form-item label="企业法人" name="businessEntity">
<a-input <a-input
allow-clear allow-clear
@@ -176,27 +193,27 @@
v-model:value="form.businessEntity" v-model:value="form.businessEntity"
/> />
</a-form-item> </a-form-item>
<!-- <a-form-item label="所在省份" name="province">--> <!-- <a-form-item label="所在省份" name="province">-->
<!-- <a-input--> <!-- <a-input-->
<!-- allow-clear--> <!-- allow-clear-->
<!-- placeholder="请输入所在省份"--> <!-- placeholder="请输入所在省份"-->
<!-- v-model:value="form.province"--> <!-- v-model:value="form.province"-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- <a-form-item label="所在城市" name="city">--> <!-- <a-form-item label="所在城市" name="city">-->
<!-- <a-input--> <!-- <a-input-->
<!-- allow-clear--> <!-- allow-clear-->
<!-- placeholder="请输入所在城市"--> <!-- placeholder="请输入所在城市"-->
<!-- v-model:value="form.city"--> <!-- v-model:value="form.city"-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- <a-form-item label="所在辖区" name="region">--> <!-- <a-form-item label="所在辖区" name="region">-->
<!-- <a-input--> <!-- <a-input-->
<!-- allow-clear--> <!-- allow-clear-->
<!-- placeholder="请输入所在辖区"--> <!-- placeholder="请输入所在辖区"-->
<!-- v-model:value="form.region"--> <!-- v-model:value="form.region"-->
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<a-form-item label="详细地址" name="address"> <a-form-item label="详细地址" name="address">
<a-input <a-input
allow-clear allow-clear
@@ -242,8 +259,8 @@
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types'; import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FormInstance } from 'ant-design-vue/es/form'; import { FormInstance } from 'ant-design-vue/es/form';
import { FileRecord } from '@/api/system/file/model'; import { FileRecord } from '@/api/system/file/model';
import {listPwlProjectLibrary} from '@/api/pwl/pwlProjectLibrary'; import { listPwlProjectLibrary } from '@/api/pwl/pwlProjectLibrary';
import DictSelect from "@/components/DictSelect/index.vue"; import DictSelect from '@/components/DictSelect/index.vue';
// 是否是修改 // 是否是修改
const isUpdate = ref(false); const isUpdate = ref(false);
@@ -282,7 +299,9 @@
companyId: undefined, companyId: undefined,
shortName: undefined, shortName: undefined,
companyName: undefined, companyName: undefined,
parentCompany: '本单位',
companyCode: undefined, companyCode: undefined,
companyNo: undefined,
companyType: undefined, companyType: undefined,
companyTypeMultiple: undefined, companyTypeMultiple: undefined,
companyLogo: undefined, companyLogo: undefined,
@@ -330,13 +349,9 @@
tenantId: undefined, tenantId: undefined,
createTime: undefined, createTime: undefined,
updateTime: undefined, updateTime: undefined,
oaCompanyId: undefined,
oaCompanyName: '', oaCompanyName: '',
status: 0,
comments: '',
sortNumber: 100,
kbId: undefined, kbId: undefined,
libraryIds: undefined, libraryIds: undefined
}); });
/* 更新visible */ /* 更新visible */
@@ -372,24 +387,24 @@
// 获取资料库列表 // 获取资料库列表
const fetchLibraries = () => { const fetchLibraries = () => {
return listPwlProjectLibrary().then(res => { return listPwlProjectLibrary().then((res) => {
allLibraries.value = res; allLibraries.value = res;
// 过滤行业库 (type='biz') // 过滤行业库 (type='biz')
bizLibList.value = res bizLibList.value = res
.filter(item => item.type === 'biz') .filter((item) => item.type === 'biz')
.map(item => ({ .map((item) => ({
label: item.name, label: item.name,
value: String(item.id) // 将 ID 转换为字符串 value: String(item.id) // 将 ID 转换为字符串
})); }));
// 过滤公共库 (type='pub') // 过滤公共库 (type='pub')
pubLibList.value = res pubLibList.value = res
.filter(item => item.type === 'pub') .filter((item) => item.type === 'pub')
.map(item => ({ .map((item) => ({
label: item.name, label: item.name,
value: String(item.id) // 将 ID 转换为字符串 value: String(item.id) // 将 ID 转换为字符串
})); }));
return res; return res;
}); });
@@ -411,12 +426,13 @@
const allLibraryIds = [ const allLibraryIds = [
...(form.bizLibIds || []), ...(form.bizLibIds || []),
...(form.pubLibIds || []) ...(form.pubLibIds || [])
] ];
const formData = { const formData = {
...form, ...form,
libraryIds: allLibraryIds.join(','), // 保存为逗号分隔的字符串 libraryIds: allLibraryIds.join(',') // 保存为逗号分隔的字符串
}; };
if (!formData.parentCompany) formData.parentCompany = '本单位';
const saveOrUpdate = isUpdate.value ? updateOaCompany : addOaCompany; const saveOrUpdate = isUpdate.value ? updateOaCompany : addOaCompany;
saveOrUpdate(formData) saveOrUpdate(formData)
.then((msg) => { .then((msg) => {
@@ -438,24 +454,30 @@
if (props.data?.libraryIds) { if (props.data?.libraryIds) {
// 如果是字符串,按逗号分割成数组 // 如果是字符串,按逗号分割成数组
if (typeof props.data.libraryIds === 'string') { 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.bizLibIds = [];
form.pubLibIds = []; 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) { if (isBizLib) {
form.bizLibIds.push(String(id)); // 确保存储为字符串 form.bizLibIds.push(String(id)); // 确保存储为字符串
} }
if (isPubLib) { if (isPubLib) {
form.pubLibIds.push(String(id)); // 确保存储为字符串 form.pubLibIds.push(String(id)); // 确保存储为字符串
} }
}); });
} else { } else {
@@ -463,9 +485,13 @@
form.bizLibIds = []; form.bizLibIds = [];
form.pubLibIds = []; form.pubLibIds = [];
props.data.libraryIds.forEach(id => { props.data.libraryIds.forEach((id) => {
const isBizLib = bizLibList.value.some(lib => lib.value === String(id)); const isBizLib = bizLibList.value.some(
const isPubLib = pubLibList.value.some(lib => lib.value === String(id)); (lib) => lib.value === String(id)
);
const isPubLib = pubLibList.value.some(
(lib) => lib.value === String(id)
);
if (isBizLib) { if (isBizLib) {
form.bizLibIds.push(String(id)); form.bizLibIds.push(String(id));
@@ -483,21 +509,20 @@
watch( watch(
() => props.visible, () => props.visible,
async (visible) => { async (visible) => {
if (visible) { if (visible) {
// 等待资料库列表加载完成后再设置回显 // 等待资料库列表加载完成后再设置回显
await fetchLibraries(); await fetchLibraries();
images.value = []; images.value = [];
if (props.data) { if (props.data) {
assignObject(form, props.data); assignObject(form, props.data);
if(props.data.companyLogo){ if (props.data.companyLogo) {
images.value.push({ images.value.push({
uid: uuid(), uid: uuid(),
url: props.data.companyLogo, url: props.data.companyLogo,
status: 'done' status: 'done'
}) });
} }
// 设置资料库回显 // 设置资料库回显

File diff suppressed because it is too large Load Diff