diff --git a/src/request/eight_work.js b/src/request/eight_work.js
index 77d009c..92b739f 100644
--- a/src/request/eight_work.js
+++ b/src/request/eight_work.js
@@ -5,3 +5,17 @@ export const getTaskSetps = (params) =>
export const getHotWorkList = (params) => post("/hotwork/list", params); // 动火作业管理列表
export const getHotWorkView = (params) => post("/hotwork/findById", params); // 动火作业管理查看
export const getHotWorkFlow = (params) => post("/hotwork/getFlowList", params); // 动火作业流程图
+
+export const getConfinedSpaceList = (params) =>
+ post("/confinedspace/list", params); // 受限作业管理列表
+export const getConfinedSpaceView = (params) =>
+ post("/confinedspace/findById", params); // 受限作业管理查看
+
+export const getConfinedSpaceFlow = (params) =>
+ post("/confinedspace/getFlowList", params); // 受限作业流程图
+
+export const getHighWorkList = (params) => post("/highwork/list", params); // 高处作业管理列表
+export const getHighWorkView = (params) => post("/highwork/findById", params); // 高处作业管理查看
+
+export const getHighWorkFlow = (params) =>
+ post("/highwork/getFlowList", params); // 高处作业流程图
diff --git a/src/views/confined_space/job_data/index.vue b/src/views/confined_space/job_data/index.vue
index 2556178..8689ecc 100644
--- a/src/views/confined_space/job_data/index.vue
+++ b/src/views/confined_space/job_data/index.vue
@@ -16,13 +16,13 @@
-
-
+
+
@@ -53,15 +53,14 @@
-
+
- {{
- entrance === "job_data"
- ? translationStatus(row.APPLY_STATUS, stateList)
- : "已归档"
- }}
+ 暂存
+ 气体检测打回
+ {{ row.NEXT_STEP_NAME }}
+ {{ row.STEP_NAME }}打回
@@ -69,9 +68,8 @@
流程图
@@ -119,18 +117,22 @@
diff --git a/src/views/high/job_data/index.vue b/src/views/high/job_data/index.vue
index e7f4eb4..9bc7f2f 100644
--- a/src/views/high/job_data/index.vue
+++ b/src/views/high/job_data/index.vue
@@ -16,13 +16,13 @@
-
-
+
+
@@ -50,12 +50,8 @@
-
-
+
+
{{ row.LEADER_USER_NAME || " 已跳过" }}
@@ -76,19 +72,21 @@
label="验收部门负责人"
show-overflow-tooltip
/>
-
+
- {{
- entrance === "job_data"
- ? translationStatus(row.APPLY_STATUS, stateList)
- : "已归档"
- }}
+ 暂存
+ {{ row.NEXT_STEP_NAME }}
+ {{ row.STEP_NAME }}打回
流程图
@@ -135,18 +133,22 @@
diff --git a/src/views/hot_work/job_data/index.vue b/src/views/hot_work/job_data/index.vue
index a11e6c8..121af53 100644
--- a/src/views/hot_work/job_data/index.vue
+++ b/src/views/hot_work/job_data/index.vue
@@ -169,7 +169,7 @@ getStepList();
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getHotWorkList, {
- otherParams: props.entrance === "archive" ? { APPLY_STATUS: "8" } : {},
+ otherParams: props.entrance === "archive" ? { STEP_ID: "99" } : {},
});
const data = reactive({
flowChartDialog: {