diff --git a/src/api/design/drawingreview/index.ts b/src/api/design/drawingreview/index.ts index 882e7ec..d28e0be 100644 --- a/src/api/design/drawingreview/index.ts +++ b/src/api/design/drawingreview/index.ts @@ -53,6 +53,14 @@ export const fillOutTheDesignVerificationForm = (data) => { }); }; // 设计验证表 +export const drawingreviewReceipts = (data) => { + return request({ + url: '/design/drawingreviewReceipts', + method: 'post', + data + }); +}; +// 设计验证表 export const subProjectListAll = (id) => { return request({ url: '/design/drawingreview/subProjectList/' + id, @@ -66,6 +74,21 @@ export const ObtainHistoricalDesignDrawingsForReview = (id) => { method: 'get' }); }; +// 获取详情 +export const drawingreviewReceiptsList = (params) => { + return request({ + url: '/design/drawingreviewReceipts/list', + method: 'get', + params: params + }); +}; +// 根据历史设计图纸评审查询详情 +export const drawingreviewReceiptsDetail = (id) => { + return request({ + url: '/design/drawingreviewReceipts/' + id, + method: 'get' + }); +}; // 根据历史设计图纸评审查询详情 export const drawingreview = (id) => { return request({ diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index 03dc600..a25aea2 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -1,82 +1,4 @@ diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index cc388f4..304a7ef 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -59,16 +59,15 @@ - + @@ -81,9 +80,9 @@ @@ -121,6 +148,8 @@ const queryFormRef = ref(); const uploadUrl = computed(() => { return `/design/collectFile/upload`; }); +const viewVisible = ref(false); +const fileList = ref([]); const ossid = ref(null); const data = reactive({ queryParams: { @@ -207,12 +236,9 @@ const handleViewInfo = (row) => { }); }; /** 删除按钮操作 */ -const handleDelete = async (row?: DesignChangeVO) => { - const _ids = row?.id || ids.value; - await proxy?.$modal.confirm('是否确认删除设计变更管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false)); - await delDesignChange(_ids); - proxy?.$modal.msgSuccess('删除成功'); - await getList(); +const handleDesignView = async (row?: DesignChangeVO) => { + fileList.value = row.ossVoList; + viewVisible.value = true; }; const handleView = (row) => { // 查看详情 @@ -222,6 +248,9 @@ const handleView = (row) => { const onOpen = (path: string) => { window.open(path, '_blank'); }; +const handleDownload = (row: any) => { + window.open(row.url, '_blank'); +}; onMounted(() => { getList(); diff --git a/src/views/design/designChange/indexEdit copy.vue b/src/views/design/designChange/indexEdit copy.vue deleted file mode 100644 index fc92386..0000000 --- a/src/views/design/designChange/indexEdit copy.vue +++ /dev/null @@ -1,500 +0,0 @@ - - - - diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue index d2df02b..a6a9b74 100644 --- a/src/views/design/designChange/indexEdit.vue +++ b/src/views/design/designChange/indexEdit.vue @@ -299,7 +299,9 @@ onMounted(() => { routeParams.value = proxy.$route.query; reset(); getList(); - getInfo(); + if (routeParams.value.type != 'add') { + getInfo(); + } }); }); diff --git a/src/views/design/drawing/indexEdit copy.vue b/src/views/design/drawing/indexEdit copy.vue deleted file mode 100644 index 51f076c..0000000 --- a/src/views/design/drawing/indexEdit copy.vue +++ /dev/null @@ -1,415 +0,0 @@ - - - - diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue index f72e2ec..9163c22 100644 --- a/src/views/design/drawing/indexEdit.vue +++ b/src/views/design/drawing/indexEdit.vue @@ -236,7 +236,8 @@ const submitCallback = async () => { }; //审批 const approvalVerifyOpen = async () => { - submitVerifyRef.value.openDialog(routeParams.value.taskId); + submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId); + // submitVerifyRef.value.openDialog(routeParams.value.taskId); }; // 图纸上传成功之后 开始提交 const submit = async (status, data) => { diff --git a/src/views/design/drawingreview/detailForm.vue b/src/views/design/drawingreview/detailForm.vue index 86f206f..6a2968f 100644 --- a/src/views/design/drawingreview/detailForm.vue +++ b/src/views/design/drawingreview/detailForm.vue @@ -1,5 +1,5 @@ + +
+ 选择历史退回记录： + + + +
+ 查看excel文件 +
+ +

设计验证表

+ + +
+ 编号： + {{ examineForm.num }} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
工程名称{{ examineForm.projectName }}
子项名称{{ examineForm.subprojectName }}设计阶段{{ examineForm.stage }}
专业{{ examineForm.professional }}卷册{{ examineForm.volume }}设计人{{ examineForm.designer }}
验证内容{{ examineForm.verificationContent }}
验证意见执行意见
+
{{ examineForm.verificationOpinion }}
+ 		+
{{ examineForm.executionOpinion }}
+
+
+ 校审： {{ examineForm.proofreading }} + {{ dateFormat(examineForm.proofreadingDate) }} +
+ 		+
执行人： {{ examineForm.executor }}
+
+ {{ dateFormat(examineForm.executorDate) }} +
+
+
+ 审核 ： {{ examineForm.audit }} + {{ dateFormat(examineForm.auditDate) }} +
+
+
+
+
+ @@ -225,7 +325,7 @@ import { useUserStoreHook } from '@/store/modules/user'; const fileList = ref([]); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major')); - +import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview'; const volumeCatalogList = ref([]); const buttonLoading = ref(false); const loading = ref(true); @@ -234,7 +334,9 @@ const ids = ref>([]); const single = ref(true); const multiple = ref(true); const total = ref(0); - +const hisId = ref(''); +const dialogHistory = ref(false); +const hisList = ref([]); // 获取用户 store const userStore = useUserStoreHook(); // 从 store 中获取项目列表和当前选中的项目 @@ -255,7 +357,30 @@ const uploadForm = reactive({ fileList: [], cancellationIds: [] // 用于存储已作废的文件ID }); - +const examineForm = ref({ + audit: '', + auditDate: '', + auditId: '', + designer: '', + executionOpinion: '', + executor: '', + executorDate: '', + executorId: '', + id: '1', + num: '', + professional: '', + projectId: '', + projectName: '', + proofreading: '', + proofreadingDate: '', + proofreadingId: '', + stage: '', + subprojectId: '', + subprojectName: '', + verificationContent: '', + verificationOpinion: '', + volume: '' +}); const userList = ref([]); const initFormData: any = { @@ -300,7 +425,34 @@ const getList = async () => { loading.value = false; } }; - +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 handleViewHistory = async (row) => { + // 查看历史流程记录 + dialogHistory.value = true; + hisId.value = ''; + let res = await drawingreviewReceiptsList({ drawingreviewId: row.design }); + hisList.value = res.rows; + if (hisList.value.length > 0) { + hisId.value = hisList.value[0].id; + getDetails(hisId.value); + } +}; +const handleShowInfo = (val) => { + getDetails(val); +}; +const getDetails = async (id) => { + let res = await drawingreviewReceiptsDetail(id); + examineForm.value = res.data; +}; /** 取消按钮 */ const cancel = () => { reset(); @@ -477,3 +629,53 @@ onUnmounted(() => { listeningProject(); }); + diff --git a/src/views/design/volumeCatalog/indexEdit.vue b/src/views/design/volumeCatalog/indexEdit.vue deleted file mode 100644 index e0912ce..0000000 --- a/src/views/design/volumeCatalog/indexEdit.vue +++ /dev/null @@ -1,414 +0,0 @@ - - - -