消防整改

src/view/bizview/fireRectification/index.js

@@ -275,8 +275,12 @@ class FireRectification extends Component {
   regularUpdateData = () =>{
     let result = true;
     const { warmningFileList,hiddenFileList,updateFrom } = this.state;
-    if (warmningFileList.length === 0 && hiddenFileList.length === 0 && updateFrom.warnningData.length === 0 &&
-        updateFrom.hiddenData.length === 0 &&  updateFrom.dangerData.length === 0 &&  !updateFrom.backResult && !updateFrom.refResult) {
+    console.log(updateFrom.dangerData);
+    if ((warmningFileList === undefined || warmningFileList.length === 0) &&
+        (hiddenFileList === undefined || hiddenFileList.length === 0) &&
+        (updateFrom.dangerData === undefined || updateFrom.dangerData.length === 0) &&
+       !updateFrom.backResult && !updateFrom.refResult) {
+
       result = false;
     }
     return result;
@@ -300,7 +304,7 @@ class FireRectification extends Component {
         }
       });
     }
-    if (updateFrom.hiddenData !== undefined && updateFrom.hiddenData.length !== 0) {
+    if (updateFrom.hiddenData !== undefined && updateFrom.hiddenData.length !== 0 && canSave) {
       updateFrom.hiddenData.map((item,i) =>{
         if (item.doneResult === '1') {
           let a = `fileList${i}`;
@@ -313,7 +317,7 @@ class FireRectification extends Component {
       });
     }
     let ref = this.regularUpdateData();
-    if (!ref) {
+    if (!ref && canSave) {
       AmosAlert.warning('注意', '页面数据未发生变动，无需保存');
       canSave = false;
     }
@@ -657,7 +661,7 @@ class FireRectification extends Component {
                 </Upload>
               </div>}
               {dataStates === '2' && <div onClick={()=>this.downLoad(record.filePath,'告警信息')}>
-                <i className="icon amosicon">&#xe611;</i>
+                <Icon type="download" />
                 <a>下载</a>
               </div>}
             </div>
@@ -805,7 +809,7 @@ class FireRectification extends Component {
             onShowSizeChange={(e,a)=>this.handlerWhenDataChange('pageSize',a)}
           />
         </CommonContainer>}
-        <DetailContent
+        {this.state.detailVisible && <DetailContent
           detailVisible={this.state.detailVisible}
           handleClose={this.handleClose}
           savePack={(e) => this.savePack(e)}
@@ -835,7 +839,7 @@ class FireRectification extends Component {
               DataPack={(e)=>this.DataPack(e)}
             />
           </div>
-        </DetailContent>
+        </DetailContent>}
       </div>
 
     );