From 7026a748d8da85b8ee401970d00fc3b2b49355c2 Mon Sep 17 00:00:00 2001 From: limingyu Date: Sat, 30 Mar 2024 11:17:19 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=89=BF=E8=AF=BA?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=91=E5=87=BA=E6=89=BF=E8=AF=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/promise/promise.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/mine/promise/promise.vue b/pages/mine/promise/promise.vue index f1c6de4..72b6e76 100644 --- a/pages/mine/promise/promise.vue +++ b/pages/mine/promise/promise.vue @@ -33,7 +33,8 @@ export default { data() { return { tabsList: [ - {name: '我的承诺', id: '1'}, + // {name: '我的承诺', id: '1'}, + {name: '发出承诺', id: '1'}, {name: '接收承诺', id: '2'} ], TYPE: '1', From 249e8fecac2bf42725b2764093fb1c827f3ada96 Mon Sep 17 00:00:00 2001 From: limingyu Date: Sat, 30 Mar 2024 17:46:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8F=91=E5=87=BA=E6=89=BF=E8=AF=BA?= =?UTF-8?q?=E6=BB=91=E8=BD=AE=E5=88=92=E4=B8=8D=E5=8A=A8bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/promise/promise.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/mine/promise/promise.vue b/pages/mine/promise/promise.vue index 72b6e76..256a20b 100644 --- a/pages/mine/promise/promise.vue +++ b/pages/mine/promise/promise.vue @@ -60,6 +60,7 @@ export default { currentPage: this.currentPage, }) this.list = [...this.list, ...resData.varList] + this.totalPage = resData.page.totalPage }, async fnGetReceivePromiseList() { let resData = await getReceivePromiseList({ From 89d87af98c842c4ebc6028415b5db0a41cba1d83 Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 1 Apr 2024 19:20:43 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8F=91=E5=87=BA=E6=89=BF=E8=AF=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=BF=E8=AF=BA=E4=B9=A6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E7=AD=BE=E5=AD=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/promise/detail.vue | 9 ++++++++- pages/mine/promise/promise.vue | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pages/mine/promise/detail.vue b/pages/mine/promise/detail.vue index 167d691..d4b4011 100644 --- a/pages/mine/promise/detail.vue +++ b/pages/mine/promise/detail.vue @@ -29,7 +29,7 @@ 发状人：{{ info.COVERPEOPLE }} {{ info.CREATTIME.substring(0,10) }} - + {{ info.TYPE === '0' ? '主要负责人签字' : '受状人' }}： @@ -41,6 +41,13 @@ {{ 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 256a20b..f77e776 100644 --- a/pages/mine/promise/promise.vue +++ b/pages/mine/promise/promise.vue @@ -14,6 +14,8 @@ 被承诺人：{{ item.coverpeople }} 承诺人：{{ item.NAME }} + 已签字 + 未签字 {{ item.SIGNTIME }} {{ item.ISREAD == '0' ? '待阅' : '已阅' }} From 512b4854cd4155b7193779cb9c93e46218a5b8b0 Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 9 Apr 2024 11:05:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=89=BF=E8=AF=BA=E4=B9=A6=E7=AD=BE?= =?UTF-8?q?=E5=AD=97=E6=97=B6=E9=97=B4=E7=A7=BB=E9=99=A4=EF=BC=8C=E6=89=BF?= =?UTF-8?q?=E8=AF=BA=E6=9C=9F=E9=99=90=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/promise/detail.vue | 22 +++++++++++----------- pages/mine/promise/sign.vue | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pages/mine/promise/detail.vue b/pages/mine/promise/detail.vue index d4b4011..4c75ae1 100644 --- a/pages/mine/promise/detail.vue +++ b/pages/mine/promise/detail.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) }} + @@ -37,9 +37,9 @@ - - {{ info.SIGNTIME && info.SIGNTIME.substring(0,10) }} - + + + 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 }} - + + + From 1428717691ac502a5ab30343cb7dff749c2588a4 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Tue, 9 Apr 2024 11:42:41 +0800 Subject: [PATCH 5/8] =?UTF-8?q?1.=E5=8E=BB=E9=99=A4=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=89=BF=E8=AF=BA=E4=B9=A6=E7=AD=BE=E5=AD=97=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/promise/detail.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pages/mine/promise/detail.vue b/pages/mine/promise/detail.vue index d4b4011..5b20093 100644 --- a/pages/mine/promise/detail.vue +++ b/pages/mine/promise/detail.vue @@ -19,15 +19,15 @@ 若未履行安全生产职责，或发生生产安全事故的，接受公司或政府事故调查组做出的处罚。 - - 责任期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。 - + + + - 承诺单位(盖章)： + 发状人：{{ info.COVERPEOPLE }} - {{ info.CREATTIME.substring(0,10) }} + @@ -37,9 +37,9 @@ - - {{ info.SIGNTIME && info.SIGNTIME.substring(0,10) }} - + + + From 9e7e52122089d7ec60d63f87abcdc9b4e94e5e30 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Fri, 12 Apr 2024 15:34:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?1.=E5=AE=89=E5=85=A8=E6=89=BF=E8=AF=BA?= =?UTF-8?q?=E4=B9=A6=E4=B8=9A=E5=8A=A1=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/index.js | 6 +++--- pages/mine/promise/promise.vue | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) 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/mine/promise/promise.vue b/pages/mine/promise/promise.vue index f77e776..5a6ce59 100644 --- a/pages/mine/promise/promise.vue +++ b/pages/mine/promise/promise.vue @@ -12,10 +12,17 @@ - 被承诺人：{{ item.coverpeople }} - 承诺人：{{ item.NAME }} + + + 已签字 - 未签字 + 未签字 {{ item.SIGNTIME }} {{ item.ISREAD == '0' ? '待阅' : '已阅' }} From d2b5dddac15c81e10bc269bf0661a6b20af6372a Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 24 Apr 2024 13:43:57 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=89=BF=E8=AF=BA=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/promise/promise.vue | 157 ++++++++++++++++++++++++++++++++- 1 file changed, 156 insertions(+), 1 deletion(-) diff --git a/pages/mine/promise/promise.vue b/pages/mine/promise/promise.vue index 5a6ce59..ebfa7cc 100644 --- a/pages/mine/promise/promise.vue +++ b/pages/mine/promise/promise.vue @@ -6,6 +6,54 @@ itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;" @click="tabsClick" > + + + + + + + + + 起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }} + + 结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }} + + + + + + + + 重置 + + + + + 搜索 + + + + + + + + + + @@ -51,6 +99,13 @@ export default { currentPage: 1, totalPage: 0, list: [], + popupShow: false, // 高级搜索弹窗 + addStartPickBarShow: false, // 起始日期选择器 + addEndPickBarShow: false, // 结束日期选择器 + addTimeStart: Number(new Date()), // 承诺书添加时间-起始 + addTimeEnd: Number(new Date()), // 承诺书添加时间-结束 + addTimeStartStr: '', // 承诺书添加时间-起始-字符串 + addTimeEndStr: '', // 承诺书添加时间-结束-字符串 } }, computed: { @@ -67,6 +122,8 @@ export default { USER_ID: this.userInfo.USER_ID, showCount: this.pageSize, currentPage: this.currentPage, + ADDSTART: this.addTimeStartStr, + ADDEND: this.addTimeEndStr }) this.list = [...this.list, ...resData.varList] this.totalPage = resData.page.totalPage @@ -76,6 +133,8 @@ export default { USER_ID: this.userInfo.USER_ID, showCount: this.pageSize, currentPage: this.currentPage, + ADDSTART: this.addTimeStartStr, + ADDEND: this.addTimeEndStr }) this.list = [...this.list, ...resData.varList] }, @@ -95,6 +154,7 @@ export default { }, tabsClick(e) { this.TYPE = e.id + this.resetAllAddTime() this.resetList() }, fnNavigator(item) { @@ -106,7 +166,82 @@ export default { TYPE: this.TYPE } }) - } + }, + // 高级搜索弹窗弹出函数 + popupOpen() { + this.popupShow = true + + }, + // 高级搜索弹窗关闭函数 + popupClose() { + this.popupShow = false + + }, + // 高级搜索日期选择器关闭回调 + addPickBarOnClose(type) { + switch (type) { + case 'start': + this.addStartPickBarShow = false; + break; + case 'end': + this.addEndPickBarShow = false; + break; + default: + this.$refs.uToast.show({message:'日期选择参数错误',duration:1000}) + } + }, + // 高级搜索日期选择器取消回调 + addPickBarOnCancel(type) { + this.addPickBarOnClose(type) + }, + // 高级搜索日期选择器确认回调 + addPickBarOnConfirm(value) { + // alert(value.value) + switch (this.addStartPickBarShow) { + case true: + // start type + this.addTimeStartStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd') + this.addPickBarOnClose('start') + break; + case false: + // end type + this.addTimeEndStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd') + this.addPickBarOnClose('end') + break; + default: + this.$refs.uToast.show({message:'日期选择参数错误',duration:1000}) + } + }, + // 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期 + resetAllAddTime() { + this.addTimeStart = Number(new Date()) + this.addTimeEnd = Number(new Date()) + this.addTimeStartStr = '' + this.addTimeEndStr = '' + }, + // 重置高级搜索条件 + resetAdvancedParam() { + this.resetAllAddTime() + this.resetList() + }, + // 高级搜索 + advancedSearch(){ + const toast = uni.$u.toast + // 日期合法判定 + if (this.addTimeStartStr > this.addTimeEndStr){ + // 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空 + this.$refs.uToast.show({message:'日期不合法',duration:1000}) + return + } + if (this.addTimeEndStr != '' && this.addTimeStartStr == ''){ + // 结束时间有值，开始时间为空 + this.$refs.uToast.show({message:'日期不合法',duration:1000}) + return + } + this.resetList() + this.popupClose() + } + } } @@ -116,4 +251,24 @@ export default { background-color: #f7f9ff; height: 100vh; } +.wrap { + padding: 12px; +} + +.demo-layout { + height: 25px; + border-radius: 4px; +} + +.bg-purple { + background: #CED7E1; +} + +.bg-purple-light { + background: #e5e9f2; +} + +.bg-purple-dark { + background: #99a9bf; +} From 848987aad3a1bbc02f29855be3fbc9b34f871371 Mon Sep 17 00:00:00 2001 From: water_xu Date: Sun, 28 Apr 2024 18:31:09 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=9A=90=E6=82=A3=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safety-environmental-inspection/detail-list.vue | 6 +++++- .../safety-environmental-inspection/detail.vue | 13 +++++++++++++ .../safety-environmental-inspection/list.vue | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) 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 } }) },