[新增流程](hyx_2024-9-11)
- 新增企业端安全环保检查新增后三端同步 - 隐患整改上传图片到服务器改为新上传流程hyx_2024-9-11_changeUpload
parent
6304bcfceb
commit
248ae576a1
|
|
@ -33,28 +33,47 @@
|
||||||
<el-form-item :rules="form.IS_NORMAL =='1' ?formRule.RECTIFICATIONTIME:[{required: false}]" label="整改时间" prop="RECTIFICATIONTIME">
|
<el-form-item :rules="form.IS_NORMAL =='1' ?formRule.RECTIFICATIONTIME:[{required: false}]" label="整改时间" prop="RECTIFICATIONTIME">
|
||||||
<el-date-picker v-model="form.RECTIFICATIONTIME" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
|
<el-date-picker v-model="form.RECTIFICATIONTIME" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!-- <el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">-->
|
||||||
|
<!-- <el-upload-->
|
||||||
|
<!-- ref="zhenggaiupload"-->
|
||||||
|
<!-- :class="{hide:hideUpload}"-->
|
||||||
|
<!-- :file-list="rectify_files"-->
|
||||||
|
<!-- :on-remove="handleRemove"-->
|
||||||
|
<!-- :on-change="handleChangeIMG"-->
|
||||||
|
<!-- :limit="4"-->
|
||||||
|
<!-- :on-preview="handlePictureCardPreview"-->
|
||||||
|
<!-- :before-upload="beforeFileUpload"-->
|
||||||
|
<!-- :auto-upload="false"-->
|
||||||
|
<!-- class="avatar-uploader"-->
|
||||||
|
<!-- action="#"-->
|
||||||
|
<!-- accept=".jpg,.jpeg,.png"-->
|
||||||
|
<!-- list-type="picture-card">-->
|
||||||
|
<!-- <i class="el-icon-plus" />-->
|
||||||
|
<!-- </el-upload>-->
|
||||||
|
<!-- <el-dialog :visible.sync="dialogImageVisible">-->
|
||||||
|
<!-- <img :src="dialogImageUrl" width="100%" alt="">-->
|
||||||
|
<!-- </el-dialog>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
<el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">
|
<el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">
|
||||||
<el-upload
|
<div class="parentBox">
|
||||||
ref="zhenggaiupload"
|
<el-upload
|
||||||
:class="{hide:hideUpload}"
|
:class="{hideShow: hideUpload}"
|
||||||
:file-list="rectify_files"
|
:multiple="true"
|
||||||
:on-remove="handleRemove"
|
:on-exceed="onExceed"
|
||||||
:on-change="handleChangeIMG"
|
:on-remove="handleRemove"
|
||||||
:limit="4"
|
:limit="limit"
|
||||||
:on-preview="handlePictureCardPreview"
|
:before-upload="beforeUpload"
|
||||||
:before-upload="beforeFileUpload"
|
:http-request="uploadFiles"
|
||||||
:auto-upload="false"
|
:on-preview="handlePictureCardPreview"
|
||||||
class="avatar-uploader"
|
action=""
|
||||||
action="#"
|
list-type="picture-card">
|
||||||
accept=".jpg,.jpeg,.png"
|
<i class="el-icon-plus"/>
|
||||||
list-type="picture-card">
|
</el-upload>
|
||||||
<i class="el-icon-plus" />
|
<el-dialog :visible.sync="dialogVisible">
|
||||||
</el-upload>
|
<img :src="imgUrl" width="100%">
|
||||||
<el-dialog :visible.sync="dialogImageVisible">
|
</el-dialog>
|
||||||
<img :src="dialogImageUrl" width="100%" alt="">
|
</div>
|
||||||
</el-dialog>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
|
|
||||||
<div v-if="pd.ISCONFIRM=='0'">
|
<div v-if="pd.ISCONFIRM=='0'">
|
||||||
<div class="form-flex">
|
<div class="form-flex">
|
||||||
<div class="form-item">
|
<div class="form-item">
|
||||||
|
|
@ -196,12 +215,13 @@ export default {
|
||||||
INVESTMENT_FUNDS: '', // 投入资金
|
INVESTMENT_FUNDS: '', // 投入资金
|
||||||
RECTIFICATIONTIME: ''// 整改时间
|
RECTIFICATIONTIME: ''// 整改时间
|
||||||
},
|
},
|
||||||
|
imgUrl: '',
|
||||||
rectify_files: [],
|
rectify_files: [],
|
||||||
hideUpload: false, // 整改照片
|
hideUpload: false, // 整改照片
|
||||||
dialogImageVisible: false, // 放大照片的显示和隐藏
|
dialogImageVisible: false, // 放大照片的显示和隐藏
|
||||||
dialogImageUrl: '', // 照片的地址
|
dialogImageUrl: '', // 照片的地址
|
||||||
scheme_files: [], // 整改方案图片
|
scheme_files: [], // 整改方案图片
|
||||||
temporaryFilePath: '',
|
temporaryFilePath: [],
|
||||||
formRule: {
|
formRule: {
|
||||||
RECTIFICATIONDEPT: [{ required: true, message: '请选择整改部门', trigger: 'blur' }],
|
RECTIFICATIONDEPT: [{ required: true, message: '请选择整改部门', trigger: 'blur' }],
|
||||||
RECTIFICATIONOR: [{ required: true, message: '请选择整改人', trigger: 'blur' }],
|
RECTIFICATIONOR: [{ required: true, message: '请选择整改人', trigger: 'blur' }],
|
||||||
|
|
@ -255,6 +275,53 @@ export default {
|
||||||
this.getEditMyInfo()
|
this.getEditMyInfo()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
uploadFiles(file) {
|
||||||
|
// 调用文件大小校验方法
|
||||||
|
if (this.beforeUpload(file.file)) {
|
||||||
|
this.formData = new FormData()
|
||||||
|
this.formData.append('FFILE', file.file)
|
||||||
|
// 请求接口
|
||||||
|
upload(
|
||||||
|
'/mfolder/upLoadTemporary',
|
||||||
|
this.formData
|
||||||
|
).then((data) => {
|
||||||
|
if (data.result == 'success') {
|
||||||
|
this.$message({
|
||||||
|
message: '保存成功',
|
||||||
|
type: 'success'
|
||||||
|
})
|
||||||
|
this.loading = false
|
||||||
|
this.temporaryFilePath.push(data.temporaryFilePath)
|
||||||
|
console.info('this.temporaryFilePath========' + this.temporaryFilePath)
|
||||||
|
} else {
|
||||||
|
this.$message({
|
||||||
|
message: data.exception,
|
||||||
|
type: 'error'
|
||||||
|
})
|
||||||
|
this.loading = false
|
||||||
|
}
|
||||||
|
}).catch((e) => {
|
||||||
|
this.listLoading = false
|
||||||
|
this.loading = false
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 文件大小校验
|
||||||
|
beforeUpload(file) {
|
||||||
|
if (file.size > 10 * 1024 * 1024) {
|
||||||
|
this.$message('文件过大，请上传小于10MB的文件〜')
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
// 删除图片
|
||||||
|
imageRemove() {
|
||||||
|
this.imgUrl = ''
|
||||||
|
this.$message({
|
||||||
|
message: '删除图片成功',
|
||||||
|
type: 'success'
|
||||||
|
})
|
||||||
|
},
|
||||||
getEditMyInfo: function() {
|
getEditMyInfo: function() {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/user/goEditMyInfo',
|
'/user/goEditMyInfo',
|
||||||
|
|
@ -417,7 +484,8 @@ export default {
|
||||||
},
|
},
|
||||||
saveRectify() { // 正常整改
|
saveRectify() { // 正常整改
|
||||||
this.loading = true
|
this.loading = true
|
||||||
if (this.$refs.zhenggaiupload.uploadFiles.length < 1) {
|
// if (this.$refs.zhenggaiupload.uploadFiles.length < 1) {
|
||||||
|
if (this.temporaryFilePath.length < 1) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: '请上传整改后照片',
|
message: '请上传整改后照片',
|
||||||
type: 'error'
|
type: 'error'
|
||||||
|
|
@ -544,16 +612,24 @@ export default {
|
||||||
text: '加载中......',
|
text: '加载中......',
|
||||||
background: 'rgba(0,0,0,0.5)'
|
background: 'rgba(0,0,0,0.5)'
|
||||||
})
|
})
|
||||||
this.$refs.zhenggaiupload.submit()
|
// this.$refs.zhenggaiupload.submit()
|
||||||
var todata = new FormData()
|
var todata = new FormData()
|
||||||
for (var i = 0; i < _this.rectify_files.length; i++) {
|
for (var i = 0; i < _this.temporaryFilePath.length; i++) {
|
||||||
if (_this.rectify_files[i]) {
|
if (_this.temporaryFilePath[i]) {
|
||||||
todata.append('FFILE', _this.rectify_files[i])
|
todata.append('temporaryFilePath', _this.temporaryFilePath[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!todata.get('FFILE')) {
|
if (!todata.get('temporaryFilePath')) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// for (var i = 0; i < _this.rectify_files.length; i++) {
|
||||||
|
// if (_this.rectify_files[i]) {
|
||||||
|
// todata.append('FFILE', _this.rectify_files[i])
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// if (!todata.get('FFILE')) {f
|
||||||
|
// return
|
||||||
|
// }
|
||||||
todata.append('FOREIGN_KEY', this.HIDDEN_ID)
|
todata.append('FOREIGN_KEY', this.HIDDEN_ID)
|
||||||
todata.append('TYPE', 4)
|
todata.append('TYPE', 4)
|
||||||
upload(
|
upload(
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,7 @@ export default {
|
||||||
getData() {
|
getData() {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/goShow',
|
'/safetyenvironmental/V2/goShow',
|
||||||
{
|
{
|
||||||
INSPECTION_ID: this.$parent.INSPECTION_ID
|
INSPECTION_ID: this.$parent.INSPECTION_ID
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,16 +13,16 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<!-- <el-row :gutter="20">-->
|
<el-row :gutter="20">
|
||||||
<!-- <el-col :span="12">-->
|
<el-col :span="12">
|
||||||
<!-- <el-form-item label="是否为相关方" prop="IS_XGF">-->
|
<el-form-item label="是否为相关方" prop="IS_XGF">
|
||||||
<!-- <el-radio-group id="IS_XGF" ref="IS_XGF" v-model="form.IS_XGF" @change="getXgfTreeData">-->
|
<el-radio-group id="IS_XGF" ref="IS_XGF" v-model="form.IS_XGF" @change="getXgfTreeData">
|
||||||
<!-- <el-radio :label="'1'" >是</el-radio>-->
|
<el-radio :label="'1'">是</el-radio>
|
||||||
<!-- <el-radio :label="'0'" >否</el-radio>-->
|
<el-radio :label="'0'">否</el-radio>
|
||||||
<!-- </el-radio-group>-->
|
</el-radio-group>
|
||||||
<!-- </el-form-item>-->
|
</el-form-item>
|
||||||
<!-- </el-col>-->
|
</el-col>
|
||||||
<!-- </el-row>-->
|
</el-row>
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="被检查单位" prop="INSPECTED_DEPARTMENT_ID">
|
<el-form-item label="被检查单位" prop="INSPECTED_DEPARTMENT_ID">
|
||||||
|
|
@ -33,26 +33,46 @@
|
||||||
:props="defaultProps"
|
:props="defaultProps"
|
||||||
v-model="form.INSPECTED_DEPARTMENT_ID"
|
v-model="form.INSPECTED_DEPARTMENT_ID"
|
||||||
placeholder="请选择被检查单位"
|
placeholder="请选择被检查单位"
|
||||||
style="width: 300px" />
|
style="width: 300px"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="被检查单位现场负责人" prop="INSPECTED_SITEUSER_ID">
|
<el-form-item label="被检查单位现场负责人" prop="INSPECTED_SITEUSER_ID">
|
||||||
<el-select v-model="form.INSPECTED_SITEUSER_ID" clearable placeholder="请选择被检查单位现场负责人">
|
<el-select v-model="form.INSPECTED_SITEUSER_ID" clearable placeholder="请选择被检查单位现场负责人">
|
||||||
<el-option v-for="item in INSPECTED_SITEUSER_List" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
|
<el-option
|
||||||
|
v-for="item in INSPECTED_SITEUSER_List"
|
||||||
|
:key="item.USER_ID"
|
||||||
|
:label="item.NAME"
|
||||||
|
:value="item.USER_ID"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item label="检查场所" prop="INSPECTION_PLACE">
|
<el-form-item label="检查场所" prop="INSPECTION_PLACE">
|
||||||
<el-input id="INSPECTION_PLACE" ref="INSPECTION_PLACE" v-model="form.INSPECTION_PLACE" maxlength="255" placeholder="这里输入检查场所..." title="检查场所"/>
|
<el-input
|
||||||
|
id="INSPECTION_PLACE"
|
||||||
|
ref="INSPECTION_PLACE"
|
||||||
|
v-model="form.INSPECTION_PLACE"
|
||||||
|
maxlength="255"
|
||||||
|
placeholder="这里输入检查场所..."
|
||||||
|
title="检查场所"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="检查人确认" prop="Confirm">
|
<el-form-item label="检查人确认" prop="Confirm">
|
||||||
<el-input id="Confirm" ref="openConfirm" v-model="form.CONFIRM_MESSAGE" maxlength="255" readonly placeholder="点击签字" title="检查人确认" @click.native="openConfirm"/>
|
<el-input
|
||||||
|
id="Confirm"
|
||||||
|
ref="openConfirm"
|
||||||
|
v-model="form.CONFIRM_MESSAGE"
|
||||||
|
maxlength="255"
|
||||||
|
readonly
|
||||||
|
placeholder="点击签字"
|
||||||
|
title="检查人确认"
|
||||||
|
@click.native="openConfirm"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item :prop="switchInspectionType === 'select'?'INSPECTION_TYPE':'INSPECTION_TYPE_OTHER'" label="检查类型">
|
<el-form-item
|
||||||
|
:prop="switchInspectionType === 'select'?'INSPECTION_TYPE':'INSPECTION_TYPE_OTHER'"
|
||||||
|
label="检查类型">
|
||||||
<SelectTree
|
<SelectTree
|
||||||
v-if="switchInspectionType === 'select'"
|
v-if="switchInspectionType === 'select'"
|
||||||
ref="tree_InspectionType"
|
ref="tree_InspectionType"
|
||||||
|
|
@ -62,22 +82,37 @@
|
||||||
v-model="form.INSPECTION_TYPE"
|
v-model="form.INSPECTION_TYPE"
|
||||||
:canparent="false"
|
:canparent="false"
|
||||||
placeholder="这里选择检查类型..."
|
placeholder="这里选择检查类型..."
|
||||||
children-name="nodes" />
|
children-name="nodes"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="检查开始时间" prop="INSPECTION_TIME_START">
|
<el-form-item label="检查开始时间" prop="INSPECTION_TIME_START">
|
||||||
<el-date-picker v-model="form.INSPECTION_TIME_START" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" placeholder="选择检查开始时间"/>
|
<el-date-picker
|
||||||
|
v-model="form.INSPECTION_TIME_START"
|
||||||
|
format="yyyy-MM-dd HH:mm"
|
||||||
|
value-format="yyyy-MM-dd HH:mm"
|
||||||
|
type="datetime"
|
||||||
|
placeholder="选择检查开始时间"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="检查结束时间" prop="INSPECTION_TIME_END">
|
<el-form-item label="检查结束时间" prop="INSPECTION_TIME_END">
|
||||||
<el-date-picker v-model="form.INSPECTION_TIME_END" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" placeholder="选择检查结束时间"/>
|
<el-date-picker
|
||||||
|
v-model="form.INSPECTION_TIME_END"
|
||||||
|
format="yyyy-MM-dd HH:mm"
|
||||||
|
value-format="yyyy-MM-dd HH:mm"
|
||||||
|
type="datetime"
|
||||||
|
placeholder="选择检查结束时间"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-divider content-position="left">检查人员 <el-button type="primary" size="mini" @click="addInspector">添加</el-button></el-divider>
|
<el-divider content-position="left">检查人员
|
||||||
<el-form-item v-for="(item,index) in form.inspectorList" :key="index + (Math.random() + '').replace('.', '')" :label="(index+1)+'.'">
|
<el-button type="primary" size="mini" @click="addInspector">添加</el-button>
|
||||||
|
</el-divider>
|
||||||
|
<el-form-item
|
||||||
|
v-for="(item,index) in form.inspectorList"
|
||||||
|
:key="index + (Math.random() + '').replace('.', '')"
|
||||||
|
:label="(index+1)+'.'">
|
||||||
<div class="uo-flex">
|
<div class="uo-flex">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
|
|
@ -95,26 +130,60 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="11">
|
<el-col :span="11">
|
||||||
<el-form-item label="检查人员" prop="INSPECTION_USER_ID">
|
<el-form-item label="检查人员" prop="INSPECTION_USER_ID">
|
||||||
<el-select v-model="item.INSPECTION_USER_ID" clearable placeholder="请选择检查人员" @change="changeHiddenUserList">
|
<el-select
|
||||||
<el-option v-for="data in INSPECTED_SITEUSER_List" :key="data.USER_ID" :label="data.NAME" :value="data.NAME" />
|
v-model="item.INSPECTION_USER_ID"
|
||||||
|
clearable
|
||||||
|
placeholder="请选择检查人员"
|
||||||
|
@change="changeHiddenUserList">
|
||||||
|
<el-option
|
||||||
|
v-for="data in INSPECTED_SITEUSER_List"
|
||||||
|
:key="data.USER_ID"
|
||||||
|
:label="data.NAME"
|
||||||
|
:value="data.USER_ID"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1">
|
<el-col :span="1">
|
||||||
<el-button plain size="mini" type="danger" icon="el-icon-delete" title="移除" @click="delInspectorRow(item,index)"/>
|
<el-button
|
||||||
|
plain
|
||||||
|
size="mini"
|
||||||
|
type="danger"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
title="移除"
|
||||||
|
@click="delInspectorRow(item,index)"/>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-divider content-position="left">检查情况 <el-button type="primary" size="mini" @click="addSituation">添加</el-button></el-divider>
|
<el-divider content-position="left">检查情况
|
||||||
<el-form-item v-for="(item,index) in form.situationList" :key="'SITUATION'+index" :label="(index+1)+'.'" :prop="item.SITUATION">
|
<el-button type="primary" size="mini" @click="addSituation">添加</el-button>
|
||||||
|
</el-divider>
|
||||||
|
<el-form-item
|
||||||
|
v-for="(item,index) in form.situationList"
|
||||||
|
:key="'SITUATION'+index"
|
||||||
|
:label="(index+1)+'.'"
|
||||||
|
:prop="item.SITUATION">
|
||||||
<div class="uo-flex">
|
<div class="uo-flex">
|
||||||
<el-input v-model="item.SITUATION" :autosize="{ minRows: 1}" maxlength="255" type="textarea" placeholder="这里输入检查情况..." style="margin-right: 5px" />
|
<el-input
|
||||||
<el-button plain size="mini" type="danger" icon="el-icon-delete" title="删除" @click="delSituationRow(item,index)"/>
|
v-model="item.SITUATION"
|
||||||
|
:autosize="{ minRows: 1}"
|
||||||
|
maxlength="255"
|
||||||
|
type="textarea"
|
||||||
|
placeholder="这里输入检查情况..."
|
||||||
|
style="margin-right: 5px"/>
|
||||||
|
<el-button
|
||||||
|
plain
|
||||||
|
size="mini"
|
||||||
|
type="danger"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
title="删除"
|
||||||
|
@click="delSituationRow(item,index)"/>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<div style="margin-top: 50px;"/>
|
<div style="margin-top: 50px;"/>
|
||||||
<el-divider content-position="left">发现问题 <el-button type="primary" size="mini" @click="addHidden">添加</el-button></el-divider>
|
<el-divider content-position="left">发现问题
|
||||||
|
<el-button type="primary" size="mini" @click="addHidden">添加</el-button>
|
||||||
|
</el-divider>
|
||||||
|
|
||||||
<div class="mb-20">
|
<div class="mb-20">
|
||||||
<table class="table-ui">
|
<table class="table-ui">
|
||||||
|
|
@ -125,11 +194,22 @@
|
||||||
</tr>
|
</tr>
|
||||||
<template v-if="form.hiddenList.length !== 0">
|
<template v-if="form.hiddenList.length !== 0">
|
||||||
<tr v-for="(item,index) in form.hiddenList" :key="'HIDDEN'+index">
|
<tr v-for="(item,index) in form.hiddenList" :key="'HIDDEN'+index">
|
||||||
<td align="center">{{ index+1 }}</td>
|
<td align="center">{{ index + 1 }}</td>
|
||||||
<td>{{ item.HIDDENDESCR }}</td>
|
<td>{{ item.HIDDENDESCR }}</td>
|
||||||
<td>
|
<td>
|
||||||
<el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="editInspectionHidden(item,index)">修改</el-button>
|
<el-button
|
||||||
<el-button type="danger" icon="el-icon-delete" size="mini" @click="removeInspectionHidden(item,index)">删除</el-button>
|
v-if="false"
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-edit"
|
||||||
|
size="mini"
|
||||||
|
@click="editInspectionHidden(item,index)">修改
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="danger"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
size="mini"
|
||||||
|
@click="removeInspectionHidden(item,index)">删除
|
||||||
|
</el-button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -145,9 +225,15 @@
|
||||||
|
|
||||||
<!-- 添加隐患 -->
|
<!-- 添加隐患 -->
|
||||||
<el-dialog :visible.sync="dialogFormVisible" title="添加隐患">
|
<el-dialog :visible.sync="dialogFormVisible" title="添加隐患">
|
||||||
<el-form v-if="dialogFormVisible" ref="hiddenForm" :rules="hiddenRules" :model="hiddenForm" label-width="140px" style="padding:0 20px">
|
<el-form
|
||||||
|
v-if="dialogFormVisible"
|
||||||
|
ref="hiddenForm"
|
||||||
|
:rules="hiddenRules"
|
||||||
|
:model="hiddenForm"
|
||||||
|
label-width="140px"
|
||||||
|
style="padding:0 20px">
|
||||||
<el-form-item label="隐患描述：" prop="HIDDENDESCR">
|
<el-form-item label="隐患描述：" prop="HIDDENDESCR">
|
||||||
<el-input v-model="hiddenForm.HIDDENDESCR" placeholder="请输入内容" />
|
<el-input v-model="hiddenForm.HIDDENDESCR" placeholder="请输入内容"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="隐患发现时间：" prop="DISCOVERYTIME">
|
<el-form-item label="隐患发现时间：" prop="DISCOVERYTIME">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
|
|
@ -161,7 +247,11 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="隐患部位：" prop="HIDDENPART">
|
<el-form-item label="隐患部位：" prop="HIDDENPART">
|
||||||
<el-input v-if="hiddenPartType =='value'" v-model="hiddenForm.HIDDENPART" style="width: 90%;" placeholder="请输入内容" />
|
<el-input
|
||||||
|
v-if="hiddenPartType =='value'"
|
||||||
|
v-model="hiddenForm.HIDDENPART"
|
||||||
|
style="width: 90%;"
|
||||||
|
placeholder="请输入内容"/>
|
||||||
<SelectTree
|
<SelectTree
|
||||||
v-if="hiddenPartType =='select'"
|
v-if="hiddenPartType =='select'"
|
||||||
ref="deptTree_Select1"
|
ref="deptTree_Select1"
|
||||||
|
|
@ -171,8 +261,11 @@
|
||||||
v-model="hiddenForm.HIDDENPART"
|
v-model="hiddenForm.HIDDENPART"
|
||||||
style="width: 90%;"
|
style="width: 90%;"
|
||||||
allow-create
|
allow-create
|
||||||
placeholder="请选择" />
|
placeholder="请选择"/>
|
||||||
<el-button class="ml5" @click="hiddenPartTypeBtn">{{ hiddenPartType === 'select' ? '输入' : '选择' }}</el-button>
|
<el-button class="ml5" @click="hiddenPartTypeBtn">{{
|
||||||
|
hiddenPartType === 'select' ? '输入' : '选择'
|
||||||
|
}}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -201,12 +294,12 @@
|
||||||
:canparent="false"
|
:canparent="false"
|
||||||
children-name="nodes"
|
children-name="nodes"
|
||||||
style="width: 100%;"
|
style="width: 100%;"
|
||||||
placeholder="请选择" />
|
placeholder="请选择"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-form-item label="隐患位置：" prop="LONGITUDE" >
|
<el-form-item label="隐患位置：" prop="LONGITUDE">
|
||||||
<el-row :gutter="12" type="flex" justify="space-between">
|
<el-row :gutter="12" type="flex" justify="space-between">
|
||||||
<el-col :span="10">
|
<el-col :span="10">
|
||||||
<el-input
|
<el-input
|
||||||
|
|
@ -217,7 +310,7 @@
|
||||||
maxlength="255"
|
maxlength="255"
|
||||||
placeholder="这里选择隐患经度..."
|
placeholder="这里选择隐患经度..."
|
||||||
title="隐患位置经度"
|
title="隐患位置经度"
|
||||||
@focus="chooseMap" />
|
@focus="chooseMap"/>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="10">
|
<el-col :span="10">
|
||||||
<el-input
|
<el-input
|
||||||
|
|
@ -228,7 +321,7 @@
|
||||||
maxlength="255"
|
maxlength="255"
|
||||||
placeholder="这里选择隐患位置纬度..."
|
placeholder="这里选择隐患位置纬度..."
|
||||||
title="隐患位置经度"
|
title="隐患位置经度"
|
||||||
@focus="chooseMap" />
|
@focus="chooseMap"/>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4" style="text-align: right">
|
<el-col :span="4" style="text-align: right">
|
||||||
<el-button type="primary" icon="el-icon-add-location" plain @click="chooseMap">位置定位</el-button>
|
<el-button type="primary" icon="el-icon-add-location" plain @click="chooseMap">位置定位</el-button>
|
||||||
|
|
@ -237,7 +330,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-form-item label="隐患位置描述：" prop="POSITIONDESC" >
|
<el-form-item label="隐患位置描述：" prop="POSITIONDESC">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-input
|
<el-input
|
||||||
id="POSITIONDESC"
|
id="POSITIONDESC"
|
||||||
|
|
@ -273,7 +366,7 @@
|
||||||
</span>
|
</span>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<el-tooltip class="item" effect="dark" content="删除" placement="top">
|
<el-tooltip class="item" effect="dark" content="删除" placement="top">
|
||||||
<span class="Delete" @click="delHiddenImg(index)"><i class="el-icon-delete" /></span>
|
<span class="Delete" @click="delHiddenImg(index)"><i class="el-icon-delete"/></span>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -292,7 +385,7 @@
|
||||||
multiple
|
multiple
|
||||||
accept=".jpg,.jpeg,.png"
|
accept=".jpg,.jpeg,.png"
|
||||||
list-type="picture-card">
|
list-type="picture-card">
|
||||||
<i class="el-icon-plus" />
|
<i class="el-icon-plus"/>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
</div>
|
</div>
|
||||||
<span class="red-tip">* 最多只能上传四张图片</span>
|
<span class="red-tip">* 最多只能上传四张图片</span>
|
||||||
|
|
@ -304,13 +397,17 @@
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<div v-if="hiddenForm.hiddenVideos.length > 0">
|
<div v-if="hiddenForm.hiddenVideos.length > 0">
|
||||||
<el-form-item label="隐患视频：">
|
<el-form-item label="隐患视频：">
|
||||||
<div v-for="(data, indexImg) in hiddenForm.hiddenVideos" :key="'hdVideo'+indexImg" class="demo-image__preview" style="float: left; margin-right: 5px">
|
<div
|
||||||
|
v-for="(data, indexImg) in hiddenForm.hiddenVideos"
|
||||||
|
:key="'hdVideo'+indexImg"
|
||||||
|
class="demo-image__preview"
|
||||||
|
style="float: left; margin-right: 5px">
|
||||||
<img
|
<img
|
||||||
src="../../../../assets/images/hidden_video.png"
|
src="../../../../assets/images/hidden_video.png"
|
||||||
style="width: 100px; height: 100px; cursor: pointer;"
|
style="width: 100px; height: 100px; cursor: pointer;"
|
||||||
@click="goViewVideo(data)"
|
@click="goViewVideo(data)"
|
||||||
>
|
>
|
||||||
<i class="el-icon-close" @click="delFujian(indexImg)" />
|
<i class="el-icon-close" @click="delFujian(indexImg)"/>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -337,8 +434,17 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row class="form-group input-group-sm">
|
<el-row class="form-group input-group-sm">
|
||||||
<el-form-item label="隐患发现人：" prop="CREATOR">
|
<el-form-item label="隐患发现人：" prop="CREATOR">
|
||||||
<el-select v-model="hiddenForm.CREATOR" clearable placeholder="请选择隐患发现人" style="width: 100%;" @change="changeHiddenFindDept">
|
<el-select
|
||||||
<el-option v-for="item in RESPONSIBLE_USER_List" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
|
v-model="hiddenForm.CREATOR"
|
||||||
|
clearable
|
||||||
|
placeholder="请选择隐患发现人"
|
||||||
|
style="width: 100%;"
|
||||||
|
@change="changeHiddenFindDept">
|
||||||
|
<el-option
|
||||||
|
v-for="item in RESPONSIBLE_USER_List"
|
||||||
|
:key="item.USER_ID"
|
||||||
|
:label="item.NAME"
|
||||||
|
:value="item.USER_ID"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -373,7 +479,7 @@
|
||||||
<canvas id="canvasVideo" style="display: none"/>
|
<canvas id="canvasVideo" style="display: none"/>
|
||||||
<confirm ref="confirm" @getProposal="getProposal"/>
|
<confirm ref="confirm" @getProposal="getProposal"/>
|
||||||
|
|
||||||
<div class="ui-height" />
|
<div class="ui-height"/>
|
||||||
<div class="ui-foot">
|
<div class="ui-foot">
|
||||||
<el-button type="primary" @click="confirm">确 定</el-button>
|
<el-button type="primary" @click="confirm">确 定</el-button>
|
||||||
<el-button @click="goBack">取 消</el-button>
|
<el-button @click="goBack">取 消</el-button>
|
||||||
|
|
@ -444,7 +550,11 @@ export default {
|
||||||
INSPECTED_SITEUSER_ID: [{ required: true, message: '被检查单位现场负责人不能为空', trigger: 'blur' }],
|
INSPECTED_SITEUSER_ID: [{ required: true, message: '被检查单位现场负责人不能为空', trigger: 'blur' }],
|
||||||
INSPECTED_EXPLAIN: [{ required: true, message: '申辩内容不能为空', trigger: 'blur' }],
|
INSPECTED_EXPLAIN: [{ required: true, message: '申辩内容不能为空', trigger: 'blur' }],
|
||||||
INSPECTED_SITEUSER_SIGN_IMG: [{ required: true, message: '被检查单位现场负责人签字不能为空', trigger: 'blur' }],
|
INSPECTED_SITEUSER_SIGN_IMG: [{ required: true, message: '被检查单位现场负责人签字不能为空', trigger: 'blur' }],
|
||||||
INSPECTED_SITEUSER_SIGN_TIME: [{ required: true, message: '请选择被检查单位现场负责人签字时间', trigger: 'blur' }],
|
INSPECTED_SITEUSER_SIGN_TIME: [{
|
||||||
|
required: true,
|
||||||
|
message: '请选择被检查单位现场负责人签字时间',
|
||||||
|
trigger: 'blur'
|
||||||
|
}],
|
||||||
INSPECTION_TYPE: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }],
|
INSPECTION_TYPE: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }],
|
||||||
INSPECTION_TYPE_OTHER: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }],
|
INSPECTION_TYPE_OTHER: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }],
|
||||||
INSPECTION_PLACE: [{ required: true, message: '检查场所不能为空', trigger: 'blur' }],
|
INSPECTION_PLACE: [{ required: true, message: '检查场所不能为空', trigger: 'blur' }],
|
||||||
|
|
@ -474,10 +584,16 @@ export default {
|
||||||
},
|
},
|
||||||
hiddenPartList: [], // 隐患部位
|
hiddenPartList: [], // 隐患部位
|
||||||
hiddenPartType: 'select',
|
hiddenPartType: 'select',
|
||||||
hiddenlevelList: [{ value: 'hiddenLevel1002', label: '一般隐患' }, { value: 'hiddenLevel1004', label: '轻微隐患' }], // 隐患级别
|
hiddenlevelList: [{ value: 'hiddenLevel1002', label: '一般隐患' }, {
|
||||||
|
value: 'hiddenLevel1004',
|
||||||
|
label: '轻微隐患'
|
||||||
|
}], // 隐患级别
|
||||||
hiddenTypeList: [], // 隐患类型1
|
hiddenTypeList: [], // 隐患类型1
|
||||||
hiddenType2List: [], // 隐患类型2
|
hiddenType2List: [], // 隐患类型2
|
||||||
RESPONSIBLE_USER_List: [{ NAME: JSON.parse(sessionStorage.getItem('user')).NAME, USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID }], // 隐患责任人
|
RESPONSIBLE_USER_List: [{
|
||||||
|
NAME: JSON.parse(sessionStorage.getItem('user')).NAME,
|
||||||
|
USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
|
||||||
|
}], // 隐患责任人
|
||||||
dialogMap: false,
|
dialogMap: false,
|
||||||
iframeSrc: '',
|
iframeSrc: '',
|
||||||
hiddenPicture: false,
|
hiddenPicture: false,
|
||||||
|
|
@ -594,7 +710,11 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
addInspector() {
|
addInspector() {
|
||||||
this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '' })
|
this.form.inspectorList.push({
|
||||||
|
INSPECTION_INSPECTOR_ID: '',
|
||||||
|
INSPECTION_DEPARTMENT_ID: '',
|
||||||
|
INSPECTION_USER_ID: ''
|
||||||
|
})
|
||||||
this.INSPECTOR_List.push([])
|
this.INSPECTOR_List.push([])
|
||||||
},
|
},
|
||||||
updateInspecteDept(DEPARTMENT_ID, i) {
|
updateInspecteDept(DEPARTMENT_ID, i) {
|
||||||
|
|
@ -620,7 +740,10 @@ export default {
|
||||||
},
|
},
|
||||||
/* 隐患责任人改为充检查人员中选取 */
|
/* 隐患责任人改为充检查人员中选取 */
|
||||||
changeHiddenUserList(val) {
|
changeHiddenUserList(val) {
|
||||||
this.RESPONSIBLE_USER_List = [{ NAME: JSON.parse(sessionStorage.getItem('user')).NAME, USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID }]
|
this.RESPONSIBLE_USER_List = [{
|
||||||
|
NAME: JSON.parse(sessionStorage.getItem('user')).NAME,
|
||||||
|
USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
|
||||||
|
}]
|
||||||
for (let i = 0; i < this.form.inspectorList.length; i++) {
|
for (let i = 0; i < this.form.inspectorList.length; i++) {
|
||||||
this.INSPECTOR_List[i].forEach(item => {
|
this.INSPECTOR_List[i].forEach(item => {
|
||||||
if (this.form.inspectorList[i].INSPECTION_USER_ID === item.USER_ID) {
|
if (this.form.inspectorList[i].INSPECTION_USER_ID === item.USER_ID) {
|
||||||
|
|
@ -905,7 +1028,11 @@ export default {
|
||||||
}
|
}
|
||||||
const index = this.form.inspectorList.findIndex(item => item.INSPECTION_USER_ID === JSON.parse(sessionStorage.getItem('user')).USER_ID)
|
const index = this.form.inspectorList.findIndex(item => item.INSPECTION_USER_ID === JSON.parse(sessionStorage.getItem('user')).USER_ID)
|
||||||
if (index < 0) {
|
if (index < 0) {
|
||||||
this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: JSON.parse(sessionStorage.getItem('user')).DEPARTMENT_ID, INSPECTION_USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID })
|
this.form.inspectorList.push({
|
||||||
|
INSPECTION_INSPECTOR_ID: '',
|
||||||
|
INSPECTION_DEPARTMENT_ID: JSON.parse(sessionStorage.getItem('user')).DEPARTMENT_ID,
|
||||||
|
INSPECTION_USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
|
||||||
|
})
|
||||||
}
|
}
|
||||||
this.$set(this.form, 'INSPECTORJSON', JSON.stringify(this.form.inspectorList))
|
this.$set(this.form, 'INSPECTORJSON', JSON.stringify(this.form.inspectorList))
|
||||||
this.$set(this.form, 'SITUATIONJSON', JSON.stringify(this.form.situationList))
|
this.$set(this.form, 'SITUATIONJSON', JSON.stringify(this.form.situationList))
|
||||||
|
|
@ -1178,7 +1305,7 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.uo-flex {
|
.uo-flex {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,7 @@ export default {
|
||||||
getData() {
|
getData() {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/goShow',
|
'/safetyenvironmental/V2/goShow',
|
||||||
{
|
{
|
||||||
INSPECTION_ID: this.$parent.INSPECTION_ID
|
INSPECTION_ID: this.$parent.INSPECTION_ID
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -357,7 +357,7 @@ export default {
|
||||||
getList() {
|
getList() {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
'/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||||
{
|
{
|
||||||
...this.search,
|
...this.search,
|
||||||
INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
|
INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
|
||||||
|
|
@ -471,7 +471,7 @@ export default {
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/hide',
|
'/safetyenvironmental/V2/hide',
|
||||||
{
|
{
|
||||||
INSPECTION_ID: id,
|
INSPECTION_ID: id,
|
||||||
hide: '1'
|
hide: '1'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue