diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue index 60b93fc..d3bd11a 100644 --- a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue +++ b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue @@ -6,7 +6,7 @@ - + + diff --git a/src/views/myWork/inComplete/inComplete.api.ts b/src/views/myWork/inComplete/inComplete.api.ts index 7a51a5f..e1cf1b1 100644 --- a/src/views/myWork/inComplete/inComplete.api.ts +++ b/src/views/myWork/inComplete/inComplete.api.ts @@ -12,6 +12,7 @@ export enum Api { queryProcessInfo = '/workflow/getprocessInfo', getProcessInstanceIdByProid = "/workflow/getProcessInstanceIdByProid", getWorkcountNumber="/workflow/getWorkcountNumber", + approveURTFile="/huzhouUploadfileinfo/approveURTFile" } /** @@ -29,6 +30,8 @@ export const approveUploadFile = (params) => defHttp.post({ url: Api.approveUplo export const modifyProjectInfo = (params) => defHttp.post({ url: Api.modifyProjectInfo, params }) export const approvePlanFile = (params) => defHttp.post({ url: Api.approvePlanFile, headers: { "Content-Type": "multipart/form-data" }, params }) +export const approveURTFile = (params) => defHttp.post({ url: Api.approveURTFile, headers: { "Content-Type": "multipart/form-data" }, params }) + export const openApprovePage = (record,router) => { if (record.stage == 1) { router.push({ // push方法 diff --git a/src/views/projectLib/projectInfo/projectInfo.data.ts b/src/views/projectLib/projectInfo/projectInfo.data.ts index 1ba5658..622ce9d 100644 --- a/src/views/projectLib/projectInfo/projectInfo.data.ts +++ b/src/views/projectLib/projectInfo/projectInfo.data.ts @@ -3,11 +3,7 @@ import { BasicColumn } from '@/components/Table'; import { useDictStore } from '@/store/modules/dict'; import { useUserStore } from '@/store/modules/user'; const userStore = useUserStore(); -import { ref } from 'vue' const dictStore = useDictStore(); - -const reformTasksDicts: Array = dictStore.selectDictArray("reformTasks") -const roomDicts: Array = dictStore.selectDictArray("superLeader") import { getWorkPlaceTypeDict, getContactorDict, getUserDictByRoles } from '../initiatesProjects/initiatesProjects.api' @@ -890,6 +886,10 @@ export const resourcetableColumns: BasicColumn[] = [ title: '上传时间', dataIndex: 'createDate', }, + { + title: '处理人', + dataIndex: 'createUser', + }, { title: '文件状态', dataIndex: 'status', diff --git a/src/views/projectLib/projectPlan/ProjectinfoComponent.vue b/src/views/projectLib/projectPlan/ProjectinfoComponent.vue new file mode 100644 index 0000000..695c328 --- /dev/null +++ b/src/views/projectLib/projectPlan/ProjectinfoComponent.vue @@ -0,0 +1,135 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectLib/projectPlan/index.vue b/src/views/projectLib/projectPlan/index.vue index 851740b..d73699a 100644 --- a/src/views/projectLib/projectPlan/index.vue +++ b/src/views/projectLib/projectPlan/index.vue @@ -7,7 +7,9 @@ @@ -18,6 +20,11 @@ :showCancelBtn="false"> + + + @@ -34,10 +41,15 @@ import viewPlanDetail from "@/views/projectLib/projectPlan/viewPlanDetail.vue"; import { isShowByRoles } from '@/views/projectLib/projectInfo/projectInfo.api'; import { columns } from '@/views/projectLib/projectInfo/projectInfo.data'; -import { searchFormSchema } from '@/views/projectLib/projectPlan/projectPlan.data'; -import { projectPlanPageList } from '@/views/projectLib/projectPlan/projectPlan.api'; +import { searchFormSchema ,unitedTechnicalRevieColumns} from '@/views/projectLib/projectPlan/projectPlan.data'; +import { projectPlanPageList,getUnitedTechnicalReviewList } from '@/views/projectLib/projectPlan/projectPlan.api'; import { useUserStore } from '@/store/modules/user'; import { useRouter } from 'vue-router'; // 导入 useRouter +import ProjectinfoComponent from './ProjectinfoComponent.vue' +import uploadURTfile from "@/views/projectLib/projectPlan/uploadURTfile.vue" +const [registerProjectinfo, { openModal: openModalProjectinfo,closeModal: closeModalProjectinfo}] = useModal();//选择项目页面 +const [registerUnitedTechnicalReview, { openModal:openUnitedTechnicalReviewmode,closeModal:closeUnitedTechnicalReviewmode}] = useModal();//新增修改周月报页面 + const router = useRouter(); let projectId = ref(); let type = ref(); @@ -123,6 +135,17 @@ function openModfiyInfoPage() { router.push({ path: '/projectLib/planinfoHistory/index' }) } +function openUnitedTechnicalReview() { + openModalProjectinfo(true,{title:"联合技术审查",api:getUnitedTechnicalReviewList,columns:unitedTechnicalRevieColumns}) +} + +function openModalProjectr(value) { + openUnitedTechnicalReviewmode(true,{projectid:value.id}) +} +function closeModel() { + closeUnitedTechnicalReviewmode() + closeModalProjectinfo() +}