|
@@ -411,7 +411,11 @@
|
|
|
this.$set(this.addForm, 'hazardCheckPro', this.projectData.hazardCheckPro)
|
|
|
this.$set(this, 'delSetOptionId', this.projectData.setOptionId)
|
|
|
this.securityCheckDangerGetDangerId();
|
|
|
- this.$set(this,'freeChoiceType',true);
|
|
|
+ if(this.initiateData.orderType == 3 || this.initiateData.orderType == 5){
|
|
|
+ this.$set(this,'freeChoiceType',false);
|
|
|
+ }else{
|
|
|
+ this.$set(this,'freeChoiceType',true);
|
|
|
+ }
|
|
|
if(this.projectData.checkSetProgress < 100){
|
|
|
this.$set(this.addForm, 'uploadDtoList', response.data.photoList?response.data.photoList:[])
|
|
|
this.$set(this.addForm, 'checkFlag', response.data.checkFlag?response.data.checkFlag:0)
|
|
@@ -434,11 +438,17 @@
|
|
|
if (this.initiateData.showType) {
|
|
|
this.securityCheckOptionSelAllList();
|
|
|
} else {
|
|
|
- if(this.projectData.checkStatus != 0){
|
|
|
- this.securityCheckOptionSelAllList();
|
|
|
- }else{
|
|
|
+
|
|
|
+ if(this.initiateData.orderType == 1){
|
|
|
this.securityCheckSetOptionUnCheckList();
|
|
|
+ }else{
|
|
|
+ this.securityCheckOptionSelAllList();
|
|
|
}
|
|
|
+ // if(this.projectData.checkStatus != 0){
|
|
|
+ // this.securityCheckOptionSelAllList();
|
|
|
+ // }else{
|
|
|
+ // this.securityCheckSetOptionUnCheckList();
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
})
|