diff --git a/api/index.js b/api/index.js index 15043e9..0ce4690 100644 --- a/api/index.js +++ b/api/index.js @@ -102,9 +102,9 @@ export const getkeyprojectcount = (params) => post("/app/keyprojectcheck/keyProj export const getPromiseUnsigned = (params) => post("/app/corppromise/ISSIGN", params); // 获取是否有需要签字的承诺书 export const getPromiseInfo = (params) => post("/app/corppromise/promise", params); // 获取需要签字的承诺书信息 export const setPromiseSign = (params) => upload("/app/corppromise/editpeople", params); // 承诺书提交签字 -export const getMyPromiseList = (params) => post("/app/corppromise/promiselist", params); // 获取我的承诺列表 -export const getReceivePromiseList = (params) => post("/app/corppromise/receivePromiseList", params); // 获取接收承诺列表 +export const getMyPromiseList = (params) => post("/app/corppromise/promiseV2list", params); // 获取我的承诺列表 +export const getReceivePromiseList = (params) => post("/app/corppromise/receiveV2PromiseList", params); // 获取接收承诺列表 export const getPromiseView = (params) => post("/app/corppromise/goEdit", params); // 查看承诺书 export const setPromiseIsRead = (params) => post("/app/corppromise/editIsRead", params); // 承诺书设置阅读状态 export const editHiddenIspunish = (params) => post("/app/keyprojectcheck/editHiddenIspunish", params); // 修改隐患信息 -export const getPERSONNELMANAGEMENTID = (params) => post("/app/keyProjects/goEdit", params); // 重点工程默认回显负责人 \ No newline at end of file +export const getPERSONNELMANAGEMENTID = (params) => post("/app/keyProjects/goEdit", params); // 重点工程默认回显负责人 diff --git a/pages/key-project-management/safety-environmental-inspection/detail-list.vue b/pages/key-project-management/safety-environmental-inspection/detail-list.vue index a14d355..815434b 100644 --- a/pages/key-project-management/safety-environmental-inspection/detail-list.vue +++ b/pages/key-project-management/safety-environmental-inspection/detail-list.vue @@ -52,6 +52,7 @@ export default { data() { return { KEYWORDS: '', + CORPINFO_ID: '', OUTSOURCED_ID: '', pageSize: 10, currentPage: 1, @@ -71,7 +72,8 @@ export default { } }, onLoad(e) { - this.OUTSOURCED_ID = e.OUTSOURCED_ID + this.OUTSOURCED_ID = e.OUTSOURCED_ID, + this.CORPINFO_ID = this.$route.query.CORPINFO_ID }, onShow(){ this.resetList() @@ -81,6 +83,7 @@ export default { let resData = await getKeyProjectsCheckList({ KEYWORDS: this.KEYWORDS, OUTSOURCED_ID: this.OUTSOURCED_ID, + CORPINFO_ID: this.CORPINFO_ID, showCount: this.pageSize, currentPage: this.currentPage, }); @@ -99,6 +102,7 @@ export default { params: { KEYPROJECTCHECK_ID, type, + CORPINFO_ID:this.CORPINFO_ID, OUTSOURCED_ID:this.OUTSOURCED_ID } }) diff --git a/pages/key-project-management/safety-environmental-inspection/detail.vue b/pages/key-project-management/safety-environmental-inspection/detail.vue index fdc2ce2..af08122 100644 --- a/pages/key-project-management/safety-environmental-inspection/detail.vue +++ b/pages/key-project-management/safety-environmental-inspection/detail.vue @@ -356,6 +356,8 @@ export default { HIDDENLEVEL: '', HIDDENTYPE_NAME: '', HIDDENTYPE: '', + HIDDENTYPE2_NAME: '', + HIDDENTYPE2: '', SOURCE: '4', CORPINFO_ID: '', HIDDENFINDDEPT: '', @@ -396,6 +398,7 @@ export default { async onLoad(event) { this.KEYPROJECTCHECK_ID = event.KEYPROJECTCHECK_ID this.OUTSOURCED_ID = event.OUTSOURCED_ID + this.disabled = !(event.type === 'add' || event.type === 'edit'); if (this.KEYPROJECTCHECK_ID) { await this.fnGetKeyProjectsCheckView() @@ -492,6 +495,14 @@ export default { if (list === 'hiddenTypeTreeList') { this.hiddenForm.HIDDENTYPE = e[0].id this.hiddenForm.HIDDENTYPE_NAME = e[0].name + // 获取根节点元素名 + this.hiddenTypeTreeList.forEach((enode) => { + if (JSON.stringify(enode).includes(e[0].id) && JSON.stringify(enode).includes(e[0].name)){ + // CORPINFO_ID = this.$route.query.CORPINFO_ID, + this.hiddenForm.HIDDENTYPE2 = enode.id + this.hiddenForm.HIDDENTYPE2_NAME = enode.name + } + }) } if (list === 'rectificationSiteuserColumns') { this.hiddenForm.RECTIFICATIONDEPT = e[0].UNITS_ID @@ -636,6 +647,8 @@ export default { FOREIGN_KEY, TYPE: 102, CORPINFO_ID: this.userInfo.CORPINFO_ID, + // CORPINFO_ID: this.CORPINFO_ID, + }, loading:false }) diff --git a/pages/key-project-management/safety-environmental-inspection/list.vue b/pages/key-project-management/safety-environmental-inspection/list.vue index fcccb90..8a04426 100644 --- a/pages/key-project-management/safety-environmental-inspection/list.vue +++ b/pages/key-project-management/safety-environmental-inspection/list.vue @@ -101,6 +101,7 @@ export default { url: '/pages/key-project-management/safety-environmental-inspection/detail-list', params: { OUTSOURCED_ID, + CORPINFO_ID: this.CORPINFO_ID } }) }, diff --git a/pages/mine/promise/detail.vue b/pages/mine/promise/detail.vue index 167d691..4c75ae1 100644 --- a/pages/mine/promise/detail.vue +++ b/pages/mine/promise/detail.vue @@ -13,23 +13,23 @@ 若违反上述承诺和未履行安全生产职责，或发生责任事故的，接受政府或公司事故调查组做出的处罚决定。 - - 承诺期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。 - + + + 若未履行安全生产职责，或发生生产安全事故的，接受公司或政府事故调查组做出的处罚。 - - 责任期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。 - + + + - 承诺单位(盖章)： + 发状人：{{ info.COVERPEOPLE }} - {{ info.CREATTIME.substring(0,10) }} + - + {{ info.TYPE === '0' ? '主要负责人签字' : '受状人' }}： @@ -37,8 +37,15 @@ - - {{ info.SIGNTIME && info.SIGNTIME.substring(0,10) }} + + + + + + + + {{ info.TYPE === '0' ? '主要负责人未签字' : '受状人未签字' }} + diff --git a/pages/mine/promise/promise.vue b/pages/mine/promise/promise.vue index 48b230c..b2946fd 100644 --- a/pages/mine/promise/promise.vue +++ b/pages/mine/promise/promise.vue @@ -6,6 +6,7 @@ itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;" @click="tabsClick" > +<<<<<<< HEAD @@ -54,14 +55,73 @@ +======= + + + + + + + + + 起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }} + + 结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }} + + + + + + + + 重置 + + + + + 搜索 + + + + + + + + + + +>>>>>>> remotes/origin/pet - 被承诺人：{{ item.coverpeople }} - 承诺人：{{ item.NAME }} + + + + 已签字 + 未签字 {{ item.SIGNTIME }} {{ item.ISREAD == '0' ? '待阅' : '已阅' }} @@ -81,7 +141,8 @@ export default { data() { return { tabsList: [ - {name: '我的承诺', id: '1'}, + // {name: '我的承诺', id: '1'}, + {name: '发出承诺', id: '1'}, {name: '接收承诺', id: '2'} ], TYPE: '1', @@ -116,6 +177,7 @@ export default { ADDEND: this.addTimeEndStr }) this.list = [...this.list, ...resData.varList] + this.totalPage = resData.page.totalPage }, async fnGetReceivePromiseList() { let resData = await getReceivePromiseList({ @@ -162,10 +224,17 @@ export default { }, // 高级搜索弹窗关闭函数 +<<<<<<< HEAD popupClose() { this.popupShow = false }, +======= + popupClose() { + this.popupShow = false + + }, +>>>>>>> remotes/origin/pet // 高级搜索日期选择器关闭回调 addPickBarOnClose(type) { switch (type) { @@ -201,7 +270,11 @@ export default { this.$refs.uToast.show({message:'日期选择参数错误',duration:1000}) } }, +<<<<<<< HEAD // 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期 +======= + // 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期 +>>>>>>> remotes/origin/pet resetAllAddTime() { this.addTimeStart = Number(new Date()) this.addTimeEnd = Number(new Date()) @@ -218,7 +291,11 @@ export default { const toast = uni.$u.toast // 日期合法判定 if (this.addTimeStartStr > this.addTimeEndStr){ +<<<<<<< HEAD // 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空 +======= + // 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空 +>>>>>>> remotes/origin/pet this.$refs.uToast.show({message:'日期不合法',duration:1000}) return } diff --git a/pages/mine/promise/sign.vue b/pages/mine/promise/sign.vue index a4f6280..93d3bdd 100644 --- a/pages/mine/promise/sign.vue +++ b/pages/mine/promise/sign.vue @@ -13,21 +13,21 @@ 若违反上述承诺和未履行安全生产职责，或发生责任事故的，接受政府或公司事故调查组做出的处罚决定。 - - 承诺期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。 - + + + 若未履行安全生产职责，或发生生产安全事故的，接受公司或政府事故调查组做出的处罚。 - - 责任期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。 - + + + - 承诺单位(盖章)： + 发状人：{{ info.COVERPEOPLE }} - {{ info.CREATTIME.substring(0,10) }} + @@ -38,9 +38,9 @@ width="200upx" height="100px" mode="scaleToFill"> - - {{ info.SIGNTIME }} - + + +