diff --git a/src/views/ProcessApprovalSubPage/planFileApproval.vue b/src/views/ProcessApprovalSubPage/planFileApproval.vue index 5440574..08f4596 100644 --- a/src/views/ProcessApprovalSubPage/planFileApproval.vue +++ b/src/views/ProcessApprovalSubPage/planFileApproval.vue @@ -147,7 +147,11 @@ import planinfoFileDetail from '@/views/projectLib/projectPlan/planinfoFileDetail.vue'; import { useModal, BasicModal } from '@/components/Modal'; import { BasicTable, ActionItem, TableAction, useTable } from '@/components/Table'; - import { approvePlanFile, getActionParam } from '../myWork/inComplete/inComplete.api'; + import { + approvePlanFile, + approveURTFile, + getActionParam, + } from '../myWork/inComplete/inComplete.api'; import { PlaninfoFiletableColumns, PlaninfoColumn, @@ -252,7 +256,7 @@ let taskName = ref(''); let pjid = ref(''); let isContractFinished = ref(); - let projectList = ref([]) + let projectList = ref([]); const showMoneyForm = ref(false); onMounted(async () => { resButton = await getActionParam({ @@ -263,7 +267,7 @@ showApprovalForm.value = resButton.showApprovalForm; planFileDetailKey.value += 1; let resList = await getplaninfoByid({ planinfoid: planinfoid }); - projectList.value = resList + projectList.value = resList; let taskLevel = resList[0].taskLevel.split('.')[0]; console.log('taskLevel', taskLevel, resList); let res2 = await queryPlanInfoMainTimeline({ projectid: resList[0].projectId }); @@ -350,9 +354,9 @@ function goContract() { openFileInfo(true, { planinfoid: projectList.value[0].id, - taskName: "合同签订", - isfinish: 2, - projectid: projectList.value[0].projectId, + taskName: '合同签订', + isfinish: 2, + projectid: projectList.value[0].projectId, }); } function getTableAction(record): ActionItem[] { @@ -408,7 +412,7 @@ if (item == 'all') { return true; } - let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf','zip'] as Array; + let geShi = ['xlx', 'xlsx', 'docx', 'doc', 'pdf', 'zip'] as Array; if (geShi.indexOf(file.name.substring(file.name.lastIndexOf('.') + 1)) == -1) { message.error('文件格式错误!仅支持' + 'xlx,xlsx, docx, doc, pdf,zip'); console.log('文件格式错误!仅支持' + 'xlsx', 'docx', 'doc', 'pdf,zip'); @@ -562,9 +566,15 @@ } console.log('param', params, 'approvalform', approvalform); if (await ApprovalFromPageRef.value.validateApprovalForm()) { - let res = await approvePlanFile(params); - console.log('提交成功!', res); - emit('close'); + if (taskName.value== '联合验收审批') { + let res = await approveURTFile(params); + console.log('提交成功!', res); + emit('close'); + } else { + let res = await approvePlanFile(params); + console.log('提交成功!', res); + emit('close'); + } } } async function exit() { diff --git a/src/views/projectLib/projectPlan/addPlanFile.vue b/src/views/projectLib/projectPlan/addPlanFile.vue index 97a4eaf..a6ac284 100644 --- a/src/views/projectLib/projectPlan/addPlanFile.vue +++ b/src/views/projectLib/projectPlan/addPlanFile.vue @@ -113,7 +113,12 @@