diff --git a/src/api/basic/basic.js b/src/api/basic/basic.js
index 856eee7e..9917f557 100644
--- a/src/api/basic/basic.js
+++ b/src/api/basic/basic.js
@@ -370,3 +370,20 @@ export function getI8ProjectList(params) {
})
}
+// 工程合并-工程列表
+export function getProListApi(params) {
+ return request({
+ url: '/material/bm_project_combine/list',
+ method: 'get',
+ params
+ })
+}
+
+// 工程合并-保存
+export function combineProjectApi(data) {
+ return request({
+ url: '/material/bm_project_combine/combineProject',
+ method: 'post',
+ data
+ })
+}
\ No newline at end of file
diff --git a/src/views/material/basic/projectMerge/index.vue b/src/views/material/basic/projectMerge/index.vue
index 583d1f58..0dd05cb4 100644
--- a/src/views/material/basic/projectMerge/index.vue
+++ b/src/views/material/basic/projectMerge/index.vue
@@ -1,15 +1,571 @@
- 工程合并
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+