diff --git a/src/views/ProcessApprovalSubPage/MergeProjectApprova.vue b/src/views/ProcessApprovalSubPage/MergeProjectApprova.vue
new file mode 100644
index 0000000..1fb90ac
--- /dev/null
+++ b/src/views/ProcessApprovalSubPage/MergeProjectApprova.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ProcessApprovalSubPage/SplitProjectApprova.vue b/src/views/ProcessApprovalSubPage/SplitProjectApprova.vue
new file mode 100644
index 0000000..af0a241
--- /dev/null
+++ b/src/views/ProcessApprovalSubPage/SplitProjectApprova.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
index a7524a6..8ebe46e 100644
--- a/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
+++ b/src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
@@ -1,11 +1,14 @@
+
+
+
+
diff --git a/src/views/ProcessApprovalSubPage/component/SplitProjectDetail.vue b/src/views/ProcessApprovalSubPage/component/SplitProjectDetail.vue
new file mode 100644
index 0000000..3914d40
--- /dev/null
+++ b/src/views/ProcessApprovalSubPage/component/SplitProjectDetail.vue
@@ -0,0 +1,75 @@
+
+
+
+ 拆分为第一个项目
+
+ 拆分为第二个项目
+
+
+
+
diff --git a/src/views/ProcessApprovalSubPage/projectPlanApproval.vue b/src/views/ProcessApprovalSubPage/projectPlanApproval.vue
index a0e4e2b..a20db3f 100644
--- a/src/views/ProcessApprovalSubPage/projectPlanApproval.vue
+++ b/src/views/ProcessApprovalSubPage/projectPlanApproval.vue
@@ -1,5 +1,9 @@
+ 模板表格文件下载
+
+ 下载模板
+
@@ -26,6 +30,8 @@ import { ElMessage } from 'element-plus'
import ApprovalDetails from "../ProcessApprovalSubPage/component/ApprovalDetails.vue";
import ApprovalFromPage from "../ProcessApprovalSubPage/component/ApprovalFromPage.vue"
import PlaninfoDetails from "../ProcessApprovalSubPage/component/PlaninfoDetails.vue"
+import { downloadFile } from "@/api/common/api"
+
let dataTo = defineProps(["record"])
const emit = defineEmits(['close']);
let processInstanceId = dataTo.record.processInstanceId
@@ -47,8 +53,16 @@ onMounted(async () => {
})
+function downexcel() {
+ let param = {
+ path: "Resources/项目计划模板.xlsx",
+ fileName: "项目计划模板.xlsx"
+ }
+ downloadFile("/huzhouUploadfileinfo/downloadfile", "项目计划模板.xlsx", param)
+}
+
async function handleSubmit() {
let approvalform = await ApprovalFromPageRef.value.getFieldsValueApprovalForm();
diff --git a/src/views/myWork/inComplete/inComplete.api.ts b/src/views/myWork/inComplete/inComplete.api.ts
index e1cf1b1..c30d543 100644
--- a/src/views/myWork/inComplete/inComplete.api.ts
+++ b/src/views/myWork/inComplete/inComplete.api.ts
@@ -12,7 +12,10 @@ export enum Api {
queryProcessInfo = '/workflow/getprocessInfo',
getProcessInstanceIdByProid = "/workflow/getProcessInstanceIdByProid",
getWorkcountNumber="/workflow/getWorkcountNumber",
- approveURTFile="/huzhouUploadfileinfo/approveURTFile"
+ approveURTFile="/huzhouUploadfileinfo/approveURTFile",
+ approvalMergeProject="huzhouMergesplitinfo/approvalMergeProject",
+ approvalSplitProject="huzhouMergesplitinfo/approvalSplitProject",
+
}
/**
@@ -31,6 +34,8 @@ export const modifyProjectInfo = (params) => defHttp.post({ url: Api.modifyProje
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 approvalMergeProject = (params) => defHttp.post({ url: Api.approvalMergeProject, headers: { "Content-Type": "multipart/form-data" }, params })
+export const approvalSplitProject = (params) => defHttp.post({ url: Api.approvalSplitProject, headers: { "Content-Type": "multipart/form-data" }, params })
export const openApprovePage = (record,router) => {
if (record.stage == 1) {
diff --git a/src/views/projectLib/projectInfo/Detailpage.vue b/src/views/projectLib/projectInfo/Detailpage.vue
index b8a2b8b..7db4a14 100644
--- a/src/views/projectLib/projectInfo/Detailpage.vue
+++ b/src/views/projectLib/projectInfo/Detailpage.vue
@@ -34,7 +34,7 @@ import ProjectDetails from "../../ProcessApprovalSubPage/component/ProjectDetail
import ApprovalDetails from "../../ProcessApprovalSubPage/component/ApprovalDetails.vue"
import UploadfileDetail from '../../ProcessApprovalSubPage/component/UploadfileDetail.vue'
import fieldChangeDetail from '../../ProcessApprovalSubPage/component/fieldChangeDetail.vue'
-import ProjectTable from "@/views/ProcessApprovalSubPage/component/projectTable.vue"
+import ProjectTable from "@/views/ProcessApprovalSubPage/component/ProjectTable.vue"
let dataTo = defineProps(["projectid", "stage", "IsModify","showUploadfileDetail","showApprovalDetails"])
let fieldChangeDetailList = ref>()
let mergeDetailList = ref>()
diff --git a/src/views/projectLib/projectInfo/index.vue b/src/views/projectLib/projectInfo/index.vue
index 4b250cc..f876f91 100644
--- a/src/views/projectLib/projectInfo/index.vue
+++ b/src/views/projectLib/projectInfo/index.vue
@@ -39,7 +39,7 @@
导出项目
-
合并项目
+ > -->
defHttp.get({ url: Api.getMergeDetailList, params });
export const getSplitDetailList = (params?) =>
defHttp.get({ url: Api.getSplitDetailList, params });
+export const getFromDataFromMerge = (params?) =>
+ defHttp.get({ url: Api.getFromDataFromMerge, params });
+export const getFromDataFromSplit = (params?) =>
+ defHttp.get({ url: Api.getFromDataFromSplit, params });
/**
* 职务list