diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue
index 9a0f7e2..27c1221 100644
--- a/src/views/hiddenDanger/files.component.vue
+++ b/src/views/hiddenDanger/files.component.vue
@@ -580,16 +580,16 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
             return row.status == data;
         },render:(data)=>{
             if(data.status===5){
-                return "已整改"
+                return  "<span class='color_1'>已整改</span>"
             }else if(data.status===7){
                 return "已作废"
             }else{
-                return "整改中"
+                return "<span class='color_2'>整改中</span>"
             }
         }});
         this.tableColumn.push({name:'隐患来源',width:"150",render:(data)=>this.$store.getters.prevention_danger_resource_map[data.source]});
         this.tableColumn.push({name:'隐患标题',width:"150",key:"title"});
-        this.tableColumn.push({name:'隐患描述',width:"150",key:"description"});
+        this.tableColumn.push({name:'隐患描述',width:"300",key:"description"});
         this.tableColumn.push({name:'隐患等级',render:(data)=>this.levelMap[data.level]});
         this.tableColumn.push({name:'隐患分类',render:(data)=>this.$store.getters.prevention_dangrous_type_map[data.dangerType]});
         this.tableColumn.push({name:'整改方式',render:(data)=>this.reformModeMap[data.reformMode]});
@@ -616,6 +616,9 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
             this.selectAll()
         }else if(data.value === "delete"){
             this.deleteData(this.selectData.map((item:any)=>item.id))
+        }else if(data.value ==="cancel"){
+            this.handleClose()
+
         }else if(data.value ==="fixed"){
             this.showMap = true
 
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index e6c0e62..91beb86 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -98,7 +98,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
     public map:any = null;
     public showMap = false;
 
-    public statusMap = {0:"草稿",1:"上报",2:"隐患确认",3:"隐患治理",4:"隐患验收",5:"已闭环",6:"流程中断",7:"已作废"};
+    public statusMap = {0:"草稿",1:"隐患上报",2:"隐患确认",3:"隐患治理",4:"隐患验收",5:"已闭环",6:"流程中断",7:"已作废"};
     public tabs = [{
         name:"草稿",
         value:1
@@ -178,7 +178,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         },{
             name:"保存",
             value:"draft",
-            hide:this.updateParams.status>1,
+            hide:this.updateParams.status>0,
             type:"primary"
         },{
             name:"提交",
@@ -641,7 +641,17 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
     }
 
     public buildTable(){
-        this.tableColumn.push({name:'状态',render:(data)=>this.statusMap[data.status]});
+        this.tableColumn.push({name:'状态',render:(data)=>{
+            if(data.status === 5){
+                return  `<span class="color_1">${this.statusMap[data.status]}</span>`
+            }else if (data.status >60){
+                return  `<span class="color_0">${this.statusMap[data.status]}</span>`
+            }else if (data.status === 0 || data.status === 7){
+                return  `<span>${this.statusMap[data.status]}</span>`
+            }else{
+                return  `<span class="color_2">${this.statusMap[data.status]}</span>`
+            }
+        }});
         this.tableColumn.push({name:'当前执行人',width:"100",key:"executor",render:(data)=>data.executor || "--"});
         this.tableColumn.push({name:'最新提交时间',width:"180",key:"updateTime"});
         this.tableColumn.push({name:'隐患来源',width:"150",render:(data)=>this.$store.getters.prevention_danger_resource_map[data.source]});
@@ -652,7 +662,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
                 return data.title
             }
         }});
-        this.tableColumn.push({name:'隐患描述',key:"description"});
+        this.tableColumn.push({name:'隐患描述',key:"description",width:"300"});
         this.tableColumn.push({name:'隐患等级',render:(data)=>this.levelMap[data.level]});
         this.tableColumn.push({name:'隐患分类',render:(data)=>this.$store.getters.prevention_dangrous_type_map[data.dangerType]});
         this.tableColumn.push({name:'整改方式',render:(data)=>this.reformModeMap[data.reformMode]});
@@ -709,6 +719,46 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             this.getTableCallback()
             return
         }
+        if(item && item.key === "reformDeadline"){
+            const now = moment().format("YYYY-MM-DD HH");
+            if(now>data){
+                this.$message.error("整改时限不能早于当前时间")
+                this.updateParams.reformDeadline = null;
+                return
+            }
+        }
+        if(item && item.key === "executeDeadline"){
+            const now = this.updateParams.createTime;
+            if(now>data){
+                this.$message.error("治理时限不能早于创建时间")
+                this.updateParams.executeDeadline = null;
+                return
+            }
+        }
+        if(item && item.key === "realConfirmTime"){
+            const now = this.updateParams.createTime;
+            if(now>data){
+                this.$message.error("确认时间不能早于创建时间")
+                this.updateParams.realConfirmTime = null;
+                return
+            }
+        }
+        if(item && item.key === "realExecuteTime"){
+            const now = this.updateParams.realConfirmTime;
+            if(now>data){
+                this.$message.error("整改时间不能早于确认时间")
+                this.updateParams.realExecuteTime = null;
+                return
+            }
+        }
+        if(item && item.key === "realVerifyTime"){
+            const now = this.updateParams.realExecuteTime;
+            if(now>data){
+                this.$message.error("验证时间不能早于整改时间")
+                this.updateParams.realVerifyTime = null;
+                return
+            }
+        }
         if(item && item.key === "inspectUserId"){
             this.updateParams.inspectUserName = this.$store.getters.user_map[data]
             return
@@ -752,6 +802,9 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         }else if(data.value ==="fixed"){
             this.showMap = true
 
+        }else if(data.value ==="cancel"){
+            this.handleClose()
+
         }else if(data.value ==="draft" || data.value==="submit"){
            this.doSave(data.value==="submit");
 
@@ -769,7 +822,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
 
     public showUpdateModel(row?,isRead?){
         this.isReadonly = !!isRead
-        this.updateParams = {status:0} as any;
+        this.updateParams = {status:0,source:9} as any;
         if(!row){
             this.tableService.getNumber().then(res=>{
                 this.updateParams.number = res.data
@@ -880,7 +933,9 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         }
         let userIds = [] as any;
         if(!preStatus || preStatus===1){
-            this.updateParams.status = 2;
+            if(isSubmit){
+                this.updateParams.status = 2;
+            }
             userIds = [this.updateParams.reformUserId]
         }else if(preStatus===2){
             // 确认下一步  退回上一步