Commit cb8a5f51 authored by 耿迪迪's avatar 耿迪迪

隐患信息 gengdidi

parent f1fe418e
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row,scope.$index)" @click="viewDetail(scope.row,scope.$index)"
v-if="isView" v-if="isView"
>详情</el-button> >详情</el-button>
<el-button <el-button
...@@ -236,6 +236,19 @@ export default { ...@@ -236,6 +236,19 @@ export default {
this.title = "新增隐患信息" this.title = "新增隐患信息"
this.hiddenOpen = true; this.hiddenOpen = true;
}, },
/** 详情按钮操作 */
viewDetail(row,index) {
this.reset();
this.index = index;
this.hiddenForm = {...row};
this.title = "查看隐患信息"
this.hiddenOpen = true;
if (this.hiddenForm.pictureUrl) {
this.fileList.push({
url: this.hiddenForm.pictureUrl,
});
}
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row,index) { handleUpdate(row,index) {
this.reset(); this.reset();
......
...@@ -271,10 +271,6 @@ ...@@ -271,10 +271,6 @@
<el-form-item label="反馈信息" prop="rectificationResult" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3')"> <el-form-item label="反馈信息" prop="rectificationResult" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3')">
<el-input v-model="form.rectificationResult" type="textarea" placeholder="请输入整改结果" :disabled="isDetail"/> <el-input v-model="form.rectificationResult" type="textarea" placeholder="请输入整改结果" :disabled="isDetail"/>
</el-form-item> </el-form-item>
<el-form-item label="隐患信息" prop="rectificationResult" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3')">
<HiddenTrouble
:hiddenList="hiddenInfoList"/>
</el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="责任单位" prop="responsibleUnit"> <el-form-item label="责任单位" prop="responsibleUnit">
...@@ -296,7 +292,23 @@ ...@@ -296,7 +292,23 @@
placeholder="选择截止日期" style="width: 350px" :disabled="isDetail"> placeholder="选择截止日期" style="width: 350px" :disabled="isDetail">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!--<el-form-item label="隐患信息" prop="hiddenInfo" v-show="hiddenInfoList.length > 0" class="hiddenInfo">
<el-row>
<el-col :span="2">
<span>隐患信息</span>
</el-col>
<el-col :span="22">
<HiddenTrouble
:hiddenList="hiddenInfoList"/>
</el-col>
</el-row>
</el-form-item>-->
</el-form> </el-form>
<div>
<div style="font-weight: 700;font-size: 18px;margin-left: 12px;margin-bottom: 9px;">隐患信息</div>
<HiddenTrouble
:hiddenList="hiddenInfoList"/>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" v-show="!isDetail"> </el-button> <el-button type="primary" @click="submitForm" v-show="!isDetail"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
...@@ -642,6 +654,7 @@ export default { ...@@ -642,6 +654,7 @@ export default {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改燃气任务"; this.title = "修改燃气任务";
this.getHiddenInfos({workId : workId});
this.getEnterpriseLists(); this.getEnterpriseLists();
this.getInspectionUserList(response.data.workAssignEnterproseId); this.getInspectionUserList(response.data.workAssignEnterproseId);
}); });
...@@ -777,11 +790,13 @@ export default { ...@@ -777,11 +790,13 @@ export default {
this.open = true; this.open = true;
this.title = "燃气任务详情"; this.title = "燃气任务详情";
this.form = response.data; this.form = response.data;
if(this.form.workStatus == '2' || this.form.workStatus == '3'){ /*if(this.form.workStatus == '2' || this.form.workStatus == '3'){
const param = {}; const param = {};
param.workId = this.form.workId; param.workId = this.form.workId;
this.getHiddenInfos(param);
} }*/
//查询隐患信息
this.getHiddenInfos({workId : this.form.workId});
this.getEnterpriseLists(); this.getEnterpriseLists();
this.getInspectionUserList(response.data.workAssignEnterproseId); this.getInspectionUserList(response.data.workAssignEnterproseId);
}); });
...@@ -923,3 +938,8 @@ export default { ...@@ -923,3 +938,8 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.hiddenInfo .el-form-item__label{
font-size: 30px !important;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment