diff --git a/pages/application/key-project-management/AI-warning/detail.vue b/pages/application/key-project-management/AI-warning/detail.vue index a017e8a..02c58c0 100644 --- a/pages/application/key-project-management/AI-warning/detail.vue +++ b/pages/application/key-project-management/AI-warning/detail.vue @@ -1,1440 +1,1490 @@ diff --git a/pages/application/key-project-management/hidden-management/detail-list.vue b/pages/application/key-project-management/hidden-management/detail-list.vue index 3c71e1e..df1e3f7 100644 --- a/pages/application/key-project-management/hidden-management/detail-list.vue +++ b/pages/application/key-project-management/hidden-management/detail-list.vue @@ -59,7 +59,7 @@ @click="$noMultipleClicks(goToDetail,item.HIDDEN_ID)"> {{(TabCur + 1) == '1' ? '验收' : '查看'}} - + --> diff --git a/pages/application/key-project-management/hidden-management/detail.vue b/pages/application/key-project-management/hidden-management/detail.vue index dd0987c..0e3486c 100644 --- a/pages/application/key-project-management/hidden-management/detail.vue +++ b/pages/application/key-project-management/hidden-management/detail.vue @@ -7,128 +7,176 @@ - - - 隐患照片 - - - - - - - - - - - - 隐患视频 - - - - - - - - - - - 隐患描述 - - - - 隐患部位 - - {{ hiddenForm.HIDDENPART }} - - - - 隐患级别 - - {{ hiddenForm.HIDDENLEVEL_NAME }} - - - - 隐患类型 - - {{ hiddenForm.HIDDENTYPE_NAME }} - - - - 隐患处置： - 限期整改 - - - 整改期限： - {{ hiddenForm.RECTIFICATIONDEADLINE }} - - - - 整改部门： - - - {{ hiddenForm.RECTIFICATIONDEPT_NAME }} - - - - 整改人： - {{ hiddenForm.RECTIFICATIONOR_NAME }} - - - 整改时间： - {{ hiddenForm.RECTIFICATIONTIME }} - - - - 整改照片 - - - - - - - - - - - 验收时间： - - {{hiddenForm.CHECKTIME}} - - - - 验收照片 - - - {{hiddenForm.ysImgs.length}}/4 - - - - - - - - - - - - - - - - - - + + + 隐患照片 + + + + + + + + + + + + 隐患视频 + + + + + + + + + + + 隐患描述 + + + + 隐患部位 + + {{ hiddenForm.HIDDENPART }} + + + + 隐患级别 + + {{ hiddenForm.HIDDENLEVEL_NAME }} + + + + 隐患类型 + + {{ hiddenForm.HIDDENTYPE_NAME }} + + + + 隐患处置： + 限期整改 + + + 整改期限： + {{ hiddenForm.RECTIFICATIONDEADLINE }} + + + + 整改部门： + + + {{ hiddenForm.RECTIFICATIONDEPT_NAME }} + + + + 整改人： + {{ hiddenForm.RECTIFICATIONOR_NAME }} + + + 整改时间： + {{ hiddenForm.RECTIFICATIONTIME }} + + + + 整改照片 + + + + + + + + + + + 验收时间： + + {{hiddenForm.CHECKTIME}} + + + + 验收照片 + + + {{hiddenForm.ysImgs.length}}/4 + + + + + + + + + + + + + + + + + + + + + 处罚信息 + + + + 处罚原因： + {{ punishForm.REASON }} + + + 处罚金额： + {{ punishForm.AMOUT }}元 + + + 被处罚单位： + {{ punishForm.UNITS_NAME }} + + + 被处罚人： + {{ punishForm.PERSON_NAME }} + + + 下发人： + {{ punishForm.CREATOR_NAME }} + + + 下发处罚时间： + {{ punishForm.DATE }} + + + + 罚款缴纳单 + + + + + + + + + + + 是否缴纳罚款： + {{punishForm.HANDLED === '1' ? '已缴' : '未缴' }} + + + 处罚处理人： + {{punishForm.PERSON_NAME}} + + + 处罚处理时间： + {{punishForm.HANLDE_TIME}} + + @@ -175,6 +223,7 @@ export default { ysImgs:[], CHECKTIME :formatDate(new Date(), 'yyyy-MM-dd hh:mm') }, + punishForm:{}, videoSrc:'', modalShow:false, todayDate:formatDate(new Date(), 'yyyy-MM-dd hh:mm'), @@ -207,6 +256,11 @@ export default { uni.hideLoading();//结束加载中动画 if (res.data != null) { this.hiddenForm = res.data.pd + if(res.data.pd.punishForm){ + this.punishForm = res.data.pd.punishForm + }else{ + this.punishForm = null; + } } } }) @@ -293,6 +347,17 @@ export default { } }); }, + fnImagePreview(list, index) { + const urls = []; + for (let i = 0; i < list.length; i++) { + urls.push(list[i].url); + } + const current = urls[index]; + uni.previewImage({ + urls, + current + }) + }, changeRadioGroup(e){ if(this.TabCur == 2) return this.hiddenForm.ISPUNISH = e.detail.value @@ -306,13 +371,13 @@ export default { }) return } - if(this.hiddenForm.ysImgs.length === 0){ - uni.showToast({ - title: `请上传验收图片`, - icon: 'none' - }) - return - } + //if(this.hiddenForm.ysImgs.length === 0){ + // uni.showToast({ + // title: `请上传验收图片`, + // icon: 'none' + // }) + // return + //} // if(!this.hiddenForm.ISPUNISH){ // uni.showToast({ // title: `请选择是否进行罚款`, @@ -384,5 +449,8 @@ export default { diff --git a/pages/application/key-project-management/hidden-management/list.vue b/pages/application/key-project-management/hidden-management/list.vue index f4633f3..99ae103 100644 --- a/pages/application/key-project-management/hidden-management/list.vue +++ b/pages/application/key-project-management/hidden-management/list.vue @@ -24,6 +24,16 @@ @click="$noMultipleClicks(goToDetail,item)" class="dy-list-item p20"> {{item.OUTSOURCED_NAME}} + + + {{item.co}} + + @@ -32,7 +42,7 @@ - 监督部门：{{ item.Q_DEPARTMENT_NAME }} + 监督部门：{{ item.DEPARTMENT_NAME }} @@ -46,7 +56,7 @@ - 相关方单位负责人：{{item.UNITS_PIC}} + 相关方单位负责人：{{item.UNITS_PIC_NAME}} 电话：{{item.UNITS_PHONE}} diff --git a/pages/application/key-project-management/index/index.vue b/pages/application/key-project-management/index/index.vue index cb08df3..6969f80 100644 --- a/pages/application/key-project-management/index/index.vue +++ b/pages/application/key-project-management/index/index.vue @@ -32,7 +32,7 @@ - + {{count.HIDDEN_COUNT}} 处罚管理 diff --git a/pages/application/key-project-management/penalty-management/detail-list.vue b/pages/application/key-project-management/penalty-management/detail-list.vue index 3b10b40..5c5198d 100644 --- a/pages/application/key-project-management/penalty-management/detail-list.vue +++ b/pages/application/key-project-management/penalty-management/detail-list.vue @@ -19,24 +19,31 @@ - {{item.OUTSOURCED_NAME}} + {{item.HIDDENDESCR}} 被处罚单位：{{ item.UNITS_NAME }} - 被处罚人：{{ item.PERSON_NAME }} + 被处罚人：{{ item.PERSON_NAME }} - + 处罚原因：{{ item.REASON }} - + 下发人：{{ item.CREATOR_NAME }} + 是否处罚：{{ item.ISPUNISH == "2" ? "否":"是" }} - 处罚处理状态：{{ (TabCur + 1) == "1" ? "待处理" : "已处理" }} + 处罚处理状态：{{ item.ISPUNISH == "2" ? "不处罚":item.HANDLED == "1" ?"已完成":item.ISPUNISH == "1" ? "待反馈" : "待处罚" }} - + + @@ -52,6 +59,57 @@ + + + + 处罚 + + + + + + + 是否进行罚款： + + + + + + + + 处罚原因 + + + + 处罚金额(元) + + + + 被处罚单位 + + + + 被处罚人 + + + + 下发处罚时间 + + + + + + + + + + + + + + + @@ -84,6 +142,16 @@ export default { TabCur: 0, scrollLeft: 0, tabNav: ['待反馈处罚', '已完成处罚'], + modalShow: false, + punishForm: { + HIDDEN_ID: '', + ISPUNISH: '', + RECTIFICATIONDEPT_NAME: '', + RECTIFICATIONOR_NAME: '', + REASON: '', + AMOUT: '', + DATE: formatDate(new Date(), 'yyyy-MM-dd hh:mm'), + }, } }, onReady() { @@ -119,12 +187,24 @@ export default { this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60; this.getQuery(); }, - //跳转事件 - goToDetail(e) { - uni.navigateTo({ - url: '/pages/application/key-project-management/penalty-management/detail?KEYPROJECTPUNISH_ID='+e + '&OUTSOURCED_ID=' + this.OUTSOURCED_ID + '&TabCur=' + (this.TabCur+1) - }); - }, + //跳转事件 + goToDetail(e) { + uni.navigateTo({ + url: '/pages/application/key-project-management/hidden-management/detail?HIDDEN_ID=' + e + + '&OUTSOURCED_ID=' + this.OUTSOURCED_ID + '&TabCur=2' + }); + }, + fnModalShow(item) { + this.punishForm.HIDDEN_ID = item.HIDDEN_ID + this.punishForm.RECTIFICATIONDEPT_NAME = item.UNITS_NAME + this.punishForm.RECTIFICATIONOR_NAME = item.RECTIFICATIONOR_NAME + this.punishForm.ISPUNISH = '2' + this.modalShow = true + }, + changeStartDate(e) { + this.punishForm.DATE = e + this.$forceUpdate(); //强制刷新 + }, getQuery(){ //搜索按钮事件 var _this = this; _this.showCount = 10; @@ -154,7 +234,7 @@ export default { title:"加载中..." });//加载中动画 uni.request({ - url: basePath +'/app/keyprojectpunish/list?showCount='+_this.showCount+'¤tPage='+_this.currentPage, + url: basePath +'/app/keyprojectcheck/punishlist?showCount='+_this.showCount+'¤tPage='+_this.currentPage, method: 'POST', dataType: 'json', header: { @@ -183,6 +263,91 @@ export default { } }) }, + fnSubmit() { + var _this = this + console.log(this.punishForm) + //如果处罚，添加罚单 + if (this.punishForm.ISPUNISH === "1") { + for (const key in this.punishRules) { + if (!this.punishForm[key]) { + uni.showToast({ + title: this.punishRules[key], + icon: 'none' + }) + return + } + } + uni.request({ + url: basePath + '/app/keyprojectpunish/add', + method: 'POST', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + ...this.punishForm, + CORPINFO_ID: corpinfoId, + CREATOR: loginUserId, + OPERATOR: loginUserId, + }, + success: (res) => { + + if ("success" == res.data.result) { + _this.editHiddenIspunish(1); + _this.punishForm= { + HIDDEN_ID: '', + ISPUNISH: '', + RECTIFICATIONDEPT_NAME: '', + RECTIFICATIONOR_NAME: '', + REASON: '', + AMOUT: '', + DATE: formatDate(new Date(), 'yyyy-MM-dd hh:mm'), + } + } else { + uni.showToast({ + title: res.data.msaesge, + duration: 2000 + }); + } + } + }); + }else { + _this.editHiddenIspunish(2) + } + + }, + editHiddenIspunish(Ispunish){ + // 如果不处罚 修改隐患 + uni.request({ + url: basePath + '/app/keyprojectcheck/editHiddenIspunish', + method: 'POST', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + ...this.punishForm, + ISPUNISH:Ispunish, + PUNISH_PERSON:loginUserId + }, + success: (res) => { + this.modalShow = false + this.getQuery() + } + }); + }, + changeRadioGroup(e){ + if(this.TabCur == 2) return + this.punishForm.ISPUNISH = e.detail.value + }, + checkNumber(e){ + var reg = /^[0-9]+(\.[0-9]{1,2})?$/; + if(!(reg.test(e.detail.value))){ + uni.showToast({ + title: "处罚金额只能输入整数或两位小数", + icon: 'none' + }) + this.punishForm.AMOUT = 0; + } + } } } diff --git a/pages/application/key-project-management/penalty-management/list.vue b/pages/application/key-project-management/penalty-management/list.vue index e6158f3..74903c8 100644 --- a/pages/application/key-project-management/penalty-management/list.vue +++ b/pages/application/key-project-management/penalty-management/list.vue @@ -23,6 +23,16 @@ {{item.OUTSOURCED_NAME}} + + + {{item.cfcount}} + + @@ -31,7 +41,7 @@ - 监督部门：{{ item.Q_DEPARTMENT_NAME }} + 监督部门：{{ item.DEPARTMENT_NAME }} @@ -45,7 +55,7 @@ - 相关方单位负责人：{{item.UNITS_PIC}} + 相关方单位负责人：{{item.UNITS_PIC_NAME}} 电话：{{item.UNITS_PHONE}} @@ -161,7 +171,7 @@ export default { title:"加载中..." });//加载中动画 uni.request({ - url: basePath +'/app/keyProjects/listOutsourced?showCount='+_this.showCount+'¤tPage='+_this.currentPage , + url: basePath +'/app/keyProjects/getPUNISHlist?showCount='+_this.showCount+'¤tPage='+_this.currentPage , method: 'POST', dataType: 'json', header: { @@ -170,7 +180,7 @@ export default { data: { KEYWORDS : _this.NameLikes, //关键字模糊查询 CORPINFO_ID:corpinfoId, - UserId:loginUserId + PUNISHUser:loginUserId }, success: (res) => { uni.hideLoading();//结束加载中动画 diff --git a/pages/application/key-project-management/safety-environmental-inspection/detail.vue b/pages/application/key-project-management/safety-environmental-inspection/detail.vue index 574dc5f..e59584d 100644 --- a/pages/application/key-project-management/safety-environmental-inspection/detail.vue +++ b/pages/application/key-project-management/safety-environmental-inspection/detail.vue @@ -324,15 +324,6 @@ - - @@ -506,7 +497,13 @@ value: 'hiddenLevel1004', label: '轻微隐患' }], // 隐患级别下拉数据 - + PUNISHList: [{ + value: '1', + label: '是' + }, { + value: '2', + label: '否' + }], // 是否罚款下拉 hiddenTypeTreeList: [], // 隐患类型下拉数据 hiddenType2TreeList: [], // 隐患类型2下拉数据 creatorList: [], // 隐患责任人下拉数据 @@ -543,7 +540,7 @@ HIDDENLEVEL_INDEX: '', RECTIFICATIONOR_NAME: '', RECTIFICATIONOR: '', - punishForm: '', + punishForm: '', }, modalShow: false, videoSrc: '', @@ -954,7 +951,6 @@ this.form.inspectorList[index].INSPECTION_USER_ID = this.inspectorList[index][e.detail.value].USER_ID; this.form.inspectorList[index].INSPECTION_USER_NAME = this.inspectorList[index][e.detail.value].NAME; }, - addSituation() { this.form.situationList.push({ INSPECTION_SITUATION_ID: '', @@ -1452,7 +1448,7 @@ } }); }, - + //获取人员列表 getUserList(list, dept, i) { //发送 post 请求 diff --git a/pages/application/key-project-management/safety-environmental-inspection/list.vue b/pages/application/key-project-management/safety-environmental-inspection/list.vue index 7fc5111..4e82f5d 100644 --- a/pages/application/key-project-management/safety-environmental-inspection/list.vue +++ b/pages/application/key-project-management/safety-environmental-inspection/list.vue @@ -31,7 +31,7 @@ - 监督部门：{{ item.Q_DEPARTMENT_NAME }} + 监督部门：{{ item.DEPARTMENT_NAME }} @@ -45,7 +45,7 @@ - 相关方单位负责人：{{item.UNITS_PIC}} + 相关方单位负责人：{{item.UNITS_PIC_NAME}} 电话：{{item.UNITS_PHONE}} @@ -170,7 +170,8 @@ export default { data: { KEYWORDS : _this.NameLikes, //关键字模糊查询 CORPINFO_ID:corpinfoId, - UserId:loginUserId + UserId:loginUserId, + STATE:'1' }, success: (res) => { uni.hideLoading();//结束加载中动画 diff --git a/pages/application/key-project-management/safety-environmental-inspection/punish.vue b/pages/application/key-project-management/safety-environmental-inspection/punish.vue index 5fd5abd..8c2edc9 100644 --- a/pages/application/key-project-management/safety-environmental-inspection/punish.vue +++ b/pages/application/key-project-management/safety-environmental-inspection/punish.vue @@ -1,5 +1,5 @@