diff --git a/api/index.js b/api/index.js index 15029b5..a2e3328 100644 --- a/api/index.js +++ b/api/index.js @@ -28,7 +28,7 @@ export const getInspectors = (params) => post("/AppUser/listAllManageAndCorp", { export const getHiddenLevel = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a'}) //获取隐患级别 export const getHiddenType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff6'}) //获取隐患类型 export const getInspectionType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '60e6481d96e44a5390ff5c347c4d1ffe'}) //获取检查类型 -export const getSafetyenvironmentalinspectorList = (params) => post("/app/safetyenvironmentalinspector/list", params) //安全环保检查检查人确认列表 +export const getSafetyenvironmentalinspectorList = (params) => post("/inspection/safety/environmental/query/app/page", params) //安全环保检查检查人确认列表 export const setSafetyenvironmentalVerify = (params) => upload("/app/safetyenvironmentalinspector/verify", params) //安全环保检查检查人确认 export const getCorpInfoList = (params) => post("/app/corpinfo/listRetrieval", params) //分公司信息列表 export const getCorpInfoGoEdit = (params) => post("/app/corpinfo/goMessage", params) //分公司信息查看 diff --git a/pages/safety-environmental-inspection/inspector-confirms/detail.vue b/pages/safety-environmental-inspection/inspector-confirms/detail.vue index c04f4ff..101f32d 100644 --- a/pages/safety-environmental-inspection/inspector-confirms/detail.vue +++ b/pages/safety-environmental-inspection/inspector-confirms/detail.vue @@ -389,7 +389,6 @@ export default { return; } } - console.log(this.form.INSPECTION_USER_SIGN_IMG) await setSafetyenvironmentalVerify({ filePath: this.form.INSPECTION_USER_SIGN_IMG, name: 'FFILE', diff --git a/pages/safety-environmental-inspection/inspector-confirms/list.vue b/pages/safety-environmental-inspection/inspector-confirms/list.vue index 101c864..d171eab 100644 --- a/pages/safety-environmental-inspection/inspector-confirms/list.vue +++ b/pages/safety-environmental-inspection/inspector-confirms/list.vue @@ -5,7 +5,7 @@ prefixIcon="search" placeholder="请输入关键字" border="surround" - v-model="keyword" + v-model="companyName" clearable shape="circle" > @@ -18,40 +18,40 @@ - 被检查单位:{{ item.INSPECTED_CORPINFO_ID_NAME }} + 被检查单位:{{ item.inspectedCorpName }} - 检查发起人:{{ item.INSPECTION_ORIGINATOR_NAME }} - 检查类型:{{ item.INSPECTION_TYPE_NAME }} + 检查发起人:{{ item.inspectionOriginatorUserName }} + 检查类型:{{ item.inspectionTypeName }} - 检查时间:自 {{ item.INSPECTION_TIME_START }} 至 {{ item.INSPECTION_TIME_END }} 止 + 检查时间:自 {{ item.inspectionTimeStart }} 至 {{ item.inspectionTimeEnd }} 止 状态: - - - - - - - - - - - + + + + + + + + + + + + @click="fnNavigatorDetail(item.inspectionId,item.inspectionUserId,item.inspectionInspectorId,'view')"> + v-if="!validStr(item.inspectionUserSignTime) && (item.inspectionStatus === '0' || item.inspectionStatus === '1')"> + @click="fnNavigatorDetail(item.inspectionId,item.inspectionUserId,item.inspectionInspectorId,'verify')"> @@ -68,7 +68,7 @@ import {getSafetyenvironmentalinspectorList} from "@/api"; export default { data() { return { - keyword: '', + companyName: '', INSPECTION_STATUS: '', pageSize: 10, currentPage: 1, @@ -92,14 +92,14 @@ export default { return false }, async getData() { - let resData = await getSafetyenvironmentalinspectorList({ - INSPECTION_USER_ID: this.userInfo.USER_ID, - KEYWORDS: this.keyword, + let { varList,page } = await getSafetyenvironmentalinspectorList({ + companyName: this.companyName, showCount: this.pageSize, currentPage: this.currentPage, + pageType: "inspector", }); - this.list = [...this.list, ...resData.varList]; - this.totalPage = resData.page.totalPage; + this.list = [...this.list, ...varList]; + this.totalPage = page.totalPage; }, resetList() { this.pageSize = 10