图纸 优化
This commit is contained in:
@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
|
|||||||
VITE_APP_ENV = 'development'
|
VITE_APP_ENV = 'development'
|
||||||
|
|
||||||
# 开发环境
|
# 开发环境
|
||||||
VITE_APP_BASE_API = 'http://192.168.110.180:8898'
|
VITE_APP_BASE_API = 'http://192.168.110.159:8898'
|
||||||
|
|
||||||
# 无人机接口地址
|
# 无人机接口地址
|
||||||
|
|
||||||
|
@ -17,9 +17,16 @@ export const getDrawingreview = (id) => {
|
|||||||
method: 'get'
|
method: 'get'
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
//查询设计-图纸评审详细
|
||||||
|
export const drawingreviewzQuery = (id) => {
|
||||||
|
return request({
|
||||||
|
url: '/design/drawingreview/zQuery/' + id,
|
||||||
|
method: 'get'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
//新增设计-图纸评审
|
//新增设计-图纸评审
|
||||||
export const addDrawingreview = (params,data) => {
|
export const addDrawingreview = (params, data) => {
|
||||||
return request({
|
return request({
|
||||||
url: '/design/drawingreview/drawingReviewUpload',
|
url: '/design/drawingreview/drawingReviewUpload',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@ -44,4 +51,25 @@ export const fillOutTheDesignVerificationForm = (data) => {
|
|||||||
method: 'put',
|
method: 'put',
|
||||||
data
|
data
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
// 设计验证表
|
||||||
|
export const subProjectListAll = (id) => {
|
||||||
|
return request({
|
||||||
|
url: '/design/drawingreview/subProjectList/' + id,
|
||||||
|
method: 'get'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
// 获取历史设计图纸评审
|
||||||
|
export const ObtainHistoricalDesignDrawingsForReview = (id) => {
|
||||||
|
return request({
|
||||||
|
url: '/design/drawingreview/ObtainHistoricalDesignDrawingsForReview/' + id,
|
||||||
|
method: 'get'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
// 根据历史设计图纸评审查询详情
|
||||||
|
export const drawingreview = (id) => {
|
||||||
|
return request({
|
||||||
|
url: '/design/drawingreview/' + id,
|
||||||
|
method: 'get'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
@ -17,3 +17,10 @@ export const byProjectId = (ProjectId) => {
|
|||||||
method: 'get'
|
method: 'get'
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
// 导出收资清单
|
||||||
|
export const exportWord = (params) => {
|
||||||
|
return request({
|
||||||
|
url: '/design/collect/exportWord?id=' + params.id,
|
||||||
|
method: 'post'
|
||||||
|
});
|
||||||
|
};
|
||||||
|
@ -81,9 +81,8 @@
|
|||||||
<UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
|
<UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
|
||||||
<!-- 弹窗选人 -->
|
<!-- 弹窗选人 -->
|
||||||
<UserSelect ref="porUserRef" :multiple="true" :userIds="popUserIds" @confirm-call-back="handlePopUser"></UserSelect>
|
<UserSelect ref="porUserRef" :multiple="true" :userIds="popUserIds" @confirm-call-back="handlePopUser"></UserSelect>
|
||||||
|
|
||||||
<!-- 驳回开始 -->
|
<!-- 驳回开始 -->
|
||||||
<el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
|
<el-dialog v-model="backVisible" draggable title="驳回" :width="isDrawing ? '800px' : '40%'" :close-on-click-modal="false">
|
||||||
<el-form v-if="task.flowStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
|
<el-form v-if="task.flowStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
|
||||||
<el-form-item label="驳回节点">
|
<el-form-item label="驳回节点">
|
||||||
<el-select v-model="backForm.nodeCode" clearable placeholder="请选择" style="width: 300px">
|
<el-select v-model="backForm.nodeCode" clearable placeholder="请选择" style="width: 300px">
|
||||||
@ -108,6 +107,10 @@
|
|||||||
<el-input v-model="backForm.message" type="textarea" resize="none" />
|
<el-input v-model="backForm.message" type="textarea" resize="none" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
<div class="box" v-if="isDrawing">
|
||||||
|
<span>设计验证</span>
|
||||||
|
<detailForm ref="detailFormRef"></detailForm>
|
||||||
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer" style="float: right; padding-bottom: 20px">
|
<div class="dialog-footer" style="float: right; padding-bottom: 20px">
|
||||||
<el-button :disabled="backButtonDisabled" type="primary" @click="handleBackProcess">确认</el-button>
|
<el-button :disabled="backButtonDisabled" type="primary" @click="handleBackProcess">确认</el-button>
|
||||||
@ -129,6 +132,15 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
<el-dialog v-model="isShowTermination" title="终止任务" width="800px" draggable :close-on-click-modal="false">
|
||||||
|
<detailForm ref="detailFormTeRef"></detailForm>
|
||||||
|
<template #footer>
|
||||||
|
<div class="dialog-footer" style="float: right; padding-bottom: 20px">
|
||||||
|
<el-button type="primary" @click="handleTermination">确认</el-button>
|
||||||
|
<el-button @click="isShowTermination = false">取消</el-button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -151,12 +163,14 @@ import UserSelect from '@/components/UserSelect';
|
|||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
import { UserVO } from '@/api/system/user/types';
|
import { UserVO } from '@/api/system/user/types';
|
||||||
import { FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
|
import { FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
|
||||||
|
import detailForm from '@/views/design/drawingreview/detailForm.vue';
|
||||||
const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>();
|
const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>();
|
||||||
const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
|
const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
|
||||||
const delegateTaskRef = ref<InstanceType<typeof UserSelect>>();
|
const delegateTaskRef = ref<InstanceType<typeof UserSelect>>();
|
||||||
const multiInstanceUserRef = ref<InstanceType<typeof UserSelect>>();
|
const multiInstanceUserRef = ref<InstanceType<typeof UserSelect>>();
|
||||||
const porUserRef = ref<InstanceType<typeof UserSelect>>();
|
const porUserRef = ref<InstanceType<typeof UserSelect>>();
|
||||||
|
const detailFormRef = ref<InstanceType<typeof detailForm>>();
|
||||||
|
const detailFormTeRef = ref<InstanceType<typeof detailForm>>();
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
taskVariables: {
|
taskVariables: {
|
||||||
@ -185,6 +199,9 @@ const backButtonDisabled = ref(true);
|
|||||||
// 可驳回得任务节点
|
// 可驳回得任务节点
|
||||||
const taskNodeList = ref([]);
|
const taskNodeList = ref([]);
|
||||||
const nickName = ref({});
|
const nickName = ref({});
|
||||||
|
const isDrawing = ref(false); //图纸评审标志
|
||||||
|
const businessId = ref(''); //业务id
|
||||||
|
const isShowTermination = ref(false); //显示终止
|
||||||
//节点编码
|
//节点编码
|
||||||
const nodeCode = ref<string>('');
|
const nodeCode = ref<string>('');
|
||||||
const buttonObj = ref<any>({
|
const buttonObj = ref<any>({
|
||||||
@ -242,7 +259,9 @@ const backForm = ref<Record<string, any>>({
|
|||||||
});
|
});
|
||||||
|
|
||||||
//打开弹窗
|
//打开弹窗
|
||||||
const openDialog = async (id?: string) => {
|
const openDialog = async (id?: string, Drawing?: boolean, Id?: string) => {
|
||||||
|
businessId.value = Id || '';
|
||||||
|
isDrawing.value = Drawing;
|
||||||
selectCopyUserIds.value = undefined;
|
selectCopyUserIds.value = undefined;
|
||||||
selectCopyUserList.value = [];
|
selectCopyUserList.value = [];
|
||||||
form.value.fileId = undefined;
|
form.value.fileId = undefined;
|
||||||
@ -326,6 +345,7 @@ const handleBackProcessOpen = async () => {
|
|||||||
backLoading.value = true;
|
backLoading.value = true;
|
||||||
backButtonDisabled.value = true;
|
backButtonDisabled.value = true;
|
||||||
const data = await getBackTaskNode(task.value.definitionId, task.value.nodeCode);
|
const data = await getBackTaskNode(task.value.definitionId, task.value.nodeCode);
|
||||||
|
// 调用子组件
|
||||||
taskNodeList.value = data.data;
|
taskNodeList.value = data.data;
|
||||||
backLoading.value = false;
|
backLoading.value = false;
|
||||||
backButtonDisabled.value = false;
|
backButtonDisabled.value = false;
|
||||||
@ -341,6 +361,9 @@ const handleBackProcess = async () => {
|
|||||||
await backProcess(backForm.value).finally(() => {
|
await backProcess(backForm.value).finally(() => {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
buttonDisabled.value = false;
|
buttonDisabled.value = false;
|
||||||
|
if (isDrawing.value) {
|
||||||
|
detailFormRef.value.submit(businessId.value);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
dialog.visible = false;
|
dialog.visible = false;
|
||||||
backLoading.value = false;
|
backLoading.value = false;
|
||||||
@ -472,8 +495,28 @@ const handleDelegateTask = async (data) => {
|
|||||||
proxy?.$modal.msgWarning('请选择用户!');
|
proxy?.$modal.msgWarning('请选择用户!');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
const handleTermination = async () => {
|
||||||
|
// 终止任务
|
||||||
|
const params = {
|
||||||
|
taskId: taskId.value,
|
||||||
|
comment: form.value.message
|
||||||
|
};
|
||||||
|
await terminationTask(params).finally(() => {
|
||||||
|
// 提交设计验证
|
||||||
|
detailFormTeRef.value.submit(businessId.value);
|
||||||
|
loading.value = false;
|
||||||
|
buttonDisabled.value = false;
|
||||||
|
});
|
||||||
|
dialog.visible = false;
|
||||||
|
emits('submitCallback');
|
||||||
|
proxy?.$modal.msgSuccess('操作成功');
|
||||||
|
};
|
||||||
//终止任务
|
//终止任务
|
||||||
const handleTerminationTask = async () => {
|
const handleTerminationTask = async () => {
|
||||||
|
if (isDrawing.value) {
|
||||||
|
isShowTermination.value = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
const params = {
|
const params = {
|
||||||
taskId: taskId.value,
|
taskId: taskId.value,
|
||||||
comment: form.value.message
|
comment: form.value.message
|
||||||
@ -527,3 +570,15 @@ defineExpose({
|
|||||||
openDialog
|
openDialog
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
<style lang="scss">
|
||||||
|
.box {
|
||||||
|
border: 1px solid #f1f1f1;
|
||||||
|
padding: 16px;
|
||||||
|
border-radius: 10px;
|
||||||
|
> span {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #0090f9;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
<el-table v-loading="loading" :data="professionalList">
|
<el-table v-loading="loading" :data="professionalList">
|
||||||
<el-table-column label="序号" align="center" type="index" width="100" />
|
<el-table-column label="序号" align="center" type="index" width="100" />
|
||||||
<el-table-column label="提资人" align="center" prop="userName" />
|
<el-table-column label="提资人" align="center" prop="userName" />
|
||||||
<el-table-column label="专业" align="center" prop="userMajor" />
|
<el-table-column label="专业" align="center" prop="userMajorName" />
|
||||||
<el-table-column label="电话" align="center" prop="phone" />
|
<el-table-column label="电话" align="center" prop="phone" />
|
||||||
<el-table-column label="邮箱" align="center" prop="email" />
|
<el-table-column label="邮箱" align="center" prop="email" />
|
||||||
<el-table-column label="流程状态" align="center" prop="status">
|
<el-table-column label="流程状态" align="center" prop="status">
|
||||||
@ -41,11 +41,9 @@
|
|||||||
<el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
|
<el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
|
||||||
<el-button size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)">审核</el-button>
|
<el-button size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)">审核</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
|
<el-col :span="1.5" v-if="scope.row.status === 'finish'">
|
||||||
<el-button size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
|
<el-button size="small" type="primary" icon="Download" @click="handleDownload(scope.row)">导出</el-button>
|
||||||
</el-col> -->
|
</el-col>
|
||||||
</el-row>
|
|
||||||
<el-row :gutter="10" class="mb8">
|
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="warning" size="small" icon="View" v-if="scope.row.status != 'draft'" @click="handleViewInfo(scope.row)"
|
<el-button type="warning" size="small" icon="View" v-if="scope.row.status != 'draft'" @click="handleViewInfo(scope.row)"
|
||||||
>查看流程</el-button
|
>查看流程</el-button
|
||||||
@ -89,7 +87,7 @@ const queryFormRef = ref<ElFormInstance>();
|
|||||||
const { queryParams } = toRefs(data);
|
const { queryParams } = toRefs(data);
|
||||||
// 查询提资清单表
|
// 查询提资清单表
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
let res = await extractList({ projectId: currentProject.value?.id });
|
let res = await extractList({ ...queryParams.value });
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
professionalList.value = res.rows;
|
professionalList.value = res.rows;
|
||||||
total.value = res.total; //默认第一个
|
total.value = res.total; //默认第一个
|
||||||
@ -137,8 +135,15 @@ const handleUpdate = (row) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const handleDelete = (row) => {
|
const handleDownload = (row) => {
|
||||||
//
|
// 导出接口
|
||||||
|
proxy?.download(
|
||||||
|
'design/extract/exportWord',
|
||||||
|
{
|
||||||
|
id: row.id
|
||||||
|
},
|
||||||
|
`互提资料.zip`
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
// 页面挂载时初始化数据
|
// 页面挂载时初始化数据
|
||||||
|
@ -5,11 +5,13 @@
|
|||||||
<div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
|
<div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
|
||||||
<h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
|
<h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
|
||||||
<p class="text-blue-100 mt-2 opacity-90">请配置项目相关负责人员信息</p>
|
<p class="text-blue-100 mt-2 opacity-90">请配置项目相关负责人员信息</p>
|
||||||
|
<el-button @click="disabledForm = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="disabledForm">
|
||||||
|
点击编辑
|
||||||
|
</el-button>
|
||||||
<!-- ,带 <span class="text-red-300">*</span> 为必填项 -->
|
<!-- ,带 <span class="text-red-300">*</span> 为必填项 -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 表单内容区域 -->
|
<!-- 表单内容区域 -->
|
||||||
<el-form ref="leaveFormRef" :model="form" :rules="rules" label-width="120px" class="p-6 space-y-6">
|
<el-form ref="leaveFormRef" :model="form" :disabled="disabledForm" :rules="rules" label-width="120px" class="p-6 space-y-6">
|
||||||
<!-- 设计负责人 -->
|
<!-- 设计负责人 -->
|
||||||
<div class="fonts">
|
<div class="fonts">
|
||||||
<el-form-item label="设计负责人" prop="designLeader" class="mb-4">
|
<el-form-item label="设计负责人" prop="designLeader" class="mb-4">
|
||||||
@ -120,12 +122,10 @@
|
|||||||
</el-icon>
|
</el-icon>
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="form.reviewers.length === 0" class="text-gray-500 text-center py-4 bg-gray-100 rounded-lg border border-dashed border-gray-200">
|
<div v-if="form.reviewers.length === 0" class="text-gray-500 text-center py-4 bg-gray-100 rounded-lg border border-dashed border-gray-200">
|
||||||
暂无校审人员,请点击"新增校审人员"添加
|
暂无校审人员,请点击"新增校审人员"添加
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 提交按钮区域 -->
|
<!-- 提交按钮区域 -->
|
||||||
<div class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
|
<div class="flex justify-center space-x-6 mt-8 pt-6 border-t border-gray-100">
|
||||||
<el-button
|
<el-button
|
||||||
@ -154,6 +154,7 @@ import { listUserByDeptId } from '@/api/system/user';
|
|||||||
import { ElMessage, ElLoading } from 'element-plus';
|
import { ElMessage, ElLoading } from 'element-plus';
|
||||||
import { Delete } from '@element-plus/icons-vue';
|
import { Delete } from '@element-plus/icons-vue';
|
||||||
import { designUserAdd, designUserList, systemUserList } from '@/api/design/appointment';
|
import { designUserAdd, designUserList, systemUserList } from '@/api/design/appointment';
|
||||||
|
import { disable } from 'ol/rotationconstraint';
|
||||||
|
|
||||||
// 获取当前实例
|
// 获取当前实例
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
@ -184,7 +185,7 @@ const userList = ref([]);
|
|||||||
|
|
||||||
// 表单引用
|
// 表单引用
|
||||||
const leaveFormRef = ref();
|
const leaveFormRef = ref();
|
||||||
|
const disabledForm = ref(false); //控制提交按钮状态
|
||||||
/** 查询当前部门的所有用户 */
|
/** 查询当前部门的所有用户 */
|
||||||
const getDeptAllUser = async (deptId: any) => {
|
const getDeptAllUser = async (deptId: any) => {
|
||||||
try {
|
try {
|
||||||
@ -213,6 +214,9 @@ const designUser = async () => {
|
|||||||
form.designLeader = null;
|
form.designLeader = null;
|
||||||
form.designers = [];
|
form.designers = [];
|
||||||
form.reviewers = [];
|
form.reviewers = [];
|
||||||
|
if (res.rows.length > 0) {
|
||||||
|
disabledForm.value = true;
|
||||||
|
}
|
||||||
// 处理返回的数据,进行回显
|
// 处理返回的数据,进行回显
|
||||||
res.rows.forEach((item: any) => {
|
res.rows.forEach((item: any) => {
|
||||||
if (item.userType == 1) {
|
if (item.userType == 1) {
|
||||||
@ -292,7 +296,6 @@ const removePerson = (type: 'designers' | 'reviewers', index: number) => {
|
|||||||
/** 提交表单 */
|
/** 提交表单 */
|
||||||
const submitForm = async () => {
|
const submitForm = async () => {
|
||||||
if (!leaveFormRef.value) return;
|
if (!leaveFormRef.value) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 表单验证
|
// 表单验证
|
||||||
await leaveFormRef.value.validate();
|
await leaveFormRef.value.validate();
|
||||||
@ -349,6 +352,7 @@ const submitForm = async () => {
|
|||||||
projectId: currentProject.value?.id
|
projectId: currentProject.value?.id
|
||||||
});
|
});
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
|
disabledForm.value = true;
|
||||||
ElMessage.success('提交成功');
|
ElMessage.success('提交成功');
|
||||||
} else {
|
} else {
|
||||||
ElMessage.error(res.msg || '提交失败');
|
ElMessage.error(res.msg || '提交失败');
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
<el-table-column label="操作">
|
<el-table-column label="操作">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button type="primary" icon="Download" @click="onExport(scope.row.fileUrl)">下载</el-button>
|
<el-button type="primary" icon="Download" @click="onExport(scope.row.fileUrl)">下载</el-button>
|
||||||
<el-button type="success" icon="Plus" v-show="scope.row.status == 'draft' || scope.row.status == 'waiting'" @click="onUpdate(scope.row)"
|
<el-button type="success" icon="edit" v-show="scope.row.status == 'draft' || scope.row.status == 'waiting'" @click="onUpdate(scope.row)"
|
||||||
>审核</el-button
|
>审核</el-button
|
||||||
>
|
>
|
||||||
<el-button type="warning" v-show="scope.row.status != 'draft'" icon="View" @click="onView(scope.row)">查看流程</el-button>
|
<el-button type="warning" v-show="scope.row.status != 'draft'" icon="View" @click="onView(scope.row)">查看流程</el-button>
|
||||||
|
381
src/views/design/drawingreview/detailForm.vue
Normal file
381
src/views/design/drawingreview/detailForm.vue
Normal file
@ -0,0 +1,381 @@
|
|||||||
|
<template>
|
||||||
|
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" class="info-form" @validate="handleValidate">
|
||||||
|
<!-- 基本信息区域 -->
|
||||||
|
<div class="form-section">
|
||||||
|
<div class="section-title">
|
||||||
|
<el-divider content-position="left">
|
||||||
|
<span class="title-text">基本信息</span>
|
||||||
|
</el-divider>
|
||||||
|
</div>
|
||||||
|
<el-row :gutter="20" class="section-content">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="编号" prop="num">
|
||||||
|
<el-input v-model="formData.num" placeholder="请输入编号" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="专业" prop="professional">
|
||||||
|
<el-input v-model="formData.professional" placeholder="请输入专业" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="设计阶段" prop="stage">
|
||||||
|
<el-input v-model="formData.stage" placeholder="请输入设计阶段" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="卷册" prop="volume">
|
||||||
|
<el-input v-model="formData.volume" placeholder="请输入卷册" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 项目信息区域 -->
|
||||||
|
<div class="form-section">
|
||||||
|
<div class="section-title">
|
||||||
|
<el-divider content-position="left">
|
||||||
|
<span class="title-text">项目信息</span>
|
||||||
|
</el-divider>
|
||||||
|
</div>
|
||||||
|
<el-row :gutter="20" class="section-content">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="项目" prop="projectName">
|
||||||
|
<el-input disabled v-model="formData.projectName" placeholder="请输入项目ID" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="子项目" prop="subprojectId">
|
||||||
|
<el-select v-model="formData.subprojectId" clearable placeholder="请选择子项目" style="width: 300px">
|
||||||
|
<el-option v-for="item in subProjectList" :key="item.id" :label="item.projectName" :value="item.id" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 人员信息区域 -->
|
||||||
|
<div class="form-section">
|
||||||
|
<div class="section-title">
|
||||||
|
<el-divider content-position="left">
|
||||||
|
<span class="title-text">人员信息</span>
|
||||||
|
</el-divider>
|
||||||
|
</div>
|
||||||
|
<el-row :gutter="20" class="section-content">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="设计人" prop="designer">
|
||||||
|
<el-input v-model="formData.designer" placeholder="请输入设计人" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="校审人员" prop="proofreading">
|
||||||
|
<el-input v-model="formData.proofreading" placeholder="请输入校审人员" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<!-- <el-col :span="12">
|
||||||
|
<el-form-item label="校审人员ID" prop="proofreadingId">
|
||||||
|
<el-input v-model="formData.proofreadingId" placeholder="请输入校审人员ID" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col> -->
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="校审时间" prop="proofreadingDate">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="formData.proofreadingDate"
|
||||||
|
type="datetime"
|
||||||
|
placeholder="选择校审时间"
|
||||||
|
format="YYYY-MM-DD"
|
||||||
|
value-format="YYYY-MM-DD"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="审核人员" prop="audit">
|
||||||
|
<el-input v-model="formData.audit" placeholder="请输入审核人员" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<!-- <el-col :span="12">
|
||||||
|
<el-form-item label="审核人员ID" prop="auditId">
|
||||||
|
<el-input v-model="formData.auditId" placeholder="请输入审核人员ID" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col> -->
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="审核时间" prop="auditDate">
|
||||||
|
<el-date-picker v-model="formData.auditDate" type="datetime" placeholder="选择审核时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="执行人员" prop="executor">
|
||||||
|
<el-input v-model="formData.executor" placeholder="请输入执行人员" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<!-- <el-col :span="12">
|
||||||
|
<el-form-item label="执行人员ID" prop="executorId">
|
||||||
|
<el-input v-model="formData.executorId" placeholder="请输入执行人员ID" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col> -->
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="执行时间" prop="executorDate">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="formData.executorDate"
|
||||||
|
type="datetime"
|
||||||
|
placeholder="选择执行时间"
|
||||||
|
format="YYYY-MM-DD"
|
||||||
|
value-format="YYYY-MM-DD"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 意见和内容区域 -->
|
||||||
|
<div class="form-section">
|
||||||
|
<div class="section-title">
|
||||||
|
<el-divider content-position="left">
|
||||||
|
<span class="title-text">意见和内容</span>
|
||||||
|
</el-divider>
|
||||||
|
</div>
|
||||||
|
<el-row :gutter="20" class="section-content">
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="验证内容" prop="verificationContent">
|
||||||
|
<el-input v-model="formData.verificationContent" type="textarea" placeholder="请输入验证内容" :rows="4" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="验证意见" prop="verificationOpinion">
|
||||||
|
<el-input v-model="formData.verificationOpinion" type="textarea" placeholder="请输入验证意见" :rows="4" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="执行意见" prop="executionOpinion">
|
||||||
|
<el-input v-model="formData.executionOpinion" type="textarea" placeholder="请输入执行意见" :rows="4" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup name="ExamineForm" lang="ts">
|
||||||
|
import { ref, watch, reactive } from 'vue';
|
||||||
|
import { fillOutTheDesignVerificationForm } from '@/api/design/drawingreview';
|
||||||
|
import type { FormInstance, FormRules } from 'element-plus';
|
||||||
|
import { useUserStoreHook } from '@/store/modules/user';
|
||||||
|
import { computed } from 'vue';
|
||||||
|
import { subProjectListAll } from '@/api/design/drawingreview';
|
||||||
|
|
||||||
|
// 获取用户 store
|
||||||
|
const userStore = useUserStoreHook();
|
||||||
|
// 从 store 中获取当前选中的项目
|
||||||
|
const currentProject = computed(() => userStore.selectedProject);
|
||||||
|
console.log(currentProject.value);
|
||||||
|
const subProjectList = ref([]);
|
||||||
|
let subProjectMap = new Map();
|
||||||
|
// 定义表单数据类型
|
||||||
|
interface FormData {
|
||||||
|
num: string;
|
||||||
|
professional: string;
|
||||||
|
stage: string;
|
||||||
|
volume: string;
|
||||||
|
projectId: string;
|
||||||
|
projectName: string;
|
||||||
|
subprojectId: string;
|
||||||
|
subprojectName: string;
|
||||||
|
designer: string;
|
||||||
|
proofreading: string;
|
||||||
|
proofreadingId: string;
|
||||||
|
proofreadingDate: string;
|
||||||
|
audit: string;
|
||||||
|
auditId: string;
|
||||||
|
auditDate: string;
|
||||||
|
executor: string;
|
||||||
|
executorId: string;
|
||||||
|
executorDate: string;
|
||||||
|
verificationContent: string;
|
||||||
|
verificationOpinion: string;
|
||||||
|
executionOpinion: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 定义表单验证规则
|
||||||
|
const rules: FormRules = {
|
||||||
|
num: [{ required: true, message: '请输入编号', trigger: 'blur' }],
|
||||||
|
professional: [{ required: true, message: '请输入专业', trigger: 'blur' }]
|
||||||
|
};
|
||||||
|
|
||||||
|
// 表单数据 - 直接在组件内定义,不再通过Props接收
|
||||||
|
const formData = reactive<FormData>({
|
||||||
|
num: '',
|
||||||
|
professional: '',
|
||||||
|
stage: '',
|
||||||
|
volume: '',
|
||||||
|
projectId: currentProject.value.id || '',
|
||||||
|
projectName: currentProject.value.name || '',
|
||||||
|
subprojectId: '',
|
||||||
|
subprojectName: '',
|
||||||
|
designer: '',
|
||||||
|
proofreading: '',
|
||||||
|
proofreadingId: '',
|
||||||
|
proofreadingDate: '',
|
||||||
|
audit: '',
|
||||||
|
auditId: '',
|
||||||
|
auditDate: '',
|
||||||
|
executor: '',
|
||||||
|
executorId: '',
|
||||||
|
executorDate: '',
|
||||||
|
verificationContent: '',
|
||||||
|
verificationOpinion: '',
|
||||||
|
executionOpinion: ''
|
||||||
|
});
|
||||||
|
|
||||||
|
// 表单引用
|
||||||
|
const formRef = ref<FormInstance | null>(null);
|
||||||
|
|
||||||
|
// 监听项目变化,可自动填充表单项目信息
|
||||||
|
watch(
|
||||||
|
currentProject,
|
||||||
|
(newVal) => {
|
||||||
|
if (newVal) {
|
||||||
|
// 根据实际项目结构调整赋值字段
|
||||||
|
formData.projectId = newVal.id || '';
|
||||||
|
formData.projectName = newVal.name || '';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true, deep: true }
|
||||||
|
);
|
||||||
|
// 通过项目获取子项目 - 监听项目 id 变化,可自动获取子项目
|
||||||
|
const getSubProject = async () => {
|
||||||
|
let res = await subProjectListAll(currentProject.value.id);
|
||||||
|
subProjectList.value = res.data;
|
||||||
|
subProjectList.value.forEach((item: any) => {
|
||||||
|
subProjectMap.set(item.id, item.projectName);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
// 处理验证事件
|
||||||
|
const handleValidate = (prop: string, isValid: boolean, rule: any) => {
|
||||||
|
// 可根据需要处理验证事件
|
||||||
|
console.log(`字段 ${prop} 验证${isValid ? '通过' : '失败'}`);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 验证表单
|
||||||
|
const validate = async () => {
|
||||||
|
if (formRef.value) {
|
||||||
|
return await formRef.value.validate();
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 重置表单
|
||||||
|
const resetFields = () => {
|
||||||
|
if (formRef.value) {
|
||||||
|
formRef.value.resetFields();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 获取表单数据
|
||||||
|
const getFormData = (): FormData => {
|
||||||
|
return { ...formData };
|
||||||
|
};
|
||||||
|
|
||||||
|
// 设置表单数据
|
||||||
|
const setFormData = (data: Partial<FormData>) => {
|
||||||
|
Object.assign(formData, data);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 提交表单
|
||||||
|
const submit = async (businessId) => {
|
||||||
|
try {
|
||||||
|
// 先验证表单
|
||||||
|
const isValid = await validate();
|
||||||
|
if (isValid) {
|
||||||
|
formData.subprojectName = subProjectMap.get(formData.subprojectId);
|
||||||
|
formData.id = businessId;
|
||||||
|
const res = await fillOutTheDesignVerificationForm(formData);
|
||||||
|
if (res.code === 200) {
|
||||||
|
// 提交成功处理逻辑
|
||||||
|
console.log('提交成功');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('提交失败:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
onMounted(() => {
|
||||||
|
getSubProject();
|
||||||
|
});
|
||||||
|
// 暴露方法给父组件(如果需要)
|
||||||
|
defineExpose({
|
||||||
|
validate,
|
||||||
|
resetFields,
|
||||||
|
getFormData,
|
||||||
|
setFormData,
|
||||||
|
submit
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
/* 表单整体样式 */
|
||||||
|
.info-form {
|
||||||
|
padding: 20px;
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 模块容器样式 */
|
||||||
|
.form-section {
|
||||||
|
margin-bottom: 30px;
|
||||||
|
padding-bottom: 15px;
|
||||||
|
border-bottom: 1px solid #f0f0f0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 最后一个模块去掉底部边框 */
|
||||||
|
.form-section:last-child {
|
||||||
|
border-bottom: none;
|
||||||
|
margin-bottom: 0;
|
||||||
|
padding-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 模块标题样式 */
|
||||||
|
.section-title {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title-text {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #1f2329;
|
||||||
|
padding: 0 10px;
|
||||||
|
background-color: #fff;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 模块内容区域 */
|
||||||
|
.section-content {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 表单项间距调整 */
|
||||||
|
::v-deep .el-form-item {
|
||||||
|
margin-bottom: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 文本域样式优化 */
|
||||||
|
::v-deep .el-textarea__inner {
|
||||||
|
min-height: 100px;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 响应式调整 */
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.info-form {
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-section {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title-text {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
@ -1,520 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="p-2">
|
|
||||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
|
|
||||||
:leave-active-class="proxy?.animate.searchAnimate.leave">
|
|
||||||
<div v-show="showSearch" class="mb-[10px]">
|
|
||||||
<el-card shadow="hover">
|
|
||||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
|
||||||
<!-- <el-form-item label="项目ID" prop="projectId">
|
|
||||||
<el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" />
|
|
||||||
</el-form-item> -->
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
</el-card>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
|
|
||||||
<el-card shadow="never">
|
|
||||||
<template #header>
|
|
||||||
<el-row :gutter="10" class="mb8">
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
|
||||||
v-hasPermi="['design:drawingreview:add']">新增</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
|
|
||||||
v-hasPermi="['design:drawingreview:edit']">修改</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
|
|
||||||
v-hasPermi="['design:drawingreview:remove']">删除</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
|
||||||
v-hasPermi="['design:drawingreview:export']">导出</el-button>
|
|
||||||
</el-col>
|
|
||||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
|
||||||
</el-row>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="drawingreviewList" @selection-change="handleSelectionChange">
|
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
|
||||||
<el-table-column label="项目ID" align="center" prop="id" v-if="true" />
|
|
||||||
<el-table-column label="文件名称" align="center" prop="fileName" />
|
|
||||||
<el-table-column label="审核类型" align="center" prop="auditType" />
|
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
||||||
<template #default="scope">
|
|
||||||
<!-- <el-tooltip content="修改" placement="top">
|
|
||||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
|
||||||
v-hasPermi="['design:drawingreview:edit']"></el-button>
|
|
||||||
</el-tooltip>
|
|
||||||
<el-tooltip content="删除" placement="top">
|
|
||||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
|
||||||
v-hasPermi="['design:drawingreview:remove']"></el-button>
|
|
||||||
</el-tooltip> -->
|
|
||||||
<el-tooltip content="修改" placement="top">
|
|
||||||
<el-button link type="primary" icon="Edit" @click="handleExamine(scope.row)"></el-button>
|
|
||||||
</el-tooltip>
|
|
||||||
</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 :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
|
||||||
<el-form ref="drawingreviewFormRef" :model="form" :rules="rules" label-width="80px">
|
|
||||||
<el-form-item label="项目ID" prop="projectId">
|
|
||||||
<el-input v-model="form.projectId" placeholder="请输入项目ID" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="审核类型" prop="auditType">
|
|
||||||
<el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel">
|
|
||||||
<template #trigger>
|
|
||||||
<el-button type="primary">上传excel</el-button>
|
|
||||||
</template>
|
|
||||||
</el-upload>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="备注" prop="remark">
|
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<div class="dialog-footer">
|
|
||||||
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
<!-- 审核 -->
|
|
||||||
<el-dialog title="审核" v-model="examineDialog" width="500px" append-to-body>
|
|
||||||
<el-form ref="formRef" :model="examineForm" :rules="rules1" label-width="120px" class="info-form">
|
|
||||||
<!-- 基本信息区域 -->
|
|
||||||
<el-form-item label="编号" prop="num">
|
|
||||||
<el-input v-model="examineForm.num" placeholder="请输入编号" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="专业" prop="professional">
|
|
||||||
<el-input v-model="examineForm.professional" placeholder="请输入专业" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="设计阶段" prop="stage">
|
|
||||||
<el-input v-model="examineForm.stage" placeholder="请输入设计阶段" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="卷册" prop="volume">
|
|
||||||
<el-input v-model="examineForm.volume" placeholder="请输入卷册" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<!-- 项目信息区域 -->
|
|
||||||
<el-form-item label="项目ID" prop="projectId">
|
|
||||||
<el-input v-model="examineForm.projectId" placeholder="请输入项目ID" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="项目名称" prop="projectName">
|
|
||||||
<el-input v-model="examineForm.projectName" placeholder="请输入项目名称" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="子项目ID" prop="subprojectId">
|
|
||||||
<el-input v-model="examineForm.subprojectId" placeholder="请输入子项目ID" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="子项目名称" prop="subprojectName">
|
|
||||||
<el-input v-model="examineForm.subprojectName" placeholder="请输入子项目名称" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<!-- 人员信息区域 -->
|
|
||||||
<el-form-item label="设计人" prop="designer">
|
|
||||||
<el-input v-model="examineForm.designer" placeholder="请输入设计人" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="校审人员" prop="proofreading">
|
|
||||||
<el-input v-model="examineForm.proofreading" placeholder="请输入校审人员" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="校审人员ID" prop="proofreadingId">
|
|
||||||
<el-input v-model="examineForm.proofreadingId" placeholder="请输入校审人员ID" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="校审时间" prop="proofreadingDate">
|
|
||||||
<el-date-picker v-model="examineForm.proofreadingDate" type="datetime" placeholder="选择校审时间"
|
|
||||||
value-format="YYYY-MM-DD HH:mm:ss" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="审核人员" prop="audit">
|
|
||||||
<el-input v-model="examineForm.audit" placeholder="请输入审核人员" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="审核人员ID" prop="auditId">
|
|
||||||
<el-input v-model="examineForm.auditId" placeholder="请输入审核人员ID" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="审核时间" prop="auditDate">
|
|
||||||
<el-date-picker v-model="examineForm.auditDate" type="datetime" placeholder="选择审核时间"
|
|
||||||
value-format="YYYY-MM-DD HH:mm:ss" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="执行人员" prop="executor">
|
|
||||||
<el-input v-model="examineForm.executor" placeholder="请输入执行人员" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="执行人员ID" prop="executorId">
|
|
||||||
<el-input v-model="examineForm.executorId" placeholder="请输入执行人员ID" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="执行时间" prop="executorDate">
|
|
||||||
<el-date-picker v-model="examineForm.executorDate" type="datetime" placeholder="选择执行时间"
|
|
||||||
value-format="YYYY-MM-DD HH:mm:ss" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<!-- 意见和内容区域 -->
|
|
||||||
<el-form-item label="验证内容" prop="verificationContent">
|
|
||||||
<el-input v-model="examineForm.verificationContent" type="textarea" placeholder="请输入验证内容" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="验证意见" prop="verificationOpinion">
|
|
||||||
<el-input v-model="examineForm.verificationOpinion" type="textarea" placeholder="请输入验证意见" />
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="执行意见" prop="executionOpinion">
|
|
||||||
<el-input v-model="examineForm.executionOpinion" type="textarea" placeholder="请输入执行意见" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<div class="dialog-footer">
|
|
||||||
<el-button :loading="buttonLoading" type="primary" @click="submitexamineForm">确 定</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup name="Drawingreview" lang="ts">
|
|
||||||
import { computed, getCurrentInstance } from 'vue';
|
|
||||||
import { listDrawingreview, getDrawingreview, delDrawingreview, addDrawingreview, updateDrawingreview,fillOutTheDesignVerificationForm } from '@/api/design/drawingreview';
|
|
||||||
import { DrawingreviewVO, DrawingreviewQuery, DrawingreviewForm } from '@/api/design/drawingreview/types';
|
|
||||||
import { useUserStoreHook } from '@/store/modules/user';
|
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
||||||
const userStore = useUserStoreHook();
|
|
||||||
const currentProject = computed(() => userStore.selectedProject);
|
|
||||||
const drawingreviewList = ref<DrawingreviewVO[]>([]);
|
|
||||||
const buttonLoading = ref(false);
|
|
||||||
const loading = ref(true);
|
|
||||||
const showSearch = ref(true);
|
|
||||||
const ids = ref<Array<string | number>>([]);
|
|
||||||
const single = ref(true);
|
|
||||||
const multiple = ref(true);
|
|
||||||
const total = ref(0);
|
|
||||||
const formRef = ref();
|
|
||||||
let fromData = new FormData();
|
|
||||||
const queryFormRef = ref<ElFormInstance>();
|
|
||||||
const drawingreviewFormRef = ref<ElFormInstance>();
|
|
||||||
console.log(currentProject.value);
|
|
||||||
const examineDialog = ref(false);
|
|
||||||
// 审核form
|
|
||||||
const examineForm = reactive({
|
|
||||||
/**
|
|
||||||
* 审核人员
|
|
||||||
*/
|
|
||||||
audit: '',
|
|
||||||
/**
|
|
||||||
* 审核时间
|
|
||||||
*/
|
|
||||||
auditDate: '',
|
|
||||||
/**
|
|
||||||
* 审核人员ID
|
|
||||||
*/
|
|
||||||
auditId: '',
|
|
||||||
/**
|
|
||||||
* 设计人
|
|
||||||
*/
|
|
||||||
designer: '',
|
|
||||||
/**
|
|
||||||
* 执行意见
|
|
||||||
*/
|
|
||||||
executionOpinion: '',
|
|
||||||
/**
|
|
||||||
* 执行人员
|
|
||||||
*/
|
|
||||||
executor: '',
|
|
||||||
/**
|
|
||||||
* 执行时间
|
|
||||||
*/
|
|
||||||
executorDate: '',
|
|
||||||
/**
|
|
||||||
* 执行人员ID
|
|
||||||
*/
|
|
||||||
executorId: '',
|
|
||||||
/**
|
|
||||||
* 主键ID
|
|
||||||
*/
|
|
||||||
id: '1',
|
|
||||||
/**
|
|
||||||
* 编号
|
|
||||||
*/
|
|
||||||
num: '',
|
|
||||||
/**
|
|
||||||
* 专业
|
|
||||||
*/
|
|
||||||
professional: '',
|
|
||||||
/**
|
|
||||||
* 项目ID
|
|
||||||
*/
|
|
||||||
projectId: '',
|
|
||||||
/**
|
|
||||||
* 项目名称
|
|
||||||
*/
|
|
||||||
projectName: '',
|
|
||||||
/**
|
|
||||||
* 校审人员
|
|
||||||
*/
|
|
||||||
proofreading: '',
|
|
||||||
/**
|
|
||||||
* 校审时间
|
|
||||||
*/
|
|
||||||
proofreadingDate: '',
|
|
||||||
/**
|
|
||||||
* 校审人员ID
|
|
||||||
*/
|
|
||||||
proofreadingId: '',
|
|
||||||
/**
|
|
||||||
* 设计阶段
|
|
||||||
*/
|
|
||||||
stage: '',
|
|
||||||
/**
|
|
||||||
* 子项目ID
|
|
||||||
*/
|
|
||||||
subprojectId: '',
|
|
||||||
/**
|
|
||||||
* 子项目名称
|
|
||||||
*/
|
|
||||||
subprojectName: '',
|
|
||||||
/**
|
|
||||||
* 验证内容
|
|
||||||
*/
|
|
||||||
verificationContent: '',
|
|
||||||
/**
|
|
||||||
* 验证意见
|
|
||||||
*/
|
|
||||||
verificationOpinion: '',
|
|
||||||
/**
|
|
||||||
* 卷册
|
|
||||||
*/
|
|
||||||
volume: ''
|
|
||||||
});
|
|
||||||
const rules1 = reactive({
|
|
||||||
num: [
|
|
||||||
{ required: true, message: '请输入编号', trigger: 'blur' },
|
|
||||||
{ max: 50, message: '编号长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
professional: [
|
|
||||||
{ required: true, message: '请输入专业', trigger: 'blur' },
|
|
||||||
{ max: 100, message: '专业长度不能超过100个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
stage: [
|
|
||||||
{ required: true, message: '请输入设计阶段', trigger: 'blur' },
|
|
||||||
{ max: 100, message: '设计阶段长度不能超过100个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
projectId: [
|
|
||||||
{ required: true, message: '请输入项目ID', trigger: 'blur' },
|
|
||||||
{ max: 50, message: '项目ID长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
projectName: [
|
|
||||||
{ required: true, message: '请输入项目名称', trigger: 'blur' },
|
|
||||||
{ max: 200, message: '项目名称长度不能超过200个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
designer: [
|
|
||||||
{ required: true, message: '请输入设计人', trigger: 'blur' },
|
|
||||||
{ max: 50, message: '设计人长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
verificationContent: [
|
|
||||||
{ required: true, message: '请输入验证内容', trigger: 'blur' },
|
|
||||||
{ max: 2000, message: '验证内容长度不能超过2000个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
// 其他字段的验证规则
|
|
||||||
volume: [
|
|
||||||
{ max: 100, message: '卷册长度不能超过100个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
subprojectId: [
|
|
||||||
{ max: 50, message: '子项目ID长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
subprojectName: [
|
|
||||||
{ max: 200, message: '子项目名称长度不能超过200个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
proofreading: [
|
|
||||||
{ max: 50, message: '校审人员长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
proofreadingId: [
|
|
||||||
{ max: 50, message: '校审人员ID长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
audit: [
|
|
||||||
{ max: 50, message: '审核人员长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
auditId: [
|
|
||||||
{ max: 50, message: '审核人员ID长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
executor: [
|
|
||||||
{ max: 50, message: '执行人员长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
executorId: [
|
|
||||||
{ max: 50, message: '执行人员ID长度不能超过50个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
verificationOpinion: [
|
|
||||||
{ max: 2000, message: '验证意见长度不能超过2000个字符', trigger: 'blur' }
|
|
||||||
],
|
|
||||||
executionOpinion: [
|
|
||||||
{ max: 2000, message: '执行意见长度不能超过2000个字符', trigger: 'blur' }
|
|
||||||
]
|
|
||||||
});
|
|
||||||
|
|
||||||
const dialog = reactive<DialogOption>({
|
|
||||||
visible: false,
|
|
||||||
title: ''
|
|
||||||
});
|
|
||||||
|
|
||||||
const initexamineForm = {
|
|
||||||
id: undefined,
|
|
||||||
projectId: currentProject.value?.id,
|
|
||||||
auditType: undefined,
|
|
||||||
remark: undefined,
|
|
||||||
}
|
|
||||||
const data = reactive({
|
|
||||||
form: { ...initexamineForm },
|
|
||||||
queryParams: {
|
|
||||||
pageNum: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
projectId: currentProject.value?.id,
|
|
||||||
auditType: undefined,
|
|
||||||
params: {
|
|
||||||
}
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
id: [
|
|
||||||
{ required: true, message: "项目ID不能为空", trigger: "blur" }
|
|
||||||
],
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const { queryParams, form, rules } = toRefs(data);
|
|
||||||
|
|
||||||
/** 查询设计-图纸评审列表 */
|
|
||||||
const getList = async () => {
|
|
||||||
loading.value = true;
|
|
||||||
const res = await listDrawingreview(queryParams.value);
|
|
||||||
drawingreviewList.value = res.rows;
|
|
||||||
total.value = res.total;
|
|
||||||
loading.value = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 取消按钮 */
|
|
||||||
const cancel = () => {
|
|
||||||
reset();
|
|
||||||
dialog.visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 表单重置 */
|
|
||||||
const reset = () => {
|
|
||||||
form.value = { ...initexamineForm };
|
|
||||||
drawingreviewFormRef.value?.resetFields();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 搜索按钮操作 */
|
|
||||||
const handleQuery = () => {
|
|
||||||
queryParams.value.pageNum = 1;
|
|
||||||
getList();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置按钮操作 */
|
|
||||||
const resetQuery = () => {
|
|
||||||
queryFormRef.value?.resetFields();
|
|
||||||
handleQuery();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 多选框选中数据 */
|
|
||||||
const handleSelectionChange = (selection: DrawingreviewVO[]) => {
|
|
||||||
ids.value = selection.map(item => item.id);
|
|
||||||
single.value = selection.length != 1;
|
|
||||||
multiple.value = !selection.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 新增按钮操作 */
|
|
||||||
const handleAdd = () => {
|
|
||||||
reset();
|
|
||||||
dialog.visible = true;
|
|
||||||
dialog.title = "添加设计-图纸评审";
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 修改按钮操作 */
|
|
||||||
const handleUpdate = async (row?: DrawingreviewVO) => {
|
|
||||||
reset();
|
|
||||||
Object.assign(form.value, row);
|
|
||||||
dialog.visible = true;
|
|
||||||
dialog.title = "修改设计-图纸评审";
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 提交按钮 */
|
|
||||||
const submitForm = () => {
|
|
||||||
drawingreviewFormRef.value?.validate(async (valid: boolean) => {
|
|
||||||
if (valid) {
|
|
||||||
buttonLoading.value = true;
|
|
||||||
if (form.value.id) {
|
|
||||||
await updateDrawingreview(form.value).finally(() => buttonLoading.value = false);
|
|
||||||
} else {
|
|
||||||
await addDrawingreview(form.value, examineForm).finally(() => buttonLoading.value = false);
|
|
||||||
}
|
|
||||||
proxy?.$modal.msgSuccess("操作成功");
|
|
||||||
dialog.visible = false;
|
|
||||||
await getList();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 删除按钮操作 */
|
|
||||||
const handleDelete = async (row?: DrawingreviewVO) => {
|
|
||||||
const _ids = row?.id || ids.value;
|
|
||||||
await proxy?.$modal.confirm('是否确认删除设计-图纸评审编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
|
|
||||||
await delDrawingreview(_ids);
|
|
||||||
proxy?.$modal.msgSuccess("删除成功");
|
|
||||||
await getList();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 导出按钮操作 */
|
|
||||||
const handleExport = () => {
|
|
||||||
proxy?.download('design/drawingreview/export', {
|
|
||||||
...queryParams.value
|
|
||||||
}, `drawingreview_${new Date().getTime()}.xlsx`)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 上传excel
|
|
||||||
function importExcel(options) {
|
|
||||||
fromData.append("file", options.file)
|
|
||||||
}
|
|
||||||
// 审核
|
|
||||||
function handleExamine(item) {
|
|
||||||
examineDialog.value = true;
|
|
||||||
examineForm.id = item.id
|
|
||||||
console.log(item.id)
|
|
||||||
}
|
|
||||||
// 设计验证表
|
|
||||||
async function submitexamineForm() {
|
|
||||||
try {
|
|
||||||
await formRef.value.validate();
|
|
||||||
fillOutTheDesignVerificationForm(examineForm).then((res) => {
|
|
||||||
console.log(res);
|
|
||||||
})
|
|
||||||
// 表单验证通过,可以提交数据
|
|
||||||
ElMessage.success('表单提交成功');
|
|
||||||
// 这里可以添加实际提交数据的逻辑,例如调用API
|
|
||||||
console.log('表单数据:', examineForm);
|
|
||||||
} catch (error) {
|
|
||||||
ElMessage.error('表单验证失败,请检查输入');
|
|
||||||
console.error('表单验证错误:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
getList();
|
|
||||||
});
|
|
||||||
</script>
|
|
@ -1,73 +1,47 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="p-2">
|
<div class="p-2 drawingreview">
|
||||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
|
|
||||||
:leave-active-class="proxy?.animate.searchAnimate.leave">
|
|
||||||
<div v-show="showSearch" class="mb-[10px]">
|
|
||||||
<el-card shadow="hover">
|
|
||||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
</el-card>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
<el-card shadow="never">
|
<el-card shadow="never">
|
||||||
<template #header>
|
<template #header>
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['design:drawingreview:add']">新增</el-button>
|
||||||
v-hasPermi="['design:drawingreview:add']">新增</el-button>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<right-toolbar @queryTable="getList"></right-toolbar>
|
||||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
|
|
||||||
v-hasPermi="['design:drawingreview:edit']">修改</el-button>
|
|
||||||
</el-col>
|
|
||||||
<!-- <el-col :span="1.5">
|
|
||||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
|
|
||||||
v-hasPermi="['design:drawingreview:remove']">删除</el-button>
|
|
||||||
</el-col> -->
|
|
||||||
<!-- <el-col :span="1.5">
|
|
||||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
|
||||||
v-hasPermi="['design:drawingreview:export']">导出</el-button>
|
|
||||||
</el-col> -->
|
|
||||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
|
||||||
</el-row>
|
</el-row>
|
||||||
</template>
|
</template>
|
||||||
|
<el-table v-loading="loading" :data="drawingreviewList">
|
||||||
<el-table v-loading="loading" :data="drawingreviewList" @selection-change="handleSelectionChange">
|
<el-table-column type="index" label="序号" width="100" align="center" />
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
|
||||||
<el-table-column label="项目ID" align="center" prop="id" v-if="true" />
|
|
||||||
<el-table-column label="文件名称" align="center" prop="fileName" />
|
<el-table-column label="文件名称" align="center" prop="fileName" />
|
||||||
<el-table-column label="审核类型" align="center" prop="auditType" />
|
<el-table-column label="流程状态" align="center">
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<!-- <el-tooltip content="修改" placement="top">
|
<dict-tag :options="wf_business_status" :value="scope.row.auditType" />
|
||||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
</template>
|
||||||
v-hasPermi="['design:drawingreview:edit']"></el-button>
|
</el-table-column>
|
||||||
</el-tooltip>
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
<el-tooltip content="删除" placement="top">
|
<el-table-column label="操作" align="center">
|
||||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
<template #default="scope">
|
||||||
v-hasPermi="['design:drawingreview:remove']"></el-button>
|
<el-row :gutter="10" class="mb8"
|
||||||
</el-tooltip> -->
|
><el-col :span="1.5" v-if="scope.row.auditType === 'draft' || scope.row.auditType === 'cancel' || scope.row.auditType === 'back'">
|
||||||
<el-tooltip content="修改" placement="top">
|
<el-button size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)">审核</el-button>
|
||||||
<el-button link type="primary" icon="Edit" @click="handleExamine(scope.row)"></el-button>
|
</el-col>
|
||||||
</el-tooltip>
|
<el-col :span="1.5">
|
||||||
|
<el-button type="warning" size="small" icon="View" v-if="scope.row.auditType != 'draft'" @click="handleViewInfo(scope.row)"
|
||||||
|
>查看流程</el-button
|
||||||
|
> </el-col
|
||||||
|
><el-col :span="1.5">
|
||||||
|
<el-button type="warning" size="small" icon="View" v-if="scope.row.auditType != 'draft'" @click="handleViewHistory(scope.row)"
|
||||||
|
>查看历史</el-button
|
||||||
|
>
|
||||||
|
</el-col></el-row
|
||||||
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
|
||||||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
|
||||||
</el-card>
|
</el-card>
|
||||||
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
||||||
<el-form ref="drawingreviewFormRef" :model="form" :rules="rules" label-width="80px">
|
<el-form ref="drawingreviewFormRef" :model="form" :rules="rules" label-width="80px">
|
||||||
<el-form-item label="项目ID" prop="projectId">
|
<el-form-item label="图纸文件" prop="auditType">
|
||||||
<el-input v-model="form.projectId" placeholder="请输入项目ID" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="审核类型" prop="auditType">
|
|
||||||
<el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel">
|
<el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel">
|
||||||
<template #trigger>
|
<template #trigger>
|
||||||
<el-button type="primary">上传excel</el-button>
|
<el-button type="primary">上传excel</el-button>
|
||||||
@ -81,136 +55,142 @@
|
|||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="dialog.visible = false">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog title="审核" v-model="examineDialog" width="500px" append-to-body>
|
<el-dialog draggable title="查看历史" v-model="dialogHistory" width="800px" append-to-body>
|
||||||
<el-form ref="formRef" :model="examineForm" :rules="rules1" label-width="120px" class="info-form">
|
<div>
|
||||||
<!-- 基本信息区域 -->
|
<span>选择历史退回记录:</span>
|
||||||
<el-form-item label="编号" prop="num">
|
<el-select v-model="hisId" placeholder="请选择" style="width: 240px" @change="handleShowInfo">
|
||||||
<el-input v-model="examineForm.num" placeholder="请输入编号" />
|
<el-option v-for="item in hisList" :key="item.id" :label="item.id" :value="item.id" />
|
||||||
</el-form-item>
|
</el-select>
|
||||||
|
<div style="margin-top: 20px">
|
||||||
<el-form-item label="专业" prop="professional">
|
<span style="color: #0d9df5">查看excel文件</span>
|
||||||
<el-input v-model="examineForm.professional" placeholder="请输入专业" />
|
<div style="margin-top: 20px" class="table-content" id="table-content">
|
||||||
</el-form-item>
|
<el-row class="mb20" style="display: flex; justify-content: center">
|
||||||
|
<h2>设计验证表</h2>
|
||||||
<el-form-item label="设计阶段" prop="stage">
|
</el-row>
|
||||||
<el-input v-model="examineForm.stage" placeholder="请输入设计阶段" />
|
<el-row class="mb10" style="display: flex; justify-content: space-between">
|
||||||
</el-form-item>
|
<div class="head-text">
|
||||||
|
<span>编号:</span>
|
||||||
<el-form-item label="卷册" prop="volume">
|
<span>{{ examineForm.num }}</span>
|
||||||
<el-input v-model="examineForm.volume" placeholder="请输入卷册" />
|
</div>
|
||||||
</el-form-item>
|
<div class="head-text"></div>
|
||||||
|
</el-row>
|
||||||
<!-- 项目信息区域 -->
|
<table style="width: 100%" border="1" cellspacing="1">
|
||||||
<el-form-item label="项目ID" prop="projectId">
|
<thead>
|
||||||
<el-input v-model="examineForm.projectId" placeholder="请输入项目ID" />
|
<tr>
|
||||||
</el-form-item>
|
<th colspan="2">工程名称</th>
|
||||||
|
<td class="th-bg" colspan="10">{{ examineForm.projectName }}</td>
|
||||||
<el-form-item label="项目名称" prop="projectName">
|
</tr>
|
||||||
<el-input v-model="examineForm.projectName" placeholder="请输入项目名称" />
|
</thead>
|
||||||
</el-form-item>
|
<tbody>
|
||||||
|
<tr>
|
||||||
<el-form-item label="子项目ID" prop="subprojectId">
|
<th colspan="2">子项名称</th>
|
||||||
<el-input v-model="examineForm.subprojectId" placeholder="请输入子项目ID" />
|
<td class="th-bg" colspan="6">{{ examineForm.subprojectName }}</td>
|
||||||
</el-form-item>
|
<th colspan="2">设计阶段</th>
|
||||||
|
<td class="th-bg" colspan="2">{{ examineForm.stage }}</td>
|
||||||
<el-form-item label="子项目名称" prop="subprojectName">
|
</tr>
|
||||||
<el-input v-model="examineForm.subprojectName" placeholder="请输入子项目名称" />
|
</tbody>
|
||||||
</el-form-item>
|
<tbody>
|
||||||
|
<tr>
|
||||||
<!-- 人员信息区域 -->
|
<th colspan="2">专业</th>
|
||||||
<el-form-item label="设计人" prop="designer">
|
<td class="th-bg" colspan="2">{{ examineForm.professional }}</td>
|
||||||
<el-input v-model="examineForm.designer" placeholder="请输入设计人" />
|
<th colspan="2">卷册</th>
|
||||||
</el-form-item>
|
<td class="th-bg" colspan="2">{{ examineForm.volume }}</td>
|
||||||
|
<th colspan="2">设计人</th>
|
||||||
<el-form-item label="校审人员" prop="proofreading">
|
<td class="th-bg" colspan="2">{{ examineForm.designer }}</td>
|
||||||
<el-input v-model="examineForm.proofreading" placeholder="请输入校审人员" />
|
</tr>
|
||||||
</el-form-item>
|
</tbody>
|
||||||
|
<tbody>
|
||||||
<el-form-item label="校审人员ID" prop="proofreadingId">
|
<tr>
|
||||||
<el-input v-model="examineForm.proofreadingId" placeholder="请输入校审人员ID" />
|
<th colspan="2">验证内容</th>
|
||||||
</el-form-item>
|
<td class="th-bg" colspan="10">{{ examineForm.verificationContent }}</td>
|
||||||
|
</tr>
|
||||||
<el-form-item label="校审时间" prop="proofreadingDate">
|
</tbody>
|
||||||
<el-date-picker v-model="examineForm.proofreadingDate" type="datetime" placeholder="选择校审时间"
|
<tbody>
|
||||||
value-format="YYYY-MM-DD HH:mm:ss" />
|
<tr>
|
||||||
</el-form-item>
|
<th colspan="6">验证意见</th>
|
||||||
|
<th class="th-bg" colspan="6">执行意见</th>
|
||||||
<el-form-item label="审核人员" prop="audit">
|
</tr>
|
||||||
<el-input v-model="examineForm.audit" placeholder="请输入审核人员" />
|
</tbody>
|
||||||
</el-form-item>
|
<tbody>
|
||||||
|
<tr>
|
||||||
<el-form-item label="审核人员ID" prop="auditId">
|
<td colspan="6">
|
||||||
<el-input v-model="examineForm.auditId" placeholder="请输入审核人员ID" />
|
<div style="height: 400px">{{ examineForm.verificationOpinion }}</div>
|
||||||
</el-form-item>
|
</td>
|
||||||
|
<td class="th-bg" colspan="6">
|
||||||
<el-form-item label="审核时间" prop="auditDate">
|
<div style="height: 400px">{{ examineForm.executionOpinion }}</div>
|
||||||
<el-date-picker v-model="examineForm.auditDate" type="datetime" placeholder="选择审核时间"
|
</td>
|
||||||
value-format="YYYY-MM-DD HH:mm:ss" />
|
</tr>
|
||||||
</el-form-item>
|
</tbody>
|
||||||
|
<tbody>
|
||||||
<el-form-item label="执行人员" prop="executor">
|
<tr>
|
||||||
<el-input v-model="examineForm.executor" placeholder="请输入执行人员" />
|
<td colspan="6">
|
||||||
</el-form-item>
|
<div style="display: flex; align-items: center; justify-content: space-between">
|
||||||
|
<span> 校审: {{ examineForm.proofreading }} </span>
|
||||||
<el-form-item label="执行人员ID" prop="executorId">
|
<span> {{ dateFormat(examineForm.proofreadingDate) }}</span>
|
||||||
<el-input v-model="examineForm.executorId" placeholder="请输入执行人员ID" />
|
</div>
|
||||||
</el-form-item>
|
</td>
|
||||||
|
<td rowspan="2" colspan="6">
|
||||||
<el-form-item label="执行时间" prop="executorDate">
|
<div>执行人: {{ examineForm.executor }}</div>
|
||||||
<el-date-picker v-model="examineForm.executorDate" type="datetime" placeholder="选择执行时间"
|
<div style="display: flex; align-items: center; justify-content: flex-end">
|
||||||
value-format="YYYY-MM-DD HH:mm:ss" />
|
{{ dateFormat(examineForm.executorDate) }}
|
||||||
</el-form-item>
|
</div>
|
||||||
|
</td>
|
||||||
<!-- 意见和内容区域 -->
|
</tr>
|
||||||
<el-form-item label="验证内容" prop="verificationContent">
|
<tr>
|
||||||
<el-input v-model="examineForm.verificationContent" type="textarea" placeholder="请输入验证内容" />
|
<td class="th-bg" colspan="6">
|
||||||
</el-form-item>
|
<div style="display: flex; align-items: center; justify-content: space-between">
|
||||||
|
<span>审核 : {{ examineForm.audit }}</span>
|
||||||
<el-form-item label="验证意见" prop="verificationOpinion">
|
<span> {{ dateFormat(examineForm.auditDate) }}</span>
|
||||||
<el-input v-model="examineForm.verificationOpinion" type="textarea" placeholder="请输入验证意见" />
|
</div>
|
||||||
</el-form-item>
|
</td>
|
||||||
|
</tr>
|
||||||
<el-form-item label="执行意见" prop="executionOpinion">
|
</tbody>
|
||||||
<el-input v-model="examineForm.executionOpinion" type="textarea" placeholder="请输入执行意见" />
|
</table>
|
||||||
</el-form-item>
|
</div>
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<div class="dialog-footer">
|
|
||||||
<el-button :loading="buttonLoading" type="primary" @click="submitexamineForm">确 定</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup name="Drawingreview">
|
<script setup name="Drawingreview">
|
||||||
import { computed, getCurrentInstance,toRefs } from 'vue';
|
import { computed, getCurrentInstance, toRefs } from 'vue';
|
||||||
import { listDrawingreview, getDrawingreview, addDrawingreview, updateDrawingreview,fillOutTheDesignVerificationForm } from '@/api/design/drawingreview';
|
import {
|
||||||
|
listDrawingreview,
|
||||||
|
addDrawingreview,
|
||||||
|
updateDrawingreview,
|
||||||
|
ObtainHistoricalDesignDrawingsForReview,
|
||||||
|
drawingreview
|
||||||
|
} from '@/api/design/drawingreview';
|
||||||
import { useUserStoreHook } from '@/store/modules/user';
|
import { useUserStoreHook } from '@/store/modules/user';
|
||||||
import { fromFile } from 'geotiff';
|
import { fromFile } from 'geotiff';
|
||||||
const { proxy } = getCurrentInstance();
|
const { proxy } = getCurrentInstance();
|
||||||
|
const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status'));
|
||||||
|
|
||||||
const userStore = useUserStoreHook();
|
const userStore = useUserStoreHook();
|
||||||
const loading = ref(true);
|
const loading = ref(true);
|
||||||
const buttonLoading = ref(false);
|
const buttonLoading = ref(false);
|
||||||
const total = ref(0);
|
const total = ref(0);
|
||||||
const drawingreviewList = ref([]);
|
const drawingreviewList = ref([]);
|
||||||
const fromData = new FormData()
|
const hisList = ref([]);
|
||||||
|
const hisId = ref('');
|
||||||
|
const fromData = new FormData();
|
||||||
const currentProject = computed(() => userStore.selectedProject);
|
const currentProject = computed(() => userStore.selectedProject);
|
||||||
const dialog = reactive({
|
const dialog = reactive({
|
||||||
visible: false,
|
visible: false,
|
||||||
title: ''
|
title: ''
|
||||||
});
|
});
|
||||||
|
const dialogHistory = ref(false);
|
||||||
const initexamineForm = {
|
const initexamineForm = {
|
||||||
id: undefined,
|
id: undefined,
|
||||||
projectId: currentProject.value?.id,
|
projectId: currentProject.value?.id,
|
||||||
auditType: undefined,
|
auditType: undefined,
|
||||||
remark: undefined,
|
remark: undefined
|
||||||
}
|
};
|
||||||
const drawingreviewFormRef = ref();
|
const drawingreviewFormRef = ref();
|
||||||
const data = reactive({
|
const data = reactive({
|
||||||
form: { ...initexamineForm },
|
form: { ...initexamineForm },
|
||||||
@ -219,17 +199,14 @@ const data = reactive({
|
|||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
projectId: currentProject.value?.id,
|
projectId: currentProject.value?.id,
|
||||||
auditType: undefined,
|
auditType: undefined,
|
||||||
params: {
|
params: {}
|
||||||
}
|
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
id: [
|
id: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }]
|
||||||
{ required: true, message: "项目ID不能为空", trigger: "blur" }
|
|
||||||
],
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const { queryParams, form, rules } = toRefs(data);
|
const { queryParams, form, rules } = toRefs(data);
|
||||||
const examineForm = reactive({
|
const examineForm = ref({
|
||||||
audit: '',
|
audit: '',
|
||||||
auditDate: '',
|
auditDate: '',
|
||||||
auditId: '',
|
auditId: '',
|
||||||
@ -253,6 +230,17 @@ const examineForm = reactive({
|
|||||||
verificationOpinion: '',
|
verificationOpinion: '',
|
||||||
volume: ''
|
volume: ''
|
||||||
});
|
});
|
||||||
|
// 时间 格式化 YYYY-MM-DD 改为 YYYY年MM月DD日
|
||||||
|
const dateFormat = (v) => {
|
||||||
|
if (!v) return '-';
|
||||||
|
let time = new Date(v);
|
||||||
|
let y = time.getFullYear();
|
||||||
|
let MM = time.getMonth() + 1;
|
||||||
|
MM = MM < 10 ? '0' + MM : MM;
|
||||||
|
let d = time.getDate();
|
||||||
|
d = d < 10 ? '0' + d : d;
|
||||||
|
return y + '年' + MM + '月' + d + '日';
|
||||||
|
};
|
||||||
/** 查询设计-图纸评审列表 */
|
/** 查询设计-图纸评审列表 */
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
@ -260,46 +248,126 @@ const getList = async () => {
|
|||||||
drawingreviewList.value = res.rows;
|
drawingreviewList.value = res.rows;
|
||||||
total.value = res.total;
|
total.value = res.total;
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
}
|
};
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
const handleAdd = () => {
|
const handleAdd = () => {
|
||||||
reset();
|
reset();
|
||||||
dialog.visible = true;
|
dialog.visible = true;
|
||||||
dialog.title = "添加设计-图纸评审";
|
dialog.title = '添加设计-图纸评审';
|
||||||
}
|
};
|
||||||
/** 重置按钮操作 */
|
|
||||||
const resetQuery = () => {
|
|
||||||
queryFormRef.value?.resetFields();
|
|
||||||
handleQuery();
|
|
||||||
}
|
|
||||||
/** 表单重置 */
|
/** 表单重置 */
|
||||||
const reset = () => {
|
const reset = () => {
|
||||||
form.value = { ...initexamineForm };
|
form.value = { ...initexamineForm };
|
||||||
drawingreviewFormRef.value?.resetFields();
|
drawingreviewFormRef.value?.resetFields();
|
||||||
|
};
|
||||||
|
function handleUpdate(row) {
|
||||||
|
proxy.$tab.closePage(proxy.$route);
|
||||||
|
proxy.$router.push({
|
||||||
|
path: `/design-management/drawingreview/indexEdit`,
|
||||||
|
query: {
|
||||||
|
id: row.id,
|
||||||
|
type: 'update'
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
function handleQuery(){}
|
function handleViewInfo(row) {
|
||||||
function handleExamine(){}
|
proxy.$tab.closePage(proxy.$route);
|
||||||
|
proxy.$router.push({
|
||||||
|
path: `/design-management/drawingreview/indexEdit`,
|
||||||
|
query: {
|
||||||
|
id: row.id,
|
||||||
|
type: 'view'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const handleViewHistory = async (row) => {
|
||||||
|
// 查看历史流程记录
|
||||||
|
dialogHistory.value = true;
|
||||||
|
let res = await ObtainHistoricalDesignDrawingsForReview(row.id);
|
||||||
|
console.log(res);
|
||||||
|
hisList.value = res;
|
||||||
|
hisId.value = hisList.value[0].id;
|
||||||
|
getDetails(hisId.value);
|
||||||
|
};
|
||||||
|
const handleShowInfo = (val) => {
|
||||||
|
getDetails(val);
|
||||||
|
};
|
||||||
|
const getDetails = async (id) => {
|
||||||
|
let res = await drawingreview(id);
|
||||||
|
examineForm.value = res.data;
|
||||||
|
};
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
const submitForm = () => {
|
const submitForm = () => {
|
||||||
drawingreviewFormRef.value?.validate(async (valid) => {
|
drawingreviewFormRef.value?.validate(async (valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
buttonLoading.value = true;
|
buttonLoading.value = true;
|
||||||
if (form.value.id) {
|
if (form.value.id) {
|
||||||
await updateDrawingreview(form.value).finally(() => buttonLoading.value = false);
|
await updateDrawingreview(form.value).finally(() => (buttonLoading.value = false));
|
||||||
} else {
|
} else {
|
||||||
await addDrawingreview(form.value, fromData).finally(() => buttonLoading.value = false);
|
await addDrawingreview(form.value, fromData).finally(() => (buttonLoading.value = false));
|
||||||
}
|
}
|
||||||
proxy?.$modal.msgSuccess("操作成功");
|
proxy?.$modal.msgSuccess('操作成功');
|
||||||
dialog.visible = false;
|
dialog.visible = false;
|
||||||
await getList();
|
await getList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
// 上传excel
|
// 上传excel
|
||||||
function importExcel(options) {
|
function importExcel(options) {
|
||||||
fromData.append("file", options.file)
|
fromData.append('file', options.file);
|
||||||
}
|
}
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
<style lang="scss">
|
||||||
|
.drawingreview {
|
||||||
|
.upload-demo {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
|
border-collapse: collapse; //合并为一个单一的边框
|
||||||
|
border-color: rgba(199, 199, 199, 1); //边框颜色按实际自定义即可
|
||||||
|
}
|
||||||
|
thead {
|
||||||
|
tr {
|
||||||
|
th {
|
||||||
|
background-color: rgba(247, 247, 247, 1); //设置表格标题背景色
|
||||||
|
height: 35px; //设置单元格最小高度
|
||||||
|
text-align: center;
|
||||||
|
letter-spacing: 5px;
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
td {
|
||||||
|
text-align: left;
|
||||||
|
height: 35px; //设置单元格最小高度
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
.th-bg {
|
||||||
|
background-color: rgba(247, 247, 247, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tbody {
|
||||||
|
tr {
|
||||||
|
td {
|
||||||
|
text-align: left;
|
||||||
|
height: 40px; //设置单元格最小高度
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
th {
|
||||||
|
height: 35px; //设置单元格最小高度
|
||||||
|
text-align: center;
|
||||||
|
letter-spacing: 5px;
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.table-content {
|
||||||
|
box-shadow: 0px 0px 10px #ddd;
|
||||||
|
padding: 20px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
361
src/views/design/drawingreview/indexEdit.vue
Normal file
361
src/views/design/drawingreview/indexEdit.vue
Normal file
@ -0,0 +1,361 @@
|
|||||||
|
<template>
|
||||||
|
<div class="p-4 bg-gray-50">
|
||||||
|
<div class="max-w-4xl mx-auto">
|
||||||
|
<!-- 顶部按钮区域 -->
|
||||||
|
<el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
|
||||||
|
<approvalButton
|
||||||
|
@submitForm="submitForm"
|
||||||
|
@approvalVerifyOpen="approvalVerifyOpen"
|
||||||
|
@handleApprovalRecord="handleApprovalRecord"
|
||||||
|
:buttonLoading="buttonLoading"
|
||||||
|
:id="form.id"
|
||||||
|
:status="form.auditType"
|
||||||
|
:pageType="routeParams.type"
|
||||||
|
/>
|
||||||
|
</el-card>
|
||||||
|
<!-- 表单区域 -->
|
||||||
|
<el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
|
||||||
|
<div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
|
||||||
|
<h3 class="text-lg font-semibold text-gray-800">图纸评审</h3>
|
||||||
|
</div>
|
||||||
|
<div class="p-6">
|
||||||
|
<el-form
|
||||||
|
ref="leaveFormRef"
|
||||||
|
v-loading="loading"
|
||||||
|
:disabled="routeParams.type === 'view'"
|
||||||
|
:model="form"
|
||||||
|
:rules="rules"
|
||||||
|
label-width="100px"
|
||||||
|
class="space-y-4"
|
||||||
|
>
|
||||||
|
<div class="grid grid-cols-1 gap-4">
|
||||||
|
<el-row>
|
||||||
|
<!-- <el-col :span="12">
|
||||||
|
<el-form-item label="文件名称" prop="formNo">
|
||||||
|
<el-input disabled v-model="form.fileName" placeholder="请输入文件名称" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col> -->
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="文件" prop="formNo">
|
||||||
|
<div style="display: flex">
|
||||||
|
<span style="color: rgb(50, 142, 248)" @click="onOpen">点击打开</span>
|
||||||
|
</div>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="备注" prop="formNo">
|
||||||
|
<el-input disabled type="textarea" v-model="form.remark" placeholder="请输入内容" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
<!-- 提交组件 -->
|
||||||
|
<submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
|
||||||
|
<approvalRecord ref="approvalRecordRef"></approvalRecord>
|
||||||
|
<!-- 流程选择对话框 -->
|
||||||
|
<el-dialog
|
||||||
|
draggable
|
||||||
|
v-model="dialogVisible.visible"
|
||||||
|
:title="dialogVisible.title"
|
||||||
|
:before-close="handleClose"
|
||||||
|
width="500"
|
||||||
|
class="rounded-lg shadow-lg"
|
||||||
|
>
|
||||||
|
<div class="p-4">
|
||||||
|
<p class="text-gray-600 mb-4">请选择要启动的流程:</p>
|
||||||
|
<el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
|
||||||
|
<el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
|
</el-select>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
|
||||||
|
<el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
|
||||||
|
>取消</el-button
|
||||||
|
>
|
||||||
|
<el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
|
||||||
|
>确认</el-button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup name="Leave" lang="ts">
|
||||||
|
import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
|
||||||
|
import { startWorkFlow } from '@/api/workflow/task';
|
||||||
|
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 { useUserStoreHook } from '@/store/modules/user';
|
||||||
|
const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
|
||||||
|
import { getKnowledgeDocument } from '@/api/design/technicalStandard';
|
||||||
|
import { getCollectFile } from '@/api/design/condition';
|
||||||
|
import { drawingreviewzQuery } from '@/api/design/drawingreview';
|
||||||
|
|
||||||
|
// 获取用户 store
|
||||||
|
const userStore = useUserStoreHook();
|
||||||
|
// 从 store 中获取项目列表和当前选中的项目
|
||||||
|
const currentProject = computed(() => userStore.selectedProject);
|
||||||
|
const buttonLoading = ref(false);
|
||||||
|
const loading = ref(true);
|
||||||
|
//路由参数
|
||||||
|
const routeParams = ref<Record<string, any>>({});
|
||||||
|
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 flowCodeOptions = [
|
||||||
|
{
|
||||||
|
value: currentProject.value?.id + '_desDrawingReview',
|
||||||
|
label: '图纸评审'
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
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 initFormData = {
|
||||||
|
id: undefined,
|
||||||
|
fileName: undefined,
|
||||||
|
fileUrl: undefined,
|
||||||
|
status: undefined,
|
||||||
|
originalName: undefined
|
||||||
|
};
|
||||||
|
const data = reactive({
|
||||||
|
form: { ...initFormData },
|
||||||
|
rules: {}
|
||||||
|
});
|
||||||
|
const onOpen = () => {
|
||||||
|
window.open(form.value.path, '_blank');
|
||||||
|
};
|
||||||
|
const handleClose = () => {
|
||||||
|
dialogVisible.visible = false;
|
||||||
|
flowCode.value = '';
|
||||||
|
buttonLoading.value = false;
|
||||||
|
};
|
||||||
|
const { form, rules } = toRefs(data);
|
||||||
|
|
||||||
|
/** 表单重置 */
|
||||||
|
const reset = () => {
|
||||||
|
form.value = { ...initFormData };
|
||||||
|
leaveFormRef.value?.resetFields();
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 获取详情 */
|
||||||
|
const getInfo = () => {
|
||||||
|
loading.value = true;
|
||||||
|
buttonLoading.value = false;
|
||||||
|
nextTick(async () => {
|
||||||
|
const res = await drawingreviewzQuery(routeParams.value.id);
|
||||||
|
Object.assign(form.value, res.data);
|
||||||
|
loading.value = false;
|
||||||
|
buttonLoading.value = false;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 提交按钮 */
|
||||||
|
const submitForm = (status1: string) => {
|
||||||
|
status.value = status1;
|
||||||
|
submit(status.value, form.value);
|
||||||
|
};
|
||||||
|
|
||||||
|
const submitFlow = async () => {
|
||||||
|
handleStartWorkFlow(form.value);
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
buttonLoading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
//审批记录
|
||||||
|
const handleApprovalRecord = () => {
|
||||||
|
approvalRecordRef.value.init(form.value.id);
|
||||||
|
};
|
||||||
|
//提交回调
|
||||||
|
const submitCallback = async () => {
|
||||||
|
await proxy.$tab.closePage(proxy.$route);
|
||||||
|
proxy.$router.go(-1);
|
||||||
|
};
|
||||||
|
//审批
|
||||||
|
const approvalVerifyOpen = async () => {
|
||||||
|
// 图纸评审验证
|
||||||
|
submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
|
||||||
|
};
|
||||||
|
const submit = async (status, data) => {
|
||||||
|
form.value = data;
|
||||||
|
if (status === 'draft') {
|
||||||
|
buttonLoading.value = false;
|
||||||
|
proxy?.$modal.msgSuccess('暂存成功');
|
||||||
|
proxy.$tab.closePage(proxy.$route);
|
||||||
|
proxy.$router.go(-1);
|
||||||
|
} else {
|
||||||
|
if ((form.value.auditType === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
|
||||||
|
flowCode.value = flowCodeOptions[0].value;
|
||||||
|
dialogVisible.visible = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
//说明启动过先随意穿个参数
|
||||||
|
if (flowCode.value === '' || flowCode.value === null) {
|
||||||
|
flowCode.value = 'xx';
|
||||||
|
}
|
||||||
|
await handleStartWorkFlow(data);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
nextTick(async () => {
|
||||||
|
routeParams.value = proxy.$route.query;
|
||||||
|
|
||||||
|
reset();
|
||||||
|
loading.value = false;
|
||||||
|
console.log(routeParams.value.type);
|
||||||
|
if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
|
||||||
|
getInfo();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<style scoped lang="scss">
|
||||||
|
/* 全局样式 */
|
||||||
|
:root {
|
||||||
|
--primary: #409eff;
|
||||||
|
--primary-light: #66b1ff;
|
||||||
|
--primary-dark: #3a8ee6;
|
||||||
|
--success: #67c23a;
|
||||||
|
--warning: #e6a23c;
|
||||||
|
--danger: #f56c6c;
|
||||||
|
--info: #909399;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 表单样式优化 */
|
||||||
|
.el-form-item {
|
||||||
|
.el-form-item__label {
|
||||||
|
color: #606266;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-input__inner,
|
||||||
|
.el-select .el-input__inner {
|
||||||
|
border-radius: 4px;
|
||||||
|
transition:
|
||||||
|
border-color 0.2s,
|
||||||
|
box-shadow 0.2s;
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
border-color: var(--primary-light);
|
||||||
|
box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-textarea__inner {
|
||||||
|
border-radius: 4px;
|
||||||
|
transition:
|
||||||
|
border-color 0.2s,
|
||||||
|
box-shadow 0.2s;
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
border-color: var(--primary-light);
|
||||||
|
box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 按钮样式优化 */
|
||||||
|
.el-button {
|
||||||
|
border-radius: 4px;
|
||||||
|
transition: all 0.2s;
|
||||||
|
|
||||||
|
&.is-primary {
|
||||||
|
background-color: var(--primary);
|
||||||
|
border-color: var(--primary);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: var(--primary-light);
|
||||||
|
border-color: var(--primary-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
background-color: var(--primary-dark);
|
||||||
|
border-color: var(--primary-dark);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.is-text {
|
||||||
|
color: var(--primary);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: var(--primary-light);
|
||||||
|
background-color: rgba(64, 158, 255, 0.05);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 卡片样式优化 */
|
||||||
|
.el-card {
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
/* transform: translateY(-2px); */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 对话框样式优化 */
|
||||||
|
.el-dialog {
|
||||||
|
.el-dialog__header {
|
||||||
|
background-color: #f5f7fa;
|
||||||
|
border-bottom: 1px solid #ebeef5;
|
||||||
|
padding: 15px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-dialog__title {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #303133;
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-dialog__footer {
|
||||||
|
padding: 15px 20px;
|
||||||
|
border-top: 1px solid #ebeef5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
@ -87,9 +87,10 @@
|
|||||||
<div class="flex justify-center gap-4 mt-8">
|
<div class="flex justify-center gap-4 mt-8">
|
||||||
<el-button type="primary" @click="submitForm" v-if="!form.id || form.status == 'draft'" size="large">确认提交</el-button>
|
<el-button type="primary" @click="submitForm" v-if="!form.id || form.status == 'draft'" size="large">确认提交</el-button>
|
||||||
<!-- <el-button @click="resetForm" size="large">重置</el-button> -->
|
<!-- <el-button @click="resetForm" size="large">重置</el-button> -->
|
||||||
<el-button type="primary" @click="update" v-show="form.id && form.status == 'draft'" size="large">审核</el-button>
|
<el-button type="primary" @click="update" v-show="form.id && form.status == 'draft'" icon="Edit" size="large">审核</el-button>
|
||||||
<el-button type="primary" @click="update" v-show="form.status == 'back'" size="large">重新发起审核</el-button>
|
<el-button type="primary" @click="update" v-show="form.status == 'back'" size="large" icon="Edit">重新发起审核</el-button>
|
||||||
<el-button type="primary" @click="onView" v-show="form.id && form.status != 'draft'" size="large">查看流程</el-button>
|
<el-button type="primary" @click="onView" v-show="form.id && form.status != 'draft'" icon="view" size="large">查看流程</el-button>
|
||||||
|
<el-button type="success" @click="onLoad" v-show="form.id && form.status != 'draft'" icon="Download" size="large">导出</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
@ -101,7 +102,7 @@ import { ref, reactive, computed, onMounted } from 'vue';
|
|||||||
import { useUserStoreHook } from '@/store/modules/user';
|
import { useUserStoreHook } from '@/store/modules/user';
|
||||||
import { ElMessage, ElLoading } from 'element-plus';
|
import { ElMessage, ElLoading } from 'element-plus';
|
||||||
import { systemUserList } from '@/api/design/appointment';
|
import { systemUserList } from '@/api/design/appointment';
|
||||||
import { collectBatch, byProjectId } from '@/api/design/received';
|
import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
|
||||||
// 获取用户 store
|
// 获取用户 store
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
const userStore = useUserStoreHook();
|
const userStore = useUserStoreHook();
|
||||||
@ -293,6 +294,16 @@ onMounted(() => {
|
|||||||
byProjectIdAll();
|
byProjectIdAll();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
const onLoad = async () => {
|
||||||
|
// 导出接口
|
||||||
|
proxy?.download(
|
||||||
|
'design/collect/exportWord',
|
||||||
|
{
|
||||||
|
id: form.id
|
||||||
|
},
|
||||||
|
`收资清单.zip`
|
||||||
|
);
|
||||||
|
};
|
||||||
//监听项目id刷新数据
|
//监听项目id刷新数据
|
||||||
const listeningProject = watch(
|
const listeningProject = watch(
|
||||||
() => currentProject.value.id,
|
() => currentProject.value.id,
|
||||||
|
Reference in New Issue
Block a user