fix: BUG修改

This commit is contained in:
kun 2024-04-29 23:45:42 +08:00
commit 8e363fd718
4 changed files with 53 additions and 30 deletions

View File

@ -3,7 +3,8 @@ export default {
regionName: '区域名称', regionName: '区域名称',
coding: '编码', coding: '编码',
unit:'单位', unit:'单位',
rectificationPeople: '整改人', rectificationPeople: '责任人',
rectificationWork: '整改单位',
personLiable:'责任人', personLiable:'责任人',
personWork:'责任单位', personWork:'责任单位',
notifier: '通知人', notifier: '通知人',

View File

@ -57,14 +57,14 @@
$t("message.videoManage.add") $t("message.videoManage.add")
}}</el-button> }}</el-button>
<!-- 筛选 --> <!-- 筛选 -->
<el-dropdown class="screen" size="medium" @command="handleCommand"> <!-- <el-dropdown class="screen" size="medium" @command="handleCommand">
<el-button type="success" plain> <el-button type="success" plain>
{{$t("message.videoManage.screen")}} {{$t("message.videoManage.screen")}}
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item) in screen" :key="item.id" :command="item.id">{{item.name}}</el-dropdown-item> <el-dropdown-item v-for="(item) in screen" :key="item.id" :command="item.id">{{item.name}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown> -->
</el-form-item> </el-form-item>
</el-form> </el-form>

View File

@ -28,7 +28,7 @@
align="center" align="center"
prop="enterpriseName" prop="enterpriseName"
label="整改单位" label="责任单位"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -79,7 +79,7 @@
width="666px" width="666px"
> >
<div class="dialog_content"> <div class="dialog_content">
<el-form ref="form" :model="form" label-width="80px" size="medium"> <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="medium">
<el-form-item <el-form-item
:label="$t('message.quality.regionName')" :label="$t('message.quality.regionName')"
prop="regionName" prop="regionName"
@ -99,11 +99,13 @@
:disabled="dialogType == 2" :disabled="dialogType == 2"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- 整改单位 --> <!-- 责任单位 -->
<el-form-item label="整改单位"> <el-form-item
label="责任单位"
prop="dutyId"
>
<el-select <el-select
v-model="form.dutyId" v-model="form.dutyId"
filterable
multiple multiple
@change="changeDutyId" @change="changeDutyId"
:placeholder="$t('message.quality.pleaseSelect')" :placeholder="$t('message.quality.pleaseSelect')"
@ -120,11 +122,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 整改人 start --> <!-- 责任人 start -->
<el-form-item label="整改人"> <el-form-item label="责任人"
prop="personId"
>
<el-select <el-select
v-model="form.personId" v-model="form.personId"
filterable
multiple multiple
:placeholder="$t('message.quality.pleaseSelect')" :placeholder="$t('message.quality.pleaseSelect')"
style="width: 100%" style="width: 100%"
@ -243,9 +246,21 @@ export default {
intendanceIds: [], intendanceIds: [],
intendanceNames: '', intendanceNames: '',
remark: '', remark: '',
enterpriseName:'' enterpriseName:'',
}, },
showList: [] showList: [],
rules: {
dutyId:[{
required: true,
message:'请输入责任单位',
trigger: 'change'
}],
personId:[{
required: true,
message:'请输入责任人',
trigger: 'change'
}]
}
} }
}, },
created() { created() {
@ -279,6 +294,10 @@ export default {
this.editDialog = true this.editDialog = true
this.title ='新增区域' this.title ='新增区域'
this.dialogType = 1 this.dialogType = 1
this.$nextTick(()=>{
this.$refs['form'].clearValidate()
})
}, },
// //
changeDutyId(value) { changeDutyId(value) {
@ -408,6 +427,8 @@ export default {
if (valid) { if (valid) {
let data = { let data = {
dutyName: this.form.dutyName, dutyName: this.form.dutyName,
dutyId: this.form.dutyId,
personId: this.form.personId,
// intendanceIds: this.form.intendanceIds.join(','), // intendanceIds: this.form.intendanceIds.join(','),
intendanceNames: this.form.intendanceNames, intendanceNames: this.form.intendanceNames,
regionName: this.form.regionName, regionName: this.form.regionName,
@ -492,7 +513,7 @@ export default {
close() { close() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.form.clearValidate() this.$refs['form'].clearValidate()
}) })
} }
} }

View File

@ -1016,7 +1016,7 @@
v-model="addForm2.floor" v-model="addForm2.floor"
> >
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="事件描述" prop="addedDescription"> <el-form-item label="事件描述" prop="addedDescription">
<el-input <el-input
:disabled="type == 'detail'" :disabled="type == 'detail'"
@ -1611,7 +1611,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div> <div>
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<div class="grid-content"> <div class="grid-content">
<span class="label">分部工程</span> <span class="label">分部工程</span>
@ -1628,7 +1628,7 @@
</span> </span>
</div> </div>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row :gutter="20" v-show="detailData.recordType == 1"> <el-row :gutter="20" v-show="detailData.recordType == 1">
<el-col :span="12"> <el-col :span="12">
<div class="grid-content"> <div class="grid-content">
@ -1767,14 +1767,14 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <!-- <el-col :span="12">
<div class="grid-content"> <div class="grid-content">
<span class="label">巡检楼层</span> <span class="label">巡检楼层</span>
<span class="value"> <span class="value">
{{ detailData.floor }} {{ detailData.floor }}
</span> </span>
</div> </div>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<div class="grid-content"> <div class="grid-content">
<span class="label" style="line-height: 25px" <span class="label" style="line-height: 25px"
@ -2601,8 +2601,8 @@ export default {
}, },
// //
addBtn(type) { addBtn(type) {
console.log(type); console.log(type)
if (type == 1) { if (type == 1) {
this.type = "detail"; this.type = "detail";
this.addTitle = this.addTitle =
@ -3176,15 +3176,16 @@ export default {
close() { close() {
// this.mapUrl = '' // this.mapUrl = ''
this.fileList1 = []; this.fileList1 = []
this.fileList2 = []; this.fileList2 = []
this.fileList3 = []; this.fileList3 = []
this.fileList4 = []; this.fileList4 = []
this.$nextTick(() => { $nextTick(()=>{
this.$refs.addForm1.clearValidate(); // this.$refs.addForm1.resetFields() //
this.$refs.addForm2.clearValidate(); // this.$refs.addForm2.resetFields() //
}); })
this.hideUpload = false;
this.hideUpload = false
if (this.recordType == 1) { if (this.recordType == 1) {
this.addForm1 = { this.addForm1 = {
regionId: "", regionId: "",