diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 393d2bd..924f518 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -37,6 +37,7 @@ import { Skeleton, Spin, Col, + DatePicker } from 'ant-design-vue'; export function registerGlobComp(app: App) { @@ -77,5 +78,6 @@ export function registerGlobComp(app: App) { .use(Select) .use(Skeleton) .use(Spin) + .use(DatePicker) .use(Col); } diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue index dd89099..57a9ff6 100644 --- a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue +++ b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue @@ -62,7 +62,8 @@ 'trainingPhase', 'requirementInvestigation', 'softwareDevelopmentPhase', - 'setUpProjectTeam' + 'setUpProjectTeam', + 'JAA' ]; const [registerModal, { closeModal }] = useModalInner(init); defineProps(['record']); diff --git a/src/views/projectLib/projectArchive/index.vue b/src/views/projectLib/projectArchive/index.vue index 8a0c2f0..450179e 100644 --- a/src/views/projectLib/projectArchive/index.vue +++ b/src/views/projectLib/projectArchive/index.vue @@ -42,7 +42,7 @@ useModal(); let projectid = ref(); let showApprovalForm = ref(false); - const [registerTable] = useTable({ + const [registerTable,{reload}] = useTable({ title: '项目归档信息', api: projectArchivePageList, columns: columns, @@ -83,7 +83,10 @@ ifShow: () => { return record.isArchive == true; }, - onClick: handleArchive.bind(null, record), + popConfirm: { + title: '确定归档吗?', + confirm: handleArchive.bind(null, record), + }, }, ]; } @@ -98,6 +101,7 @@ const res = await archiveProject(projectid.value); if (res == '归档项目成功!') { message.success('归档成功'); + reload() } } function close() { diff --git a/src/views/projectLib/projectPlan/addProjectDate.vue b/src/views/projectLib/projectPlan/addProjectDate.vue new file mode 100644 index 0000000..30f70e6 --- /dev/null +++ b/src/views/projectLib/projectPlan/addProjectDate.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/views/projectLib/projectPlan/projectPlan.api.ts b/src/views/projectLib/projectPlan/projectPlan.api.ts index 1280f63..3990fc3 100644 --- a/src/views/projectLib/projectPlan/projectPlan.api.ts +++ b/src/views/projectLib/projectPlan/projectPlan.api.ts @@ -37,6 +37,9 @@ export enum Api { queryUpdatePlanFlagById = "/huzhouProject/queryUpdatePlanFlagById", deleteContractMoney = "/huzhouPlan/deleteContractMoney", taskNameIsFinished = "/huzhouPlan/taskNameIsFinished", + //日期修改 + getPlanNames = "/huzhouPlan/getPlanNames", + updateScheduledTime = "/huzhouPlan/updateScheduledTime", } /** * 提交入库申请流程 @@ -77,3 +80,5 @@ export const getContractinfoByTaskName = (params) => defHttp.get({ url: Api.getC export const queryUpdatePlanFlagById = (params) => defHttp.get({ url: Api.queryUpdatePlanFlagById, params }) export const deleteContractMoney = (id: any) =>defHttp.delete({url: `${Api.deleteContractMoney}?projectid=${id}`}) export const taskNameIsFinished = (id: any) =>defHttp.get({url: `${Api.taskNameIsFinished}?projectid=${id}`}) +export const getPlanNames = (id: any) =>defHttp.get({url: `${Api.getPlanNames}?projectid=${id}`}) +export const updateScheduledTime = (params: any) =>defHttp.put({url:Api.updateScheduledTime,params}) \ No newline at end of file diff --git a/src/views/projectLib/projectPlan/viewPlanDetail.vue b/src/views/projectLib/projectPlan/viewPlanDetail.vue index 85316a7..790c403 100644 --- a/src/views/projectLib/projectPlan/viewPlanDetail.vue +++ b/src/views/projectLib/projectPlan/viewPlanDetail.vue @@ -77,6 +77,12 @@ 下载 + 项目日期修改
@@ -108,6 +114,7 @@ + { if ( - (record.isfinish == 0&&dataTo.isArchiveFinish ==false&& + (record.isfinish == 0 && + dataTo.isArchiveFinish == false && record.taskFile?.length > 0 && record.taskName != '可研技术审查报告确认' && record.taskName != '造价评估报告确认') || - (record.ismodify && record.isfinish == 2&&dataTo.isArchiveFinish ==false) + (record.ismodify && record.isfinish == 2 && dataTo.isArchiveFinish == false) ) { if (isShowByRoles('projectContact')) { //有子项目,就展示一级的任务 @@ -271,7 +279,8 @@ ifShow: () => { if ( record.isfinish == 2 && - record.taskFile?.length > 0 &&dataTo.isArchiveFinish ==false&& + record.taskFile?.length > 0 && + dataTo.isArchiveFinish == false && (record.taskName == '可研报告初稿编制' || record.taskName == '可研报告送审稿编制' || record.taskName == '造价评估报告确认' || @@ -403,8 +412,8 @@ planinfoid: UnitedTechnicalReviewmode.value, projectid: dataTo.projectId, }); - } else if(taskName.value.indexOf('合同签订') >= 0) { - await deleteContractMoney(dataTo.projectId) + } else if (taskName.value.indexOf('合同签订') >= 0) { + await deleteContractMoney(dataTo.projectId); openPlanFile(); } else { openPlanFile(); @@ -445,6 +454,10 @@ //下载 await downloadPlanInfo({ projectid: dataTo.projectId }); } + const addProjectDateRef = ref() + async function showProjectDateModal() { + addProjectDateRef.value.showModal(dataTo.projectId) + }