|
@@ -156,7 +156,7 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="检查项目" :prop="'checkHazardDtoList.'+index+'.hazardCheckPro'" :rules="rules.hazardCheckPro" label-width="123px">
|
|
<el-form-item label="检查项目" :prop="'checkHazardDtoList.'+index+'.hazardCheckPro'" :rules="rules.hazardCheckPro" label-width="123px">
|
|
<el-cascader
|
|
<el-cascader
|
|
- @change="(val)=>cascaderChange(val,'',index)"
|
|
|
|
|
|
+ @change="(val)=>cascaderChange(val,'',index,'')"
|
|
v-model="item.hazardCheckPro"
|
|
v-model="item.hazardCheckPro"
|
|
style="width: 898px"
|
|
style="width: 898px"
|
|
placeholder="请选择检查项"
|
|
placeholder="请选择检查项"
|
|
@@ -170,7 +170,7 @@
|
|
<p v-else style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
|
|
<p v-else style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
|
|
</template>
|
|
</template>
|
|
</el-cascader>
|
|
</el-cascader>
|
|
- <p class="hazard-check-count-p" v-if="hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{hazardCheckCount}}</span> 次隐患</p>
|
|
|
|
|
|
+ <p class="hazard-check-count-p" v-if="item.hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{item.hazardCheckCount}}</span> 次隐患</p>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="检查要点" label-width="123px">
|
|
<el-form-item label="检查要点" label-width="123px">
|
|
<el-input
|
|
<el-input
|
|
@@ -264,7 +264,7 @@
|
|
<el-radio :label="0">不符合</el-radio>
|
|
<el-radio :label="0">不符合</el-radio>
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
<el-cascader
|
|
<el-cascader
|
|
- @change="(val)=>cascaderChange(val,item2,index2)"
|
|
|
|
|
|
+ @change="(val)=>cascaderChange(val,item2,index,index2)"
|
|
v-model="item2.hazardCheckPro"
|
|
v-model="item2.hazardCheckPro"
|
|
style="width: 730px"
|
|
style="width: 730px"
|
|
placeholder="请选择检查项"
|
|
placeholder="请选择检查项"
|
|
@@ -279,7 +279,7 @@
|
|
</template>
|
|
</template>
|
|
</el-cascader>
|
|
</el-cascader>
|
|
<i class="el-icon-delete" v-if="planType==1" @click="delCheckHazardDtoList(index,index2,3)" style="color: #0183FA;margin-left: 20px;cursor: pointer;"></i>
|
|
<i class="el-icon-delete" v-if="planType==1" @click="delCheckHazardDtoList(index,index2,3)" style="color: #0183FA;margin-left: 20px;cursor: pointer;"></i>
|
|
- <p class="hazard-check-count-p" v-if="hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{hazardCheckCount}}</span> 次隐患</p>
|
|
|
|
|
|
+ <p class="hazard-check-count-p" v-if="item2.hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{item2.hazardCheckCount}}</span> 次隐患</p>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item v-if="item2.checkFlag==0" label="隐患等级" :prop="'checkHazardInfoVoList.'+index+'.checkHazardDtoList.'+index2+'.hazardLevel'" :rules="rules.hazardLevel" label-width="123px">
|
|
<el-form-item v-if="item2.checkFlag==0" label="隐患等级" :prop="'checkHazardInfoVoList.'+index+'.checkHazardDtoList.'+index2+'.hazardLevel'" :rules="rules.hazardLevel" label-width="123px">
|
|
<el-select v-model="item2.hazardLevel" clearable placeholder="请选择隐患等级" style="width: 408px">
|
|
<el-select v-model="item2.hazardLevel" clearable placeholder="请选择隐患等级" style="width: 408px">
|
|
@@ -1146,7 +1146,7 @@
|
|
}).catch(() => {});
|
|
}).catch(() => {});
|
|
},
|
|
},
|
|
//检查项选中
|
|
//检查项选中
|
|
- cascaderChange(val,item,index){
|
|
|
|
|
|
+ cascaderChange(val,item,index,index2){
|
|
let obj = this.getCascaderDataQuery(val,this.options);
|
|
let obj = this.getCascaderDataQuery(val,this.options);
|
|
|
|
|
|
if(this.addForm.checkCategory==1){//综合检查
|
|
if(this.addForm.checkCategory==1){//综合检查
|
|
@@ -1155,12 +1155,11 @@
|
|
this.msgError('未找到相关项目')
|
|
this.msgError('未找到相关项目')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- console.log(obj)
|
|
|
|
this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
|
|
this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
|
|
this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
|
|
this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
|
|
this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckPoint',obj.mainPoint);
|
|
this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckPoint',obj.mainPoint);
|
|
countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
|
|
countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
|
|
- this.$set(this,'hazardCheckCount',response.data);
|
|
|
|
|
|
+ this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCount',response.data);
|
|
})
|
|
})
|
|
}else if(this.addForm.checkCategory==2){//专项检查
|
|
}else if(this.addForm.checkCategory==2){//专项检查
|
|
if(!obj){
|
|
if(!obj){
|
|
@@ -1168,11 +1167,10 @@
|
|
this.msgError('未找到相关项目')
|
|
this.msgError('未找到相关项目')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- console.log(obj)
|
|
|
|
item.hazardCheckCode=obj.code;
|
|
item.hazardCheckCode=obj.code;
|
|
item.hazardCheckName=obj.name;
|
|
item.hazardCheckName=obj.name;
|
|
countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
|
|
countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
|
|
- this.$set(this,'hazardCheckCount',response.data);
|
|
|
|
|
|
+ this.$set(this.addForm.checkHazardInfoVoList[index].checkHazardDtoList[index2],'hazardCheckCount',response.data);
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|