|
|
@ -135,8 +135,8 @@ |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
label="水闸名称" |
|
|
label="水闸名称" |
|
|
align="center" |
|
|
align="center" |
|
|
prop="wagaId" |
|
|
prop="wagaCode" |
|
|
:formatter="wagaIdFormat" |
|
|
:formatter="wagaCodeFormat" |
|
|
min-width="120" |
|
|
min-width="120" |
|
|
/> |
|
|
/> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
@ -238,9 +238,9 @@ |
|
|
</div> |
|
|
</div> |
|
|
<el-row :gutter="15"> |
|
|
<el-row :gutter="15"> |
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="96px"> |
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="96px"> |
|
|
<el-form-item label="水闸名称" prop="wagaId"> |
|
|
<el-form-item label="水闸名称" prop="wagaCode"> |
|
|
<el-select |
|
|
<el-select |
|
|
v-model="form.wagaId" |
|
|
v-model="form.wagaCode" |
|
|
placeholder="请选择水闸名称" |
|
|
placeholder="请选择水闸名称" |
|
|
style="width: 100%" |
|
|
style="width: 100%" |
|
|
> |
|
|
> |
|
|
@ -248,7 +248,7 @@ |
|
|
v-for="dict in wagaNameOptions" |
|
|
v-for="dict in wagaNameOptions" |
|
|
:key="dict.id" |
|
|
:key="dict.id" |
|
|
:label="dict.wagaName" |
|
|
:label="dict.wagaName" |
|
|
:value="dict.id" |
|
|
:value="dict.wagaCode" |
|
|
></el-option> |
|
|
></el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
@ -443,7 +443,7 @@ export default { |
|
|
form: {}, |
|
|
form: {}, |
|
|
// 表单校验 |
|
|
// 表单校验 |
|
|
rules: { |
|
|
rules: { |
|
|
wagaId: [ |
|
|
wagaCode: [ |
|
|
{ required: true, message: "请选择水闸名称", trigger: "blur" }, |
|
|
{ required: true, message: "请选择水闸名称", trigger: "blur" }, |
|
|
], |
|
|
], |
|
|
organizationName: [ |
|
|
organizationName: [ |
|
|
@ -524,21 +524,21 @@ export default { |
|
|
typeFormat(row, column) { |
|
|
typeFormat(row, column) { |
|
|
return this.selectDictLabel(this.typeOptions, row.chargePersonType); |
|
|
return this.selectDictLabel(this.typeOptions, row.chargePersonType); |
|
|
}, |
|
|
}, |
|
|
wagaIdFormat(row) { |
|
|
wagaCodeFormat(row) { |
|
|
const id = row.wagaId; |
|
|
const wagaCode = row.wagaCode; |
|
|
// const name = await new Promise(function (resolve, reject) { |
|
|
// const name = await new Promise(function (resolve, reject) { |
|
|
// getJbxx(id).then((res) => { |
|
|
// getJbxx(id).then((res) => { |
|
|
// // console.log(111, res); |
|
|
// // console.log(111, res); |
|
|
// resolve(res.data.wagaName); |
|
|
// resolve(res.data.wagaName); |
|
|
// }); |
|
|
// }); |
|
|
// }); |
|
|
// }); |
|
|
let data = this.wagaNameOptions.find((res) => res.id == id); |
|
|
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode); |
|
|
if (data) return data.wagaName; |
|
|
if (data) return data.wagaName; |
|
|
}, |
|
|
}, |
|
|
/** 查询防汛组织列表 */ |
|
|
/** 查询防汛组织列表 */ |
|
|
getList() { |
|
|
getList() { |
|
|
this.loading = true; |
|
|
this.loading = true; |
|
|
// this.queryParams.data.wagaId = this.$route.query.baseDataId; |
|
|
// this.queryParams.data.wagaCode = this.$route.query.baseDataId; |
|
|
listFxzz(this.queryParams).then((response) => { |
|
|
listFxzz(this.queryParams).then((response) => { |
|
|
this.fxzzList = response.records; |
|
|
this.fxzzList = response.records; |
|
|
this.total = response.total; |
|
|
this.total = response.total; |
|
|
@ -686,7 +686,7 @@ export default { |
|
|
if (this.delIdList.length > 0) delFxzzcy(this.delIdList); |
|
|
if (this.delIdList.length > 0) delFxzzcy(this.delIdList); |
|
|
} else { |
|
|
} else { |
|
|
this.form.cy = C0; |
|
|
this.form.cy = C0; |
|
|
// this.form.wagaId = this.$route.query.baseDataId; |
|
|
// this.form.wagaCode = this.$route.query.baseDataId; |
|
|
addFxzz(this.form).then((response) => { |
|
|
addFxzz(this.form).then((response) => { |
|
|
if (response.code === 200) { |
|
|
if (response.code === 200) { |
|
|
this.msgSuccess("新增成功"); |
|
|
this.msgSuccess("新增成功"); |
|
|
|
xzt
1 year ago