+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 这里展示月份日历和每日人员排班（待与后端字段对接后完善）
-
-
+
+
-
-
-
diff --git a/src/views/planMange/dailyPlan/forms/projectForm.vue b/src/views/planMange/dailyPlan/forms/projectForm.vue
new file mode 100644
index 0000000..882ca73
--- /dev/null
+++ b/src/views/planMange/dailyPlan/forms/projectForm.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/planMange/dailyPlan/forms/repairForm.vue b/src/views/planMange/dailyPlan/forms/repairForm.vue
new file mode 100644
index 0000000..b018d7b
--- /dev/null
+++ b/src/views/planMange/dailyPlan/forms/repairForm.vue
@@ -0,0 +1,1034 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 计划投入熟练工人员数量
+
+ (分包高空作业人员)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 计划投入辅助工人员数量
+
+ (分包地面作业人员)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 实际投入检修熟练工数量
+
+ (分包高空作业人员)
+
+
+
+
+
+
+
+
+
+
+
+ 实际投入检修辅助工数量
+
+ (分包地面作业人员)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+
+
+
+ 工作量
+ 工作量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基
+
+
+
+
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写实际完成情况
+
+
+ 取消实际完成情况
+
+
+
+
+
+
+
diff --git a/src/views/planMange/dailyPlan/forms/runForm.vue b/src/views/planMange/dailyPlan/forms/runForm.vue
new file mode 100644
index 0000000..b54f11f
--- /dev/null
+++ b/src/views/planMange/dailyPlan/forms/runForm.vue
@@ -0,0 +1,591 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+
+
+ 辆
+
+
+
+
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写实际完成情况
+
+
+ 取消实际完成情况
+
+
+
+
+
+
+
diff --git a/src/views/planMange/dailyPlan/index.vue b/src/views/planMange/dailyPlan/index.vue
index f9304c3..09fc001 100644
--- a/src/views/planMange/dailyPlan/index.vue
+++ b/src/views/planMange/dailyPlan/index.vue
@@ -2,9 +2,9 @@
-
-
-
+
+
+
下载统计表
@@ -15,13 +15,15 @@
:key="tableType"
:show-toolbar="true"
:show-action="true"
- :load-data="listPlanAPI"
:form-columns="formColumns"
+ :load-data="listDailyPlanAPI"
:table-columns="initTableColumns"
:action-columns="actionColumns"
+ :defaultQueryParams="{ dayPlanType: tableType }"
>
新增日计划
+ 编辑调试
buildFormColumns())
const initTableColumns = computed(() => {
- if (tableType.value === '运行') return [...tableColumns, ...tableColumns_1]
- if (tableType.value !== '运行') return [...tableColumns, ...tableColumns_2]
+ if (tableType.value === '0') return [...tableColumns, ...tableColumns_1]
+ if (tableType.value !== '0') return [...tableColumns, ...tableColumns_2]
})
// 操作列
-const actionColumns = [
+const actionColumns = computed(() => [
{
label: '详情',
type: 'primary',
@@ -80,7 +83,15 @@ const actionColumns = [
handler: (row) => {
router.push({
path: '/plan/dailyPlanEdit/index',
- query: { id: row.planId, mode: 'detail' },
+ query: {
+ id: row.planId || row.dayPlanId,
+ mode: 'detail',
+ dayPlanType: tableType.value,
+ inspectionStationName: row.inspectionStationName,
+ projectName: row.projectName,
+ planMajorName: row.planMajorName,
+ dayPlan: row.dayPlan,
+ },
})
},
},
@@ -91,7 +102,15 @@ const actionColumns = [
handler: (row) => {
router.push({
path: '/plan/dailyPlanEdit/index',
- query: { id: row.planId, mode: 'edit' },
+ query: {
+ id: row.planId || row.dayPlanId,
+ mode: 'edit',
+ dayPlanType: tableType.value,
+ inspectionStationName: row.inspectionStationName,
+ projectName: row.projectName,
+ planMajorName: row.planMajorName,
+ dayPlan: row.dayPlan,
+ },
})
},
},
@@ -101,7 +120,7 @@ const actionColumns = [
link: true,
handler: (row) => {
proxy.$modal.confirm('是否确认删除该月计划？').then(async () => {
- const result = await delPlanAPI({ planId: row.planId })
+ const result = await delDailyPlanAPI({ dayPlanId: row.dayPlanId })
if (result.code === 200) {
proxy.$modal.msgSuccess('删除成功')
comTableRef.value?.refresh()
@@ -109,7 +128,7 @@ const actionColumns = [
})
},
},
-]
+])
// 新增
const onHandleAdd = () => {
@@ -122,14 +141,38 @@ const onHandleCancel = () => {
}
// 保存
-const onHandleSave = () => {
- addFormRef.value.validate()
+const onHandleSave = async () => {
+ await addFormRef.value.validate()
+ const paramsList = addFormRef.value.getSelectedTasks().map((item) => ({
+ dayPlan: addFormRef.value.getCurrentDate(),
+ monthlyPlanId: item.monthlyPlanId,
+ dayPlanType: tableType.value,
+ riskLevel: item.riskLevel,
+ }))
+
+ const result = await addDailyPlanAPI(paramsList)
+ if (result.code === 200) {
+ proxy.$modal.msgSuccess('保存成功')
+ dialogConfig.outerVisible = false
+ comTableRef.value?.refresh()
+ }
}
// 关闭弹框统一处理
const onCloseDialogOuter = (visible) => {
dialogConfig.outerVisible = visible
}
+
+// 编辑调试
+const onHandleEdit = () => {
+ router.push({
+ path: '/plan/dailyPlanEdit/index',
+ query: {
+ mode: 'edit',
+ dayPlanType: tableType.value,
+ },
+ })
+}