diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue index ae35927..7961984 100644 --- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue @@ -794,10 +794,10 @@ export default { checkType: [ { required: true,message: "排查方式必须选择", trigger: 'blur'}], /* isTowns: [ { required: true,message: "是否乡镇(街道必须选择", trigger: 'blur'}],*/ status: [ { required: true,message: "整改进度必须选择", trigger: 'blur'}], - /*rectifyMeasure: [ { type: 'string',required: true,message: "整改措施必填", trigger: 'blur'}], - rectifyTime: [ { type: 'date',required: true,message: "整改时间必填", trigger: 'blur'}], + // rectifyMeasure: [ { type: 'string',required: true,message: "整改措施必填", trigger: 'blur'}], + // rectifyTime: [ { type: 'date',required: true,message: "整改时间必填", trigger: 'blur'}], hiddenDangerGrade: [ { type: 'string',required: true,message: "隐患级别必填", trigger: 'blur'}], - hiddenDangerType: [ { type: 'string',required: true,message: "隐患类型必填", trigger: 'blur'}],*/ + // hiddenDangerType: [ { type: 'string',required: true,message: "隐患类型必填", trigger: 'blur'}], rectifyMoney: [ { pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/, message: "请输入合法的金额数字,最多两位小数", diff --git a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue index 45d22a2..93f34b7 100644 --- a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue @@ -124,21 +124,21 @@ 发布 统计 显示 diff --git a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue index f561095..e66002b 100644 --- a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue +++ b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue @@ -462,7 +462,7 @@ export default { }, `ehsNoticeMessage_${new Date().getTime()}.xlsx`) }, /** 发布 */ - handleDelete(row) { + release(row) { this.$modal.confirm('是否确认发布此通知?').then(function() { return issueNews({"noticeMessageId":row.noticeMessageId}); }).then(() => {