diff --git a/api/oa/reportDetail.js b/api/oa/reportDetail.js
new file mode 100644
index 0000000..b1ff790
--- /dev/null
+++ b/api/oa/reportDetail.js
@@ -0,0 +1,44 @@
+import request from "@/util/oaRequest"
+
+// 查询设计项目汇报详情列表
+export async function listReportDetail(query) {
+ return request({
+ url: '/system/reportDetail/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设计项目汇报详情详细
+export function getReportDetail(id) {
+ return request({
+ url: '/system/reportDetail/' + id,
+ method: 'get'
+ })
+}
+
+// 新增设计项目汇报详情
+export function addReportDetail(data) {
+ return request({
+ url: '/system/reportDetail',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设计项目汇报详情
+export function updateReportDetail(data) {
+ return request({
+ url: '/system/reportDetail',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设计项目汇报详情
+export function delReportDetail(id) {
+ return request({
+ url: '/system/reportDetail/' + id,
+ method: 'delete'
+ })
+}
diff --git a/api/oa/reportSummary.js b/api/oa/reportSummary.js
new file mode 100644
index 0000000..62218e4
--- /dev/null
+++ b/api/oa/reportSummary.js
@@ -0,0 +1,81 @@
+import request from "@/util/oaRequest"
+
+// 查询设计项目汇报概述列表
+export async function listReportSummary(query) {
+ // return {
+ // rows: [
+ // {
+ // reportSummaryId: 1,
+ // reportTitle: '汇报标题',
+ // reportDate: '汇报日期',
+ // reporter: '汇报人',
+ // projectName: '设计项目',
+ // projectId: '1'
+ // },
+ // {
+ // reportSummaryId: 2,
+ // reportTitle: '汇报标题',
+ // reportDate: '汇报日期',
+ // reporter: '汇报人',
+ // projectName: '设计项目',
+ // projectId: '1'
+ // },
+ // {
+ // reportSummaryId: 3,
+ // reportTitle: '汇报标题',
+ // reportDate: '汇报日期',
+ // reporter: '汇报人',
+ // projectName: '设计项目',
+ // projectId: '1'
+ // },
+ // {
+ // reportSummaryId: 4,
+ // reportTitle: '汇报标题',
+ // reportDate: '汇报日期',
+ // reporter: '汇报人',
+ // projectName: '设计项目',
+ // projectId: '1'
+ // },
+ // ],
+ // total: 1,
+ // }
+ return request({
+ url: '/system/reportSummary/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询设计项目汇报概述详细
+export function getReportSummary(id) {
+ return request({
+ url: '/system/reportSummary/' + id,
+ method: 'get'
+ })
+}
+
+// 新增设计项目汇报概述
+export function addReportSummary(data) {
+ return request({
+ url: '/system/reportSummary',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改设计项目汇报概述
+export function updateReportSummary(data) {
+ return request({
+ url: '/system/reportSummary',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除设计项目汇报概述
+export function delReportSummary(id) {
+ return request({
+ url: '/system/reportSummary/' + id,
+ method: 'delete'
+ })
+}
diff --git a/pages.json b/pages.json
index 8d9fb30..2a85608 100644
--- a/pages.json
+++ b/pages.json
@@ -261,7 +261,15 @@
"navigationBarTitleText" : "施工进度",
"navigationStyle": "default"
}
- }
+ },
+ {
+ "path" : "pages/workbench/construction/detail",
+ "style" :
+ {
+ "navigationBarTitleText" : "施工进度详情",
+ "navigationStyle": "default"
+ }
+ }
],
"tabBar": {
"color": "#8E9AB0",
diff --git a/pages/workbench/construction/construction.vue b/pages/workbench/construction/construction.vue
index 8183fd0..3430234 100644
--- a/pages/workbench/construction/construction.vue
+++ b/pages/workbench/construction/construction.vue
@@ -1,22 +1,411 @@
-
-
+
+
+
+ 新增
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.reportTitle || '-' }}
+ {{ formatDate(item.lastUpdateTime) }}
+ {{ formatDate(item.reportDate) }}
+ {{ item.reporter || '-' }}
+ {{ item.projectName || '-' }}
+ {{ item.remark || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/pages/workbench/construction/detail.vue b/pages/workbench/construction/detail.vue
new file mode 100644
index 0000000..649f184
--- /dev/null
+++ b/pages/workbench/construction/detail.vue
@@ -0,0 +1,702 @@
+
+
+
+
+
+
+
+ 汇报标题:
+ {{ receivedParams.reportTitle }}
+
+
+ 汇报人:
+ {{ receivedParams.reporter }}
+
+
+ 涉及项目:
+ {{ receivedParams.projectName }}
+
+
+
+
+
+
+ 新增
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.deviceCode || '-' }}
+ {{ item.category || '-' }}
+
+ {{ item.reportDetail || '-' }}
+
+
+
+ -
+
+ {{ item.remark || '-' }}
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/workbench/reportWork/reportWork.vue b/pages/workbench/reportWork/reportWork.vue
index 71d9375..76a8f80 100644
--- a/pages/workbench/reportWork/reportWork.vue
+++ b/pages/workbench/reportWork/reportWork.vue
@@ -7,52 +7,56 @@
-
-