diff --git a/api/workPlan/dayPlan.js b/api/workPlan/dayPlan.js
new file mode 100644
index 0000000..1ea133a
--- /dev/null
+++ b/api/workPlan/dayPlan.js
@@ -0,0 +1,350 @@
+import request_yn from '@/utils/request_new_yn'
+
+// 获取工程列表 (其一)
+export function getProjectList_1Api(data) {
+ return request_yn({
+ url: '/ynPlanApp/select/getProsByState',
+ method: 'post',
+ data: data
+ })
+}
+// 获取工程列表 (其二)
+export function getProjectList_2Api(data) {
+ return request_yn({
+ url: '/ynPlanApp/select/getProsForPro',
+ method: 'get',
+ params: data
+ })
+}
+// 获取风险等级
+export function getRiskLevelListApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/select/getFXDJ',
+ method: 'get',
+ params: data
+ })
+}
+// 获取管控层级
+export function getControlLevelListApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/select/getGKCJ',
+ method: 'get',
+ params: data
+ })
+}
+// 月计划填报提交 --基建
+export function setMonthPlanApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/addInfPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看报表 --基建
+export function getMonthPlanDataApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getPlanDetail',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-导入计划 --基建
+export function getWorkPlanContentApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/isPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据 --基建
+export function getViewDataListApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getViewData',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情 --基建
+export function getPlanDetailApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getPlanDetail',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划撤回 --基建
+export function revokePlanApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infMonth/backPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划删除 --基建
+export function deletePlanApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infMonth/deletePlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划修改 --基建
+export function updateInfPlanContentApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infMonth/updateInfPlanContent',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划提交 --基建
+export function submitPlanApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infMonth/submitPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-工作待办-列表 --基建
+export function getWorkWaitListApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getViewReport',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-工作待办-工程信息 --基建
+export function getWorkWaitProjectApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getViewReportForPro',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-工作待办-审核不通过 --基建
+export function setAuditingRejectApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infMonth/rejectPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看报表 --基建
+export function getReportFormListApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getViewReport',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-导入计划 --基建
+export function getImportMonthPlanApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getPrevPlan',
+ method: 'post',
+ data: data
+ })
+}
+
+/**
+ * 生产月计划
+ */
+
+// 获取作业类型
+export function getWorkTypeProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/select/getGZLX',
+ method: 'get',
+ params: data
+ })
+}
+// 获取管控方式
+export function getControlModeProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/select/getGKFS',
+ method: 'get',
+ params: data
+ })
+}
+
+// 月计划填报提交 --生产
+export function setMonthPlanProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/addInfPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看报表 --生产
+export function getMonthPlanDataProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/getPlanDetail',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据 --生产
+export function getViewDataListProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/getViewData',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情 --生产
+export function getPlanDetailProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/getPlanDetail',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划撤回 --生产
+export function revokePlanProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/backPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划删除 --生产
+export function deletePlanProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/deletePlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划修改 --生产
+export function updateInfPlanContentProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/updateInfPlanContent',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-详情-计划提交 --生产
+export function submitPlanProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/submitPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看数据-审核流程
+export function getAUditingProcessApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infMonth/getCheckDetail',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-上报人-获取审核人信息
+export function getAUditingUserInfoApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/select/getSelectUser',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看当前工程 当前月计划是否上传 - 基建
+export function getIsPlanApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/isPlan',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-查看当前工程 当前月计划是否上传 - 生产
+export function getIsPlanProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/isPlan',
+ method: 'post',
+ data: data
+ })
+}
+
+// 月计划-工作待办-列表 - 生产
+export function getWorkWaitListProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/getViewReport',
+ method: 'post',
+ data: data
+ })
+}
+
+// 月计划-工作待办-工程信息- - 生产
+// export function getWorkWaitProjectProApi(data) {
+// return request_yn({
+// url: '/ynPlanApp/proMonth/getViewReportForPro',
+// method: 'post',
+// data: data
+// })
+// }
+
+// 月计划-工作待办-审核不通过 - 生产
+export function setAuditingRejectProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/rejectPlan',
+ method: 'post',
+ data: data
+ })
+}
+
+// 月计划-工作待办-列表 --生产
+// export function getWorkWaitListProApi(data) {
+// return request_yn({
+// url: '/ynPlanApp/proMonth/getViewReport',
+// method: 'post',
+// data: data
+// })
+// }
+// 月计划-工作待办-工程信息 --生产
+export function getWorkWaitProjectProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/getViewReportForPro',
+ method: 'post',
+ data: data
+ })
+}
+// 月计划-工作待办-审核不通过 --生产
+// export function setAuditingRejectProApi(data) {
+// return request_yn({
+// url: '/ynPlanApp/proMonth/rejectPlan',
+// method: 'post',
+// data: data
+// })
+// }
+// 月计划-查看报表 --生产
+export function getReportFormListProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/getViewReport',
+ method: 'post',
+ data: data
+ })
+}
+
+// 月计划-导入计划 --基建
+export function getImportMonthPlanProApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/proMonth/getPrevPlan',
+ method: 'post',
+ data: data
+ })
+}
+
+/* 获取分包人员信息 */
+export function getSubUserInfoListApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getSelectUser',
+ method: 'post',
+ data: data
+ })
+}
+/* 获取班组信息 */
+export function getUserTeamInfoListApi(data) {
+ return request_yn({
+ url: '/ynPlanApp/infDay/getUserTeamName',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/pages.json b/pages.json
index 1ac50d3..9c796e7 100644
--- a/pages.json
+++ b/pages.json
@@ -767,8 +767,16 @@
"navigationStyle": "custom"
}
},
+ /* 基建日计划 */
{
- "path": "pages/workPlan/dayPlan/index",
+ "path": "pages/workPlan/dayPlan/inf-index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ /* 基建日计划 - 分包人员选择页面 */
+ {
+ "path": "pages/workPlan/dayPlan/sub-user/index",
"style": {
"navigationStyle": "custom"
}
diff --git a/pages/workPlan/dayPlan/inf-index.vue b/pages/workPlan/dayPlan/inf-index.vue
new file mode 100644
index 0000000..e44e6b9
--- /dev/null
+++ b/pages/workPlan/dayPlan/inf-index.vue
@@ -0,0 +1,2240 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getWorkWaitParams.planTime }}
+
+
+
+
+
+
+ 在建工程：
+ {{ item.zjs }}
+
+ {{ item.planTime }}
+
+
+
+ 已报工程数：
+ {{ item.ybs }}
+ 未报工程数：
+ {{ item.wbs }}
+
+
+ 待审核数：
+ {{ item.dsh }}
+
+ 待审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ projectName ? projectName : '请选择' }}
+ >
+
+
+
+
+
+
+
+ {{ DateValue }}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.zynr ? item.zynr : '请选择' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导入计划
+
+ 保存提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 《
+
+
+
+
+ {{ currentTime }}
+
+
+
+
+ 》
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 《
+
+
+
+
+ {{ currentTimeNew }}
+
+
+
+
+ 》
+
+
+
+
+
+
+
+ 在建工程：
+ {{ 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/dayPlan/pro-index.vue b/pages/workPlan/dayPlan/pro-index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/pages/workPlan/dayPlan/sub-user/index.vue b/pages/workPlan/dayPlan/sub-user/index.vue
new file mode 100644
index 0000000..2af9d5a
--- /dev/null
+++ b/pages/workPlan/dayPlan/sub-user/index.vue
@@ -0,0 +1,511 @@
+
+
+
+
+
+
+
+
+ 已选择 {{ onAlreadySelect }}
+ 保存
+
+
+
+ 序号
+
+
+
+ 姓名
+ 人员状态
+
+
+
+
+ {{ index + 1 }}
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/workPlan/workbench/components/infrastructure-model.vue b/pages/workPlan/workbench/components/infrastructure-model.vue
index 2ec5d61..f11e6b6 100644
--- a/pages/workPlan/workbench/components/infrastructure-model.vue
+++ b/pages/workPlan/workbench/components/infrastructure-model.vue
@@ -24,7 +24,7 @@ export default {
iconList: [
{
icon_title: '日计划',
- url: '/pages/workPlan/dayPlan/index',
+ url: '/pages/workPlan/dayPlan/inf-index',
img_src: require('../../../../static/images/workPlan/day_plan.png'),
isShow: ['22', '23', '24', '25']
},