1.隐患级别必填

2.消息通知图标优化
3.消息通知删除bug修复
main
15036302109 8 months ago
parent 72e4dcf19a
commit 782517f27b

@ -794,10 +794,10 @@ export default {
checkType: [ { required: true,message: "排查方式必须选择", trigger: 'blur'}], checkType: [ { required: true,message: "排查方式必须选择", trigger: 'blur'}],
/* isTowns: [ { required: true,message: "是否乡镇(街道必须选择", trigger: 'blur'}],*/ /* isTowns: [ { required: true,message: "是否乡镇(街道必须选择", trigger: 'blur'}],*/
status: [ { required: true,message: "整改进度必须选择", trigger: 'blur'}], status: [ { required: true,message: "整改进度必须选择", trigger: 'blur'}],
/*rectifyMeasure: [ { type: 'string',required: true,message: "", trigger: 'blur'}], // rectifyMeasure: [ { type: 'string',required: true,message: "", trigger: 'blur'}],
rectifyTime: [ { type: 'date',required: true,message: "整改时间必填", trigger: 'blur'}], // rectifyTime: [ { type: 'date',required: true,message: "", trigger: 'blur'}],
hiddenDangerGrade: [ { type: 'string',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: [ { rectifyMoney: [ {
pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/, pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
message: "请输入合法的金额数字,最多两位小数", message: "请输入合法的金额数字,最多两位小数",

@ -124,21 +124,21 @@
<el-button v-show="scope.row.status==0" <el-button v-show="scope.row.status==0"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-s-tools"
@click="handleIssueNews(scope.row)" @click="handleIssueNews(scope.row)"
v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:issueNews']" v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:issueNews']"
>发布</el-button> >发布</el-button>
<el-button v-show="scope.row.status==1" <el-button v-show="scope.row.status==1"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-s-data"
@click="handleListFile(scope.row)" @click="handleListFile(scope.row)"
v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:total']" v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:total']"
>统计</el-button> >统计</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-tickets"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"
v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:displayDetail']" v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:displayDetail']"
>显示</el-button> >显示</el-button>

@ -462,7 +462,7 @@ export default {
}, `ehsNoticeMessage_${new Date().getTime()}.xlsx`) }, `ehsNoticeMessage_${new Date().getTime()}.xlsx`)
}, },
/** 发布 */ /** 发布 */
handleDelete(row) { release(row) {
this.$modal.confirm('是否确认发布此通知?').then(function() { this.$modal.confirm('是否确认发布此通知?').then(function() {
return issueNews({"noticeMessageId":row.noticeMessageId}); return issueNews({"noticeMessageId":row.noticeMessageId});
}).then(() => { }).then(() => {

Loading…
Cancel
Save