diff --git a/api/index.js b/api/index.js index 64c58f3..8b28ef1 100644 --- a/api/index.js +++ b/api/index.js @@ -142,7 +142,7 @@ export const getHiddenPositionTree = (params) => post("/app/hidden/getTreehiddenRegionListAll", params); /** 部门树 */ -export const getDepartmentTree = (params) => post("/app/sys/listTree", params); +export const getDepartmentTree = (params) => post("/app/corpDepartment/listzTree", params); /** 人员 */ export const getPersonnelList = (params) => post("/app/sys/listUser", params); diff --git a/components/tki-tree/tki-tree.vue b/components/tki-tree/tki-tree.vue index 8d40a77..0856a01 100644 --- a/components/tki-tree/tki-tree.vue +++ b/components/tki-tree/tki-tree.vue @@ -3,7 +3,7 @@ - 取消 + 取41消 {{title}} 确定 diff --git a/safetyEnvirSubPackages/api/index.js b/safetyEnvirSubPackages/api/index.js index 1639112..b1920ed 100644 --- a/safetyEnvirSubPackages/api/index.js +++ b/safetyEnvirSubPackages/api/index.js @@ -1,37 +1,23 @@ import { post, upload, uploads } from "../../utils/request"; /** 获取监管端的部门的人员 */ -export const getDeptUser = (params) => - post("/AppUser/listAllManageAndCorp", { loading: false, ...params }); +export const getDeptUser = (params) => post("/app/user/listAll", {loading: false, ...params}); /** 获取隐患级别 */ -export const getHiddenLevel = () => - post("/app/dictionaries/listSelectTree", { - loading: false, - DICTIONARIES_ID: "5e7cf8620ba54ad89719d0be62133c7a", - }); +export const getHiddenLevel = () => post("/app/dictionaries", {loading: false, DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a'}); /** 获取隐患部位 */ export const getHiddenRegion = (params) => post("/app/hiddenRegion/gerRegionList", { loading: false, ...params }); /** 获取隐患类型 */ -export const getHiddenType = () => - post("/app/dictionaries/listSelectTree", { - loading: false, - DICTIONARIES_ID: "3babc15144444bdc8d763d0af2bdfff6", - }); +export const getHiddenType = () => post("/app/dictionaries", {loading: false, DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff6'}); /** 获取被检查部门 */ -export const getInspectedDepartment = (params) => - post("/app/corpDepartment/listTreeCorpDept", { loading: false, ...params }); +export const getInspectedDepartment = (params) => post("/app/corpDepartment/listzTree", {loading: false, CORPINFO_ID: params}); /** 获取检查部门 */ -export const getInspectionDepartment = (params) => - post("/app/corpDepartment/listTreeManageAndCorp", { - loading: false, - ...params, - }); +export const getInspectionDepartment = (params) => post("/app/corpDepartment/listzTree", {loading: false, CORPINFO_ID: params}); /** 获取检查类型 */ export const getInspectionType = () => @@ -41,12 +27,10 @@ export const getInspectionType = () => }); /** 获取检查人员 */ -export const getInspectors = (params) => - post("/AppUser/listAllManageAndCorp", { loading: false, ...params }); +export const getInspectors = (params) => post("/app/user/listAll", {loading: false, ...params}); /** 安全环保检查明细信息 */ -export const getSafetyenvironmentalGoEdit = (params) => - post("/app/safetyenvironmental/goEdit", params); +export const getSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goShow", params); /** 上传图片 */ export const setImgFilesAdd = (params) => @@ -57,8 +41,7 @@ export const setSafetyenvironmentalAdd = (params) => post("/app/safetyenvironmental/add", params); /** 安全环保检查检查人确认 */ -export const setSafetyenvironmentalVerify = (params) => - upload("/app/safetyenvironmentalinspector/verify", params); +export const setSafetyenvironmentalVerify = (params) => upload("/app/safetyenvironmental/verify", params); /** 新增安全环保检查 - plus */ export const setSafetyenvironmentalAdd_plus = (params) => @@ -81,8 +64,7 @@ export const setSafetyenvironmentalExplain = (params) => post("/app/safetyenvironmental/explain", params); /** 设置安全环境流程 */ -export const setSafetyenvironmentalFlow = (params) => - post("/app/safetyenvironmental/showFlowChart", params); +export const setSafetyenvironmentalFlow = (params) => post("/app/safetyenvironmental/getFlow", params); /** 修改安全环保检查 - plus */ export const setSafetyenvironmentalEdit_plus = (params) => @@ -99,9 +81,8 @@ export const setVideoAdd = (params) => upload("/app/imgfiles/add", params); export const getSafetyenvironmentalList = (params) => post("/app/safetyenvironmental/list", params); -/** 获取安全环保检查列表 */ -export const getpleadList = (params) => - post("/app/safetyenvironmental/pleadList", params); +/** 获取安全环保检查申辩记录列表 */ +export const getpleadList = (params) => post("/app/safetyenvironmental/pleadList", params); /** 获取安全环保检查申辩流程列表 */ export const getSafetyenvironmentalExplain = (params) => @@ -114,13 +95,12 @@ export const getHiddenGoEdit = (params) => post("/app/hidden/goEdit", params); export const setFinalCheck = (params) => post("/app/hidden/finalcheck", params); /** 安全环保检查检查人确认列表 */ -export const getSafetyenvironmentalinspectorList = (params) => - post("/app/safetyenvironmentalinspector/list", params); +export const getSafetyenvironmentalinspectorList = (params) => post("/app/safetyenvironmental/prosecutors/list", params); /** 获取被检查人签字/申辩列表 */ export const getInspectedList = (params) => post( - `/app/safetyenvironmentalexplain/list?showCount=${params.showCount}¤tPage=${params.currentPage}` + `/app/safetyenvironmental/list?showCount=${params.showCount}¤tPage=${params.currentPage}` ); /** 获取被检查人签字/申辩确认前的详情记录 */ diff --git a/safetyEnvirSubPackages/pages/defense-record/list.vue b/safetyEnvirSubPackages/pages/defense-record/list.vue index 22d7665..16232a1 100644 --- a/safetyEnvirSubPackages/pages/defense-record/list.vue +++ b/safetyEnvirSubPackages/pages/defense-record/list.vue @@ -82,7 +82,7 @@ import { getpleadList, getSafetyenvironmentalList } from "../../api"; import keyWordSearchInput from "@/components/keyWordSearchInput/index.vue"; import List from "@/components/list/list.vue"; -import { initiateList } from "../../../Mock/safetyEnvirData"; +// import { initiateList } from "../../../Mock/safetyEnvirData"; export default { components: { keyWordSearchInput, List }, @@ -112,24 +112,24 @@ export default { title: "加载中", }); // TODO: 目前因后端资源接口未完成,故注释接口数据接入逻辑 - // let resData = await getpleadList({ - // loginUserId: this.userInfo.USER_ID, - // supDeparIds: this.userInfo.supDeparIds, - // roleLevel: this.userInfo.roleLevel, - // CORPINFO_ID: this.userInfo.CORPINFO_ID, - // KEYWORDS: this.keyword, - // showCount: this.pageSize, - // currentPage: this.currentPage, - // }); - // this.list = [...this.list, ...resData.varList]; - // this.totalPage = resData.page.totalPage; + let resData = await getpleadList({ + loginUserId: this.userInfo.USER_ID, + supDeparIds: this.userInfo.supDeparIds, + roleLevel: this.userInfo.roleLevel, + CORPINFO_ID: this.userInfo.CORPINFO_ID, + // KEYWORDS: this.keyword, + showCount: this.pageSize, + currentPage: this.currentPage, + }); + this.list = [...this.list, ...resData.varList]; + this.totalPage = resData.page.totalPage; // 虚拟 mock 数据渲染 - setTimeout(() => { - this.list = initiateList; - this.totalPage = initiateList.length; - uni.hideLoading(); - }, 400); + // setTimeout(() => { + // this.list = initiateList; + // this.totalPage = initiateList.length; + // uni.hideLoading(); + // }, 400); }, resetList() { this.pageSize = 10; diff --git a/safetyEnvirSubPackages/pages/defense-record/plead-list.vue b/safetyEnvirSubPackages/pages/defense-record/plead-list.vue index 2cffa70..24ff1d2 100644 --- a/safetyEnvirSubPackages/pages/defense-record/plead-list.vue +++ b/safetyEnvirSubPackages/pages/defense-record/plead-list.vue @@ -54,7 +54,7 @@