taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设计管理

Browse Source
This commit is contained in:
taoge1020
2025-08-19 20:01:29 +08:00
parent 53309746f5
commit 271f99fb16
12 changed files with 599 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/design/designChange/index.ts
View File

@ -61,3 +61,23 @@ export const delDesignChange = (id: string | number | Array<string | number>) =>
method: 'delete'
});
};
/**
* 获取卷册号
* @param id
*/
export const blueprintList = (id) => {
return request({
url: '/design/designChange/blueprint/' + id,
method: 'get'
});
};
/**
* 获取卷册列表
* @param id
*/
export const catalogList = (id) => {
return request({
url: '/design/designChange/catalogList/' + id,
method: 'get'
});
};

11
src/api/design/drawing/index.ts
View File

@ -82,3 +82,14 @@ export const volumeFileViewerList = (id) => {
method: 'get'
});
};
/**
* 查阅图纸列表
* @param id
*/
export const joinList = (params) => {
return request({
url: '/design/volumeFile/joinList',
method: 'get',
params
});
};

2
src/api/design/volumeCatalog/index.ts
View File

@ -65,7 +65,7 @@ export const addVolumeCatalog = (data: VolumeCatalogForm) => {
* 修改卷册目录
* @param data
*/
export const updateVolumeCatalog = (data: VolumeCatalogForm) => {
export const updateVolumeCatalog = (data) => {
return request({
url: '/design/volumeCatalog',
method: 'put',

2
src/components/Process/submitVerify.vue
View File

@ -34,7 +34,7 @@
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 通过 </el-button>
<el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 提交 </el-button>
<el-button v-if="task.flowStatus === 'waiting' && buttonObj.trust" :disabled="buttonDisabled" type="primary" @click="openDelegateTask">
委托
</el-button>

429
src/views/design/Professional/indexEdit.vue
View File

@ -20,28 +20,17 @@
</div>
<div class="p-6">
<div class="appWidth mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
<!-- 表单内容区域 -->
<!-- 主表单：基础信息校验 -->
<el-form :disabled="disableAll" ref="mainFormRef" :model="form" :rules="mainRules" label-width="120px" class="p-6">
<!-- 基本信息区域 -->
<div class="bg-blue-50 p-4 rounded-lg mb-6">
<h3 class="text-lg font-semibold text-blue-700 mb-4">基本信息</h3>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<el-form-item label="提资人" prop="userId" class="mb-4">
<el-select
v-model="form.userId"
placeholder="请选择提资人"
class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
</el-select>
<el-form-item label="提资人" class="mb-4">
<el-input placeholder="请输入提资人" disabled v-model="userInfo.nickName" autocomplete="off" />
</el-form-item>
<el-form-item label="专业" prop="user_major" class="mb-4">
<el-select
v-model="form.user_major"
placeholder="请选择专业"
class="transition-all duration-300 border-gray-300"
:rules="{ required: true, message: '请选择专业', trigger: 'change' }"
>
<el-select v-model="form.user_major" placeholder="请选择专业" class="transition-all duration-300 border-gray-300">
<el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@ -53,13 +42,14 @@
</el-form-item>
</div>
</div>
<!-- 资料文件区域 -->
<!-- 资料文件区域：单独表单校验 -->
<div class="mb-6">
<div class="flex items-center justify-between mb-4">
<h3 class="text-lg font-semibold text-blue-700">资料文件清单</h3>
<el-button type="primary" size="small" @click="addDocumentItem" icon="Plus"> 添加资料 </el-button>
</div>
<el-form :disabled="disableAll" ref="documentsFormRef" :model="form" class="space-y-4">
<el-form :disabled="disableAll" ref="documentsFormRef" :model="form" class="space-y-4" label-width="120px">
<div
v-for="(item, index) in form.documents"
:key="item.id"
@ -67,7 +57,6 @@
>
<div class="flex justify-between items-start mb-2">
<span class="text-sm font-medium text-gray-600">资料 {{ index + 1 }}</span>
<el-button
type="text"
size="small"
@ -80,10 +69,14 @@
</el-button>
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<!-- 资料名称：补充验证规则 -->
<el-form-item
label="资料名称"
:prop="`documents.${index}.catalogueName`"
:rules="[{ required: true, message: '请输入文件资料名称', trigger: 'blur' }]"
:prop="`documents.${index}.volumeCatalogId`"
:rules="[
{ required: true, message: '请选择资料名称', trigger: 'change' },
{ required: true, message: '请选择资料名称', trigger: 'blur' }
]"
class="mb-4"
>
<el-select
@ -93,7 +86,7 @@
clearable
filterable
@change="handleSelect($event, item)"
style="width: 150px; margin-right: 20px"
style="width: 100%"
>
<el-option
v-for="project in volumeCatalogList"
@ -114,8 +107,10 @@
</div>
</div>
</el-card>
<!-- 提交组件 -->
<!-- 提交验证组件 -->
<submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
<!-- 审批记录组件 -->
<approvalRecord ref="approvalRecordRef"></approvalRecord>
<!-- 流程选择对话框 -->
<el-dialog
@ -154,88 +149,101 @@ import SubmitVerify from '@/components/Process/submitVerify.vue';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
import ApprovalButton from '@/components/Process/approvalButton.vue';
import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { ComponentInternalInstance, nextTick, ref, reactive, computed, toRefs, onMounted } from 'vue';
import { useUserStoreHook } from '@/store/modules/user';
import { systemUserList } from '@/api/design/appointment';
import { extractBatch, extractDetail } from '@/api/design/Professional';
import { listVolumeCatalog } from '@/api/design/volumeCatalog';
// 获取用户 store
import { catalogList } from '@/api/design/designChange';
import { getUser } from '@/api/system/user';
import { ElFormInstance, ElMessage } from 'element-plus';
// 类型定义
interface DialogOption {
visible: boolean;
title: string;
}
interface DocumentItem {
id: number;
catalogueName: string;
remark: string;
volumeCatalogId: string;
num?: number;
}
interface FormData {
projectId: string | undefined;
userId: string;
user_major: string;
phone: string;
email: string;
id: string;
status: string;
documents: DocumentItem[];
}
// 获取组件实例
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 用户状态管理
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
const currentProject = computed(() => userStore.selectedProject);
const userId = computed(() => userStore.userId);
// 基础数据
const userInfo = ref({
nickName: '',
email: '',
phonenumber: '',
userId: ''
});
const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
const buttonLoading = ref(false);
const loading = ref(true);
const disableAll = ref(false);
const volumeCatalogList = ref([]);
let volumeMap = new Map();
//路由参数
const volumeMap = new Map();
const routeParams = ref<Record<string, any>>({});
// 流程相关
const flowCodeOptions = [
{
value: currentProject.value?.id + '_extract',
label: '互提资料清单'
}
];
const flowCode = ref<string>('');
const status = ref<string>('');
const dialogVisible = reactive<DialogOption>({
visible: false,
title: '流程定义'
});
//提交组件
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
//审批记录组件
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
//按钮组件
const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
const leaveFormRef = ref<ElFormInstance>();
const dialog = reactive({
visible: false,
title: '',
isEdit: false
});
const submitFormData = ref<StartProcessBo>({
businessId: '',
flowCode: '',
variables: {}
});
const taskVariables = ref<Record<string, any>>({});
// 用户列表
const userList = ref([]);
const userMap = new Map();
// 表单引用
const mainFormRef = ref();
const handleClose = () => {
dialogVisible.visible = false;
flowCode.value = '';
buttonLoading.value = false;
};
// 组件引用
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const mainFormRef = ref<ElFormInstance>(); // 主表单引用
const documentsFormRef = ref<ElFormInstance>(); // 资料列表表单引用
// 表单数据
const form = reactive({
const form = reactive<FormData>({
projectId: currentProject.value?.id,
userId: '', // 收资人
user_major: '', // 专业
phone: '', // 电话
email: '', // 邮箱
userId: '',
user_major: '',
phone: '',
email: '',
id: '',
status: '',
documents: [
{
id: Date.now(),
catalogueName: '', // 卷册目录名称
remark: '', // 备注
volumeCatalogId: '' //卷册目录ID
catalogueName: '',
remark: '',
volumeCatalogId: ''
}
] as Array<{
id: number;
catalogueName: string;
remark: string;
volumeCatalogId: string;
}>
]
});
// 主表单验证规则
const mainRules = reactive({
userId: [{ required: true, message: '请输入收资人', trigger: 'blur' }],
@ -249,11 +257,22 @@ const mainRules = reactive({
{ type: 'email', message: '请输入正确的邮箱格式', trigger: 'blur' }
]
});
// 用户列表相关
const userList = ref([]);
const userMap = new Map();
// 流程提交数据
const submitFormData = ref<StartProcessBo>({
businessId: '',
flowCode: '',
variables: {}
});
const taskVariables = ref<Record<string, any>>({});
/** 表单重置 */
const reset = () => {
if (mainFormRef.value) {
mainFormRef.value.resetFields();
}
mainFormRef.value?.resetFields();
documentsFormRef.value?.resetFields();
// 重置资料列表，保留一个空项
form.documents = [
{
@ -263,9 +282,9 @@ const reset = () => {
volumeCatalogId: ''
}
];
leaveFormRef.value?.resetFields();
};
// 添加资料项
/** 添加资料项 */
const addDocumentItem = () => {
form.documents.push({
id: Date.now(),
@ -275,198 +294,256 @@ const addDocumentItem = () => {
});
};
// 删除资料项
/** 删除资料项 */
const removeDocumentItem = (index: number) => {
form.documents.splice(index, 1);
};
/** 提交按钮 */
/** 关闭流程选择对话框 */
const handleClose = () => {
dialogVisible.visible = false;
flowCode.value = '';
buttonLoading.value = false;
};
/** 提交表单（主逻辑） */
const submitForm = (status1: string) => {
status.value = status1;
buttonLoading.value = true;
dialog.visible = false;
// 验证表单数据
mainFormRef.value.validate(async (valid) => {
if (valid) {
console.log('验证成功');
// 1. 校验主表单（基础信息）
mainFormRef.value?.validate(async (mainValid) => {
if (!mainValid) {
proxy?.$modal.msgError('请完善基础必填信息');
buttonLoading.value = false;
return;
}
// 2. 校验资料列表表单（资料名称）
documentsFormRef.value?.validate(async (docsValid) => {
if (!docsValid) {
proxy?.$modal.msgError('请完善所有资料的“资料名称”');
buttonLoading.value = false;
return;
}
// 3. 表单校验通过，处理资料序号
form.documents.map((item, i) => {
item.num = i + 1;
});
let body = {
// 4. 提交数据到后端
const body = {
desExtractBo: {
projectId: currentProject.value?.id,
userId: form.userId, // 收资人
userMajor: form.user_major, // 专业
userId: form.userId,
userMajor: form.user_major,
id: form.id,
phone: form.phone, // 电话
email: form.email, // 邮箱
phone: form.phone,
email: form.email,
userName: userMap.get(form.userId)
},
catalogueList: form.documents
};
let res = await extractBatch(body);
if (res.code == 200) {
try {
const res = await extractBatch(body);
if (res.code === 200) {
form.id = res.data;
await submit(status.value, form); // 执行暂存/提交流程
} else {
ElMessage.error(res.msg);
}
} catch (err) {
ElMessage.error('提交失败，请重试');
} finally {
buttonLoading.value = false;
dialog.visible = false;
} else {
ElMessage.error(res.msg);
}
// 表单验证通过，执行提交逻辑
form.id = res.data;
submit(status.value, form);
} else {
// 表单验证失败，提示用户并关闭加载状态
proxy?.$modal.msgError('请完善必填信息后再提交');
buttonLoading.value = false;
return false;
}
});
});
};
/** 提交流程选择 */
const submitFlow = async () => {
handleStartWorkFlow(form);
await handleStartWorkFlow(form);
dialogVisible.visible = false;
};
//提交申请
/** 启动工作流 */
const handleStartWorkFlow = async (data: LeaveForm) => {
try {
submitFormData.value.flowCode = flowCode.value;
submitFormData.value.businessId = data.id;
//流程变量
// 流程变量配置
taskVariables.value = {
// leave4/5 使用的流程变量
userList: ['1', '3', '4']
};
submitFormData.value.variables = taskVariables.value;
const resp = await startWorkFlow(submitFormData.value);
if (submitVerifyRef.value) {
buttonLoading.value = false;
submitVerifyRef.value.openDialog(resp.data.taskId);
}
} catch (err) {
ElMessage.error('启动流程失败');
} finally {
buttonLoading.value = false;
}
};
//审批记录
/** 打开审批记录 */
const handleApprovalRecord = () => {
approvalRecordRef.value.init(form.id);
approvalRecordRef.value?.init(form.id);
};
//提交回调
/** 提交回调：关闭页面返回上一级 */
const submitCallback = async () => {
await proxy.$tab.closePage(proxy.$route);
proxy.$router.go(-1);
};
//审批
/** 打开审批验证弹窗 */
const approvalVerifyOpen = async () => {
submitVerifyRef.value.openDialog(routeParams.value.taskId);
submitVerifyRef.value?.openDialog(routeParams.value.taskId);
};
const submit = async (status, data) => {
/** 暂存/提交分支逻辑 */
const submit = async (status: string, data: FormData) => {
if (status === 'draft') {
buttonLoading.value = false;
proxy?.$modal.msgSuccess('暂存成功');
proxy.$tab.closePage(proxy.$route);
await proxy.$tab.closePage(proxy.$route);
proxy.$router.go(-1);
} else {
if ((form.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
// 新增/草稿状态下，默认选择第一个流程并弹窗
if ((data.status === 'draft' && !flowCode.value) || routeParams.value.type === 'add') {
flowCode.value = flowCodeOptions[0].value;
dialogVisible.visible = true;
return;
}
//说明启动过先随意穿个参数
if (flowCode.value === '' || flowCode.value === null) {
// 已有流程时默认填充占位值
if (!flowCode.value) {
flowCode.value = 'xx';
}
await handleStartWorkFlow(data);
}
};
/** 查询当前部门的所有用户 */
/** 获取部门用户列表 */
const getDeptAllUser = async (deptId: any) => {
try {
const res = await systemUserList({ deptId });
// 实际项目中使用接口返回的数据
userList.value = res.rows;
userList.value.forEach((user) => {
userMap.set(user.userId, user.nickName);
});
} catch (error) {
} catch (err) {
ElMessage.error('获取用户列表失败');
}
};
// 查询数据 再次回显
/** 回显表单数据（编辑/查看/审批场景） */
const byProjectIdAll = async () => {
loading.value = true;
buttonLoading.value = false;
// 调用接口获取数据
const res = await extractDetail(routeParams.value.id);
if (res.code === 200 && res.data) {
const data = res.data;
// 回显基本信息
form.userId = data.userId || '';
form.user_major = data.userMajor || '';
form.phone = data.phone || '';
form.email = data.email || '';
form.id = data.id || '';
form.status = data.status || '';
if (data.status != 'draft') {
disableAll.value = true;
}
try {
const res = await extractDetail(routeParams.value.id);
if (res.code === 200 && res.data) {
const data = res.data;
// 回显基础信息
form.userId = data.userId || '';
form.user_major = data.userMajor || '';
form.phone = data.phone || '';
form.email = data.email || '';
form.id = data.id || '';
form.status = data.status || '';
// 回显资料文件列表
if (data.catalogueList && data.catalogueList.length > 0) {
// 清空现有列表
form.documents = [];
// 填充新数据
data.catalogueList.forEach((item: any, index: number) => {
form.documents.push({
id: item.id || Date.now() + index, // 确保id唯一
// 非草稿状态禁用表单
if (data.status !== 'draft') {
disableAll.value = true;
}
// 回显资料列表
if (data.catalogueList && data.catalogueList.length > 0) {
form.documents = data.catalogueList.map((item: any, index: number) => ({
id: item.id || Date.now() + index,
catalogueName: item.catalogueName || '',
remark: item.remark || '',
volumeCatalogId: item.volumeCatalogId
});
});
} else {
// 如果没有资料，保持一个空项
form.documents = [
{
id: Date.now(),
catalogueName: '',
remark: '',
volumeCatalogId: ''
}
];
volumeCatalogId: item.volumeCatalogId || ''
}));
} else {
form.documents = [
{
id: Date.now(),
catalogueName: '',
remark: '',
volumeCatalogId: ''
}
];
}
}
} catch (err) {
ElMessage.error('获取表单数据失败');
} finally {
loading.value = false;
buttonLoading.value = false;
}
loading.value = false;
buttonLoading.value = false;
};
/** 查询卷册目录列表 */
/** 获取当前用户详情 */
const getUserDetail = async () => {
try {
const res = await getUser(userId.value);
userInfo.value = res.data.user;
form.userId = userInfo.value.userId;
form.phone = userInfo.value.phonenumber;
form.email = userInfo.value.email;
} catch (err) {
ElMessage.error('获取用户信息失败');
}
};
/** 获取卷册目录列表 */
const getList = async () => {
const res = await listVolumeCatalog({ projectId: currentProject.value?.id, auditStatus: 'finish' });
volumeCatalogList.value = res.rows;
volumeCatalogList.value.forEach((e) => {
volumeMap.set(e.design, e);
});
try {
const res = await catalogList(currentProject.value?.id);
volumeCatalogList.value = res.data;
volumeCatalogList.value.forEach((e) => {
volumeMap.set(e.design, e);
});
} catch (err) {
ElMessage.error('获取卷册目录失败');
}
};
const handleSelect = (val, item) => {
item.catalogueName = volumeMap.get(val).documentName;
/** 选择资料名称后回显目录名称 */
const handleSelect = (val: string, item: DocumentItem) => {
item.catalogueName = volumeMap.get(val)?.documentName || '';
};
/** 页面挂载初始化 */
onMounted(() => {
nextTick(async () => {
routeParams.value = proxy.$route.query;
reset();
loading.value = false;
getList(); // 获取卷册目录
if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
getDeptAllUser(userStore.deptId).then(() => {
byProjectIdAll();
});
// 初始化基础数据
await getList();
await getUserDetail();
// 编辑/查看/审批场景：加载已有数据
const { type } = routeParams.value;
if (type === 'update' || type === 'view' || type === 'approval') {
await getDeptAllUser(userStore.deptId);
await byProjectIdAll();
} else {
getDeptAllUser(userStore.deptId);
await getDeptAllUser(userStore.deptId);
}
});
});
</script>
<style scoped lang="scss">
/* 全局样式 */
/* 全局变量 */
:root {
--primary: #409eff;
--primary-light: #66b1ff;
@ -543,10 +620,6 @@ onMounted(() => {
/* 卡片样式优化 */
.el-card {
transition: all 0.3s ease;
&:hover {
/* transform: translateY(-2px); */
}
}
/* 对话框样式优化 */

5
src/views/design/appointment/index.vue
View File

@ -510,7 +510,6 @@ const submitForm = async () => {
try {
// 1. 基础表单验证
await leaveFormRef.value.validate();
// 2. 提交前二次校验：「专业+人员」组合唯一性
let hasDuplicate = false;
const allKeys: string[] = [];
@ -568,7 +567,6 @@ const submitForm = async () => {
)
]
};
// 4. 数据处理（保持原有逻辑不变）
const arr = [];
userList.value.forEach((item) => {
@ -596,6 +594,7 @@ const submitForm = async () => {
});
if (res.code == 200) {
disabledForm.value = true;
loading.close();
ElMessage.success('提交成功');
} else {
ElMessage.error(res.msg || '提交失败');
@ -603,7 +602,7 @@ const submitForm = async () => {
} catch (error) {
ElMessage.error('请完善表单信息后再提交');
} finally {
ElLoading.service().close();
// ElLoading.service().close();
}
};

10
src/views/design/designChange/index.vue
View File

@ -93,7 +93,7 @@
link
icon="View"
v-hasPermi="['design:designChange:query']"
v-if="scope.row.status == 'back' || scope.row.status == 'termination'"
v-if="scope.row.status != 'draft'"
@click="handleViewHistory(scope.row)"
>查看单据</el-button
>
@ -107,13 +107,7 @@
<el-table v-if="fileList.length > 0" :data="fileList" style="width: 100%" border>
<el-table-column prop="fileName" label="文件名称" align="center">
<template #default="scope">
<el-link
:key="scope.row.fileId"
:href="scope.row.fileUrl"
target="_blank"
:type="scope.row.status == '1' ? 'primary' : 'info'"
:underline="false"
>
<el-link :key="scope.row.fileId" :href="scope.row.fileUrl" target="_blank" type="primary" :underline="false">
{{ scope.row.originalName }}
</el-link>
</template>

50
src/views/design/designChange/indexEdit.vue
View File

@ -74,26 +74,22 @@
></el-col>
<el-col :span="24">
<el-form-item label="原设计处置" prop="designDisposal">
<el-radio-group v-model="form.extendDetail.designDisposal">
<el-radio-group v-model="form.extendDetail.designDisposal" @change="handleRadio">
<el-radio value="1" size="large">原图作废</el-radio>
<el-radio value="2" size="large">原图保留，部分修改</el-radio>
<el-radio value="2" :disabled="!designId" size="large">原图保留，部分修改</el-radio>
<el-radio value="3" size="large">原图保留，补充设计</el-radio>
</el-radio-group>
</el-form-item></el-col
>
<el-col :span="24" v-if="form.extendDetail.designDisposal == 2 && form.volumeNo">
<el-form-item label="选择保留文件" prop="designPhase">
<el-select
id="projectSelect"
v-model="form.saveFile"
placeholder="请选择保留文件"
multiple
style="width: 150px; margin-right: 20px"
>
<el-option v-for="project in fileVoList" :key="project.id" :label="project.fileName" :value="project.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.extendDetail.designDisposal == 2">
<el-form-item label="保留文件" prop="saveFile">
<el-checkbox-group v-model="form.saveFile">
<el-checkbox v-for="dict in blueprintListAll" :key="dict.id" :value="dict.id">
{{ dict.fileName }}
</el-checkbox>
</el-checkbox-group>
</el-form-item></el-col
>
<el-col :span="12">
<el-form-item label="设计阶段" prop="designPhase">
<el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item
@ -179,8 +175,7 @@
<script setup name="Leave" lang="ts">
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { useUserStoreHook } from '@/store/modules/user';
import { addDesignChange, getDesignChange } from '@/api/design/designChange';
import { listVolumeCatalog } from '@/api/design/volumeCatalog';
import { addDesignChange, getDesignChange, catalogList, blueprintList } from '@/api/design/designChange';
const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
const route = useRoute();
const router = useRouter();
@ -190,6 +185,7 @@ const userStore = useUserStoreHook();
const currentProject = computed(() => userStore.selectedProject);
const buttonLoading = ref(false);
const volumeCatalogList = ref([]);
const blueprintListAll = ref([]);
let volumeMap = new Map();
//路由参数
const routeParams = ref<Record<string, any>>({});
@ -200,6 +196,7 @@ const dialog = reactive({
isEdit: false
});
const fileVoList = ref([]);
const designId = ref('');
const initFormData = {
id: undefined,
projectId: currentProject.value?.id,
@ -219,7 +216,7 @@ const initFormData = {
fileId: undefined,
status: undefined,
remark: undefined,
saveFile: undefined,
saveFile: [],
extendDetail: {
changeCategory: undefined,
ImpProcedure: undefined,
@ -287,16 +284,27 @@ const submitForm = () => {
};
/** 查询卷册目录列表 */
const getList = async () => {
const res = await listVolumeCatalog({ projectId: currentProject.value?.id, auditStatus: 'finish' });
volumeCatalogList.value = res.rows;
const res = await catalogList(currentProject.value?.id);
volumeCatalogList.value = res.data;
volumeCatalogList.value.forEach((e) => {
volumeMap.set(e.volumeNumber, e);
});
};
// 获取图纸列表
const getBlueprintList = async () => {
const res = await blueprintList(designId.value);
blueprintListAll.value = res.data;
};
const handleRadio = (val) => {
form.value.saveFile = [];
if (val == 2) {
getBlueprintList();
}
};
const handleSelect = (val) => {
let obj = volumeMap.get(val);
console.log(obj);
fileVoList.value = obj.fileVoList;
designId.value = obj.design;
form.value.volumeName = obj.volumeName;
form.value.specialty = obj.specialty;
form.value.specialtyName = obj.specialtyName;

267
src/views/design/drawing/index.vue
View File

@ -1,77 +1,78 @@
<template>
<div class="p-2 volumeCatalog">
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="卷册号" prop="volumeNumber">
<el-input v-model="queryParams.volumeNumber" placeholder="请输入卷册号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="资料名称" prop="documentName">
<el-input v-model="queryParams.documentName" placeholder="请输入资料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery" v-hasPermi="['design:volumeCatalog:query']">重置</el-button>
</el-form-item>
</el-form>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="volumeCatalogList">
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="子项名称" align="center" prop="designSubitem" />
<el-table-column label="专业" align="center" prop="specialtyName"> </el-table-column>
<el-table-column label="设计人员" align="center" prop="principalName" />
<el-table-column label="卷册号" align="center" prop="volumeNumber" />
<el-table-column label="资料名称" align="center" prop="documentName" />
<el-table-column label="图纸文件" align="center" prop="remark" width="150">
<template #default="scope">
<el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeFile:query']">查看文件</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 查看文件列表 -->
<el-dialog draggable title="文件列表" v-model="viewVisible" width="800px">
<el-table :data="fileList" style="width: 100%" border>
<el-table-column prop="fileName" label="文件" align="center">
<template #default="scope">
<el-link
:key="scope.row.fileId"
:href="scope.row.fileUrl"
target="_blank"
:type="scope.row.status == '1' ? 'primary' : 'info'"
:underline="false"
@click="handleBookFile(scope.row)"
>
{{ scope.row.fileName }}
</el-link>
</template>
</el-table-column>
<el-table-column prop="size" label="状态" width="120" align="center">
<template #default="scope">
<el-tag :type="scope.row.status == 1 ? 'success' : 'info'">{{ scope.row.status == 1 ? '使用中' : '已作废' }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="240" align="center">
<template #default="scope">
<el-button link type="primary" icon="view" @click="handleViewHis(scope.row)">查阅记录</el-button>
<el-button type="danger" link icon="Download" @click="handleDownload(scope.row)"> 下载 </el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<span>
<el-button type="primary" @click="viewVisible = false">关闭</el-button>
<div class="p-2 volumeCatalog drawing">
<div class="file-category">
<span style="color: #757575; display: inline-block; margin-bottom: 15px">文件分类</span>
<!-- 优化了图标与文字的对齐和间距 -->
<div v-for="(item, i) of FolderList" :key="i" :class="{ active: currentActive === i }" @click="handleClick(item, i)" class="category-item">
<el-icon :size="20" class="folder-icon">
<Folder />
</el-icon>
<span class="folder-name">
{{ item.catalogueName }}
</span>
</template>
</el-dialog>
<el-dialog draggable title="文件列表" v-model="viewVisible1" width="500px">
</div>
</div>
<div class="boxs">
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="卷册号" prop="volumeNumber">
<el-input v-model="queryParams.volumeNumber" placeholder="请输入卷册号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="资料名称" prop="documentName">
<el-input v-model="queryParams.documentName" placeholder="请输入资料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery" v-hasPermi="['design:volumeCatalog:query']">重置</el-button>
</el-form-item>
</el-form>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="volumeCatalogList">
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="卷册号" align="center" prop="volumeNumber" />
<el-table-column label="资料名称" align="center" prop="documentName" />
<el-table-column label="子项名称" align="center" prop="designSubitem" />
<el-table-column label="专业" align="center" prop="specialtyName"> </el-table-column>
<el-table-column label="设计人员" align="center" prop="principalName" />
<el-table-column label="版本号" align="center" prop="version" />
<el-table-column label="图纸文件" align="center" prop="remark" width="300">
<template #default="scope">
<el-link
:key="scope.row.fileId"
:href="scope.row.fileUrl"
target="_blank"
type="primary"
:underline="false"
@click="handleBookFile(scope.row)"
>
{{ scope.row.fileName }}
</el-link>
</template>
</el-table-column>
<el-table-column label="操作" align="center" prop="remark" width="300">
<template #default="scope">
<el-button link type="primary" icon="view" @click="handleViewHis(scope.row)">查阅记录</el-button>
<el-button type="danger" link icon="Download" @click="handleDownload(scope.row)"> 下载 </el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
</div>
<el-dialog draggable title="查阅记录" v-model="viewVisible1" width="500px">
<el-table :data="histroyList" style="width: 100%" border>
<el-table-column type="index" label="序号" align="center" width="80"> </el-table-column>
<el-table-column prop="userName" label="用户名称" align="center"> </el-table-column>
<el-table-column label="下载或查看" align="center">
<template #default="scope">
<el-tag type="primary" v-if="scope.row.status == 2">下载</el-tag>
<el-tag type="success" v-else>查看</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="查阅时间" align="center"> </el-table-column>
</el-table>
<template #footer>
@ -87,7 +88,7 @@
import { listVolumeCatalog, addVolumeCatalog, updateVolumeCatalog } from '@/api/design/volumeCatalog';
import { VolumeCatalogVO } from '@/api/design/volumeCatalog/types';
import { useUserStoreHook } from '@/store/modules/user';
import { volumeFileViewer, volumeFileViewerList } from '@/api/design/drawing';
import { volumeFileViewer, volumeFileViewerList, joinList } from '@/api/design/drawing';
const fileList = ref([]);
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const volumeCatalogList = ref<VolumeCatalogVO[]>([]);
@ -101,12 +102,17 @@ const userStore = useUserStoreHook();
const currentProject = computed(() => userStore.selectedProject);
const queryFormRef = ref<ElFormInstance>();
const volumeCatalogFormRef = ref<ElFormInstance>();
const catalogueId = ref(3);
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const FolderList = [
{ id: 3, catalogueName: '蓝图' },
{ id: 1, catalogueName: '过程图纸' },
{ id: 4, catalogueName: '废弃图纸' }
];
const uploadForm = reactive({
userIds: [],
volumeCatalogId: undefined,
@ -150,7 +156,7 @@ const histroyList = ref([]);
const getList = async () => {
loading.value = true;
try {
const res = await listVolumeCatalog(queryParams.value);
const res = await joinList({ type: catalogueId.value, ...queryParams.value });
volumeCatalogList.value = res.rows;
total.value = res.total;
} finally {
@ -203,25 +209,34 @@ const submitForm = () => {
}
});
};
const handleDownload = (row: any) => {
getCheck(row);
getCheck(row, 2);
proxy?.$download.oss(row.fileId);
};
const handleBookFile = (row: any) => {
getCheck(row);
getCheck(row, 1);
};
// 调用查阅接口
const getCheck = async (row) => {
volumeFileViewer({ volumeFileId: row.fileId });
const getCheck = async (row, status) => {
volumeFileViewer({ volumeFileId: row.id, status });
};
const handleViewHis = async (row) => {
viewVisible1.value = true;
let res = await volumeFileViewerList(row.fileId);
let res = await volumeFileViewerList(row.id);
if (res.code == 200) {
histroyList.value = res.rows;
}
};
const currentActive = ref(0);
// 点击事件处理函数
const handleClick = (item, index) => {
console.log(item.id);
currentActive.value = index;
catalogueId.value = item.id;
// 重新获取数据
getList();
};
onMounted(() => {
getList();
});
@ -240,3 +255,99 @@ onUnmounted(() => {
listeningProject();
});
</script>
<style lang="scss">
.drawing {
display: flex;
.el-tabs__header {
height: 90vh !important;
}
.file-category {
width: 200px;
display: flex;
flex-direction: column;
/* 移除固定宽度，让容器根据内容自适应 */
background-color: #ffffff;
padding: 10px;
border-radius: 6px;
/* 限制最大宽度，防止内容过长 */
/* max-width: 200px; */
margin-right: 10px;
}
.file-category > div {
cursor: pointer;
padding: 8px 12px;
margin-bottom: 4px;
border-radius: 4px;
display: flex;
/* 文本不换行，确保宽度由内容决定 */
white-space: nowrap;
transition: all 0.2s ease;
> span {
margin-left: 6px;
/* color: #676767;
font-size: 18px; */
}
}
.file-category {
width: 200px;
display: flex;
flex-direction: column;
background-color: #ffffff;
padding: 10px;
border-radius: 8px;
margin-right: 10px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
// 分类项样式优化
.category-item {
cursor: pointer;
padding: 10px 12px;
margin-bottom: 4px;
border-radius: 6px;
display: inline-flex;
align-items: center; /* 垂直居中对齐 */
white-space: nowrap;
transition: all 0.25s ease;
font-size: 14px;
color: #334155;
line-height: 1; /* 确保行高一致 */
&:hover {
background-color: #f1f5f9;
transform: translateX(2px);
}
}
// 图标样式
.folder-icon {
color: #94a3b8;
transition: color 0.25s ease;
}
// 文件夹名称样式
.folder-name {
margin-left: 8px; /* 增加图标与文字间距 */
overflow: hidden;
text-overflow: ellipsis;
max-width: calc(100% - 30px); /* 限制最大宽度，防止溢出 */
}
// 活跃状态样式
.category-item.active {
background-color: #eff6ff;
color: #2563eb;
font-weight: 500;
.folder-icon {
color: #2563eb;
}
}
.boxs {
width: calc(100% - 220px);
}
}
</style>

19
src/views/design/volumeCatalog/comm/TableContent.vue
View File

@ -3,13 +3,7 @@
<!-- 文件名称列 -->
<el-table-column prop="fileName" label="文件" align="center">
<template #default="scope">
<el-link
:key="scope.row.fileId"
:href="scope.row.fileUrl"
target="_blank"
:type="scope.row.status == '1' ? 'primary' : 'info'"
:underline="false"
>
<el-link :key="scope.row.fileId" :href="scope.row.fileUrl" target="_blank" type="primary" :underline="false">
{{ scope.row.fileName }}
</el-link>
</template>
@ -21,13 +15,18 @@
</template>
</el-table-column>
<!-- 审核状态列 -->
<el-table-column label="审核状态" align="center" prop="auditStatus" width="100">
<el-table-column label="审核状态" align="center" width="100">
<template #default="scope">
<dict-tag :options="wfBusinessStatus" :value="scope.row.auditStatus" />
<dict-tag v-if="scope.row.status == 1 && scope.row.type != 4" :options="wfBusinessStatus" :value="scope.row.auditStatus" />
</template>
</el-table-column>
<el-table-column label="是否变更" align="center" prop="auditStatus" width="100">
<template #default="scope">
<span>{{ scope.row.status == 1 ? '否' : '是' }}</span>
</template>
</el-table-column>
<!-- 操作列 - 通过slot接收不同标签页的操作按钮 -->
<el-table-column label="操作" width="240" align="center">
<el-table-column label="操作" width="300" align="center">
<template #default="scope">
<slot name="operation" :row="scope.row"></slot>
</template>

82
src/views/design/volumeCatalog/index.vue
View File

@ -63,23 +63,17 @@
<el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeFile:query']">查看文件</el-button>
</template>
</el-table-column>
<el-table-column label="上传说明" align="center" prop="explainText">
<el-table-column label="外部意见" align="center">
<template #default="scope">
{{ scope.row.fileVoList[0]?.explainText }}
<el-link v-if="scope.row.opinion" :key="scope.row.opinion" :href="scope.row.opinion" target="_blank" type="primary" :underline="false">
{{ scope.row.opinion }}
</el-link>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" fixed="right" width="200">
<template #default="scope">
<el-button
link
type="primary"
v-if="scope.row.auditStatus != 'finish' && scope.row.auditStatus != 'termination' && scope.row.auditStatus != 'waiting'"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['design:volumeFile:edit']"
>修改</el-button
>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:volumeFile:edit']">修改</el-button>
<el-button
link
type="primary"
@ -89,6 +83,7 @@
v-hasPermi="['design:volumeFile:add']"
>上传图纸</el-button
>
<el-button link type="primary" icon="Upload" @click="handleOpinion(scope.row)">外部意见</el-button>
</template>
</el-table-column>
</el-table>
@ -156,21 +151,28 @@
</div>
</el-dialog>
<!-- 查看文件列表 -->
<el-dialog draggable title="图纸列表" v-model="viewVisible" width="45%">
<el-dialog draggable title="图纸列表" v-model="viewVisible" width="1000px">
<el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="蓝图" name="3"
><TableContent :data="fileList" :wf-business-status="wf_business_status">
<template #operation="{ row }">
<el-button link type="primary" icon="edit" @click="handleAuditLantu(row)" v-if="row.auditStatus == 'draft' || row.auditStatus == 'back'"
<el-button
link
type="primary"
icon="edit"
@click="handleAuditLantu(row)"
v-if="(row.status != '2' && row.auditStatus == 'draft') || row.auditStatus == 'back'"
>审核</el-button
>
<el-button link type="primary" icon="View" v-if="row.auditStatus != 'draft'" @click="handleAuditViewLantu(row)">查看流程</el-button>
<el-button link type="primary" icon="View" v-if="row.status != '2' && row.auditStatus != 'draft'" @click="handleAuditViewLantu(row)"
>查看流程</el-button
>
<el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
<el-button
type="warning"
link
icon="View"
v-if="row.auditStatus == 'back' || row.auditStatus == 'termination' || row.auditStatus == 'finish'"
v-if="(row.status != '2' && row.auditStatus == 'back') || row.auditStatus == 'termination' || row.auditStatus == 'finish'"
@click="handleViewHistory(row)"
>查看单据</el-button
>
@ -196,17 +198,10 @@
</template>
</TableContent></el-tab-pane
>
<el-tab-pane label="变更" name="2"
><TableContent :data="fileList" :wf-business-status="wf_business_status">
<template #operation="{ row }">
<el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
</template>
</TableContent></el-tab-pane
>
<el-tab-pane label="作废 " name="4"
><TableContent :data="fileList" :wf-business-status="wf_business_status">
<template #operation="{ row }">
<el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载1 </el-button>
<el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
</template>
</TableContent></el-tab-pane
>
@ -220,6 +215,18 @@
<el-dialog draggable title="单据" v-model="dialogHistory" width="800px">
<histroy ref="histroyRef"></histroy>
</el-dialog>
<el-dialog draggable title="上传外部意见" v-model="uploadOpinionVisible" width="500px" append-to-body>
<el-form :model="updateRow" label-width="80px" :inline="false">
<el-form-item label="外部意见">
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" :onUploadSuccess="onUploadSuccess" v-model="opinion"></file-upload>
</el-form-item>
</el-form>
<span style="font-size: 12px; color: #999999">注意:请上传pdf格式文件</span>
<div style="display: flex; justify-content: flex-end">
<el-button type="primary" @click="onSubmitOpinion">确定</el-button>
<el-button @click="uploadOpinionVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
@ -253,9 +260,14 @@ const TableContentRef = ref<InstanceType<typeof TableContentRef>>();
const single = ref(true);
const multiple = ref(true);
const activeName = ref('3');
const uploadOpinionVisible = ref(false);
const design = ref('');
const total = ref(0);
const dialogHistory = ref(false);
const opinion = ref('');
const updateRow = ref({
opinion: []
});
// 获取用户 store
const userStore = useUserStoreHook();
// 从 store 中获取项目列表和当前选中的项目
@ -422,7 +434,31 @@ const handleView = (row?: any) => {
/** 上传文件按钮操作 */
const uploadVisible = ref(false);
const viewVisible = ref(false);
// 上传外部意见
const handleOpinion = (row) => {
uploadOpinionVisible.value = true;
updateRow.value = row;
opinion.value = '';
};
const onSubmitOpinion = async () => {
// 提交外部意见
if (opinion.value.length == 0) {
proxy.$modal.msgError('请上传外部意见');
return;
}
await updateVolumeCatalog({ ...updateRow.value });
};
const onUploadSuccess = (fileList, res) => {
if (res.code == 200) {
updateRow.value.opinion = res.data.url;
}
};
const handleUpload = async (row?: any) => {
// 判断是否有专业和设计人员
if (!row?.principalName || !row?.specialtyName) {
proxy?.$modal.warning('请先选择专业和设计人员');
return;
}
resetUploadForm();
uploadForm.volumeCatalogId = row.design;
userList.value = row.noViewerList;

32
src/views/materials/materialsEquipment/materialReceive/index.vue
View File

@ -145,8 +145,13 @@
<div v-for="(item, index) in form.itemList" :key="index" class="detail-item">
<el-row>
<el-col :span="12">
<el-form-item label="名称" :prop="`itemList.${index}.name`" :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
<el-input v-model="item.name" placeholder="请输入名称" />
<el-form-item
disabled
label="名称"
:prop="`itemList.${index}.name`"
:rules="{ required: true, message: '名称不能为空', trigger: 'blur' }"
>
<el-input disabled v-model="item.name" placeholder="请输入名称" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -155,12 +160,12 @@
:prop="`itemList.${index}.specification`"
:rules="{ required: true, message: '规格不能为空', trigger: 'blur' }"
>
<el-input v-model="item.specification" placeholder="请输入规格" />
<el-input disabled v-model="item.specification" placeholder="请输入规格" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位" :prop="`itemList.${index}.unit`" :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
<el-input v-model="item.unit" placeholder="请输入单位" />
<el-input disabled v-model="item.unit" placeholder="请输入单位" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -169,7 +174,7 @@
:prop="`itemList.${index}.quantity`"
:rules="{ required: true, message: '数量不能为空', trigger: 'blur' }"
>
<el-input type="number" v-model="item.quantity" placeholder="请输入数量" />
<el-input disabled type="number" v-model="item.quantity" placeholder="请输入数量" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -178,7 +183,7 @@
:prop="`itemList.${index}.acceptedQuantity`"
:rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }"
>
<el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
<el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -345,7 +350,20 @@ const data = reactive({
supplierUnit: undefined,
params: {}
},
rules: {}
rules: {
// 物资采购单
docId: [{ required: true, message: '请选择物资采购单', trigger: 'change' }],
// 材料来源
materialSource: [{ required: true, message: '请选择材料来源', trigger: 'change' }],
// 表单编号
formCode: [{ required: true, message: '请输入表单编号', trigger: 'blur' }],
// 采购单编号
docCode: [{ required: true, message: '请输入采购单编号', trigger: 'blur' }],
// 供货单位
supplierUnit: [{ required: true, message: '请输入供货单位', trigger: 'blur' }],
// 订货单位
orderingUnit: [{ required: true, message: '请输入订货单位', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);