From 619af5ef7ee58d5b0c040ace35423893881017a8 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 30 Oct 2024 10:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=AE=A1=E5=88=92=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/workPlan/weekPlan.js | 47 +-
pages.json | 9 +-
pages/workPlan/weekPlan/pro-index.vue | 2457 +++++++++++++++++
.../weekPlanAuditingDetails/pro-index.vue | 1210 ++++++++
pages/workPlan/weekPlanDetails/pro-index.vue | 1031 +++++++
5 files changed, 4738 insertions(+), 16 deletions(-)
create mode 100644 pages/workPlan/weekPlanAuditingDetails/pro-index.vue
diff --git a/api/workPlan/weekPlan.js b/api/workPlan/weekPlan.js
index 4be0881..2c2450e 100644
--- a/api/workPlan/weekPlan.js
+++ b/api/workPlan/weekPlan.js
@@ -115,7 +115,7 @@ export function getWorkWaitProjectApi(data) {
// 月计划-工作待办-审核不通过 --基建
export function setAuditingRejectApi(data) {
return request_yn({
- url: '/ynPlanApp/infWeek/rejectPlan',
+ url: '/ynPlanApp/proWeek/rejectPlan',
method: 'post',
data: data
})
@@ -144,6 +144,14 @@ export function getWorkPlanContentApi(data) {
data: data
})
}
+// 月计划-导入计划 --基建
+export function getWorkPlanContentProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/ProWeek/isPlan',
+ method: 'post',
+ data: data
+ })
+}
/**
* 生产月计划
@@ -169,7 +177,7 @@ export function getControlModeProApi(data) {
// 月计划填报提交 --生产
export function setMonthPlanProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/addInfPlan',
+ url: '/ynPlanApp/proWeek/addInfPlan',
method: 'post',
data: data
})
@@ -177,7 +185,7 @@ export function setMonthPlanProApi(data) {
// 月计划-查看报表 --生产
export function getMonthPlanDataProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/getPlanDetail',
+ url: '/ynPlanApp/proWeek/getPlanDetail',
method: 'post',
data: data
})
@@ -185,7 +193,7 @@ export function getMonthPlanDataProApi(data) {
// 月计划-查看数据 --生产
export function getViewDataListProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/getViewData',
+ url: '/ynPlanApp/proWeek/getViewData',
method: 'post',
data: data
})
@@ -193,7 +201,7 @@ export function getViewDataListProApi(data) {
// 月计划-查看数据-详情 --生产
export function getPlanDetailProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/getPlanDetail',
+ url: '/ynPlanApp/proWeek/getPlanDetail',
method: 'post',
data: data
})
@@ -201,7 +209,7 @@ export function getPlanDetailProApi(data) {
// 月计划-查看数据-详情-计划撤回 --生产
export function revokePlanProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/backPlan',
+ url: '/ynPlanApp/proWeek/backPlan',
method: 'post',
data: data
})
@@ -209,7 +217,7 @@ export function revokePlanProApi(data) {
// 月计划-查看数据-详情-计划删除 --生产
export function deletePlanProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/deletePlan',
+ url: '/ynPlanApp/proWeek/deletePlan',
method: 'post',
data: data
})
@@ -217,7 +225,7 @@ export function deletePlanProApi(data) {
// 月计划-查看数据-详情-计划修改 --生产
export function updateInfPlanContentProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/updateInfPlanContent',
+ url: '/ynPlanApp/proWeek/updateInfPlanContent',
method: 'post',
data: data
})
@@ -225,7 +233,7 @@ export function updateInfPlanContentProApi(data) {
// 月计划-查看数据-详情-计划提交 --生产
export function submitPlanProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/submitPlan',
+ url: '/ynPlanApp/proWeek/submitPlan',
method: 'post',
data: data
})
@@ -238,6 +246,15 @@ export function getAUditingProcessApi(data) {
data: data
})
}
+
+// 月计划-查看数据-审核流程
+export function getAUditingProcessProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proWeek/getCheckDetail',
+ method: 'post',
+ data: data
+ })
+}
// 月计划-上报人-获取审核人信息
export function getAUditingUserInfoApi(data) {
return request_yn({
@@ -257,7 +274,7 @@ export function getIsPlanApi(data) {
// 月计划-查看当前工程 当前月计划是否上传 - 生产
export function getIsPlanProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/isPlan',
+ url: '/ynPlanApp/proWeek/isPlan',
method: 'post',
data: data
})
@@ -266,7 +283,7 @@ export function getIsPlanProApi(data) {
// 月计划-工作待办-列表 - 生产
export function getWorkWaitListProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/getViewReport',
+ url: '/ynPlanApp/proWeek/getViewReport',
method: 'post',
data: data
})
@@ -284,7 +301,7 @@ export function getWorkWaitListProApi(data) {
// 月计划-工作待办-审核不通过 - 生产
export function setAuditingRejectProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/rejectPlan',
+ url: '/ynPlanApp/proWeek/rejectPlan',
method: 'post',
data: data
})
@@ -301,7 +318,7 @@ export function setAuditingRejectProApi(data) {
// 月计划-工作待办-工程信息 --生产
export function getWorkWaitProjectProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/getViewReportForPro',
+ url: '/ynPlanApp/proWeek/getViewReportForPro',
method: 'post',
data: data
})
@@ -317,7 +334,7 @@ export function getWorkWaitProjectProApi(data) {
// 月计划-查看报表 --生产
export function getReportFormListProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/getViewReport',
+ url: '/ynPlanApp/proWeek/getViewReport',
method: 'post',
data: data
})
@@ -326,7 +343,7 @@ export function getReportFormListProApi(data) {
// 月计划-导入计划 --基建
export function getImportMonthPlanProApi(data) {
return request_yn({
- url: '/ynPlanApp/proMonth/getPrevPlan',
+ url: '/ynPlanApp/proWeek/getPrevPlan',
method: 'post',
data: data
})
diff --git a/pages.json b/pages.json
index af0c898..1ac50d3 100644
--- a/pages.json
+++ b/pages.json
@@ -788,6 +788,13 @@
"navigationStyle": "custom"
}
},
+ /* 基建周计划 - 审核和详情 */
+ {
+ "path": "pages/workPlan/weekPlanAuditingDetails/inf-index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
/* 生产周计划 */
{
"path": "pages/workPlan/weekPlan/pro-index",
@@ -804,7 +811,7 @@
},
/* 生产周计划 - 审核和详情 */
{
- "path": "pages/workPlan/weekPlanAuditingDetails/inf-index",
+ "path": "pages/workPlan/weekPlanAuditingDetails/pro-index",
"style": {
"navigationStyle": "custom"
}
diff --git a/pages/workPlan/weekPlan/pro-index.vue b/pages/workPlan/weekPlan/pro-index.vue
index e69de29..0be887c 100644
--- a/pages/workPlan/weekPlan/pro-index.vue
+++ b/pages/workPlan/weekPlan/pro-index.vue
@@ -0,0 +1,2457 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ weekStartCurrent_1 }}~{{ weekEndCurrent_1 }}
+
+
+
+
+
+
+ 在建工程：
+ {{ item.zjs }}
+
+ {{ item.planTime }}
+
+
+
+ 已报工程数：
+ {{ item.ybs }}
+ 未报工程数：
+ {{ item.wbs }}
+
+
+ 待审核数：
+ {{ item.dsh }}
+
+ 待审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ projectName ? projectName : '请选择' }}
+
+
+
+
+
+
+
+
+ {{ weekStart }}~{{ weekEnd }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.zynr ? item.zynr : '请选择' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导入计划
+
+ 保存提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ weekStartCurrent }}~{{ weekEndCurrent }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ weekStartCurrent_2 }}~{{ weekEndCurrent_2 }}
+
+
+
+
+
+
+
+
+
+ 在建工程：
+ {{ item.zjs }}
+
+ {{ item.planTime }}
+
+
+
+ 已报工程数：
+ {{ item.ybs }}
+ 未报工程数：
+ {{ item.wbs }}
+
+
+ 待审核数：
+ {{ item.dsh }}
+
+ 已通过
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ projectInPopupName ? projectInPopupName : '请选择' }}
+ >
+
+
+
+
+ {{ projectQueryType ? projectQueryType : '请选择' }}
+ >
+
+
+
+
+
+
+
+
+
+ 计划数量
+ {{ item.planCount }}
+
+
+
+ 提交人/提交时间
+ {{ item.upUser }}/{{ item.planTime }}
+ {{ onTypeChange(item.state) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请选择计划审核人
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 序号
+ 姓名
+ 岗位
+
+
+
+
+
+
+
+ {{ index + 1 }}
+ {{ item.name }}
+ {{ item.orgName }}
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+ 序号
+ 作业内容
+ 风险等级
+
+
+
+
+ {{ index + 1 }}
+ {{ item.zynr }}
+ {{ item.fxdjName }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/workPlan/weekPlanAuditingDetails/pro-index.vue b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
new file mode 100644
index 0000000..e4c86d9
--- /dev/null
+++ b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
@@ -0,0 +1,1210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.zynr ? item.zynr : '请选择' }}
+
+
+
+
+
+
+
+
+ 流程
+
+
+
+
+
+
+
+
+
+ {{ item.process }}
+
+ {{ j.operateUser }}
+ {{ j.operateResult }}
+ {{ j.operateTime }}
+
+
+ {{ item.auditingInfo[0].operateTime || '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核完成
+
+
+
+
+
+
+
+
+ 请选择计划审核人
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 序号
+ 姓名
+ 岗位
+
+
+
+
+
+
+
+ {{ index + 1 }}
+ {{ item.name }}
+ {{ item.orgName }}
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+ 序号
+ 作业内容
+ 风险等级
+
+
+
+
+ {{ index + 1 }}
+ {{ item.zynr }}
+ {{ item.fxdjName }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/workPlan/weekPlanDetails/pro-index.vue b/pages/workPlan/weekPlanDetails/pro-index.vue
index e69de29..9661a67 100644
--- a/pages/workPlan/weekPlanDetails/pro-index.vue
+++ b/pages/workPlan/weekPlanDetails/pro-index.vue
@@ -0,0 +1,1031 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.zynr ? item.zynr : '请选择' }}
+
+
+
+
+
+
+
+
+ 流程
+
+
+
+
+
+
+
+
+
+ {{ item.process }}
+
+ {{ j.operateUser }}
+ {{ j.operateResult }}
+ {{ j.operateTime }}
+
+
+ {{ item.auditingInfo[0].operateTime || '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+ 请选择计划审核人
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 序号
+ 姓名
+ 岗位
+
+
+
+
+
+
+
+ {{ index + 1 }}
+ {{ item.name }}
+ {{ item.orgName }}
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+ 序号
+ 作业内容
+ 风险等级
+
+
+
+
+ {{ index + 1 }}
+ {{ item.zynr }}
+ {{ item.fxdjName }}
+
+
+
+
+
+
+
+
+
+
+