|
|
|
@ -12,10 +12,10 @@
|
|
|
|
|
<el-form-item label="类型:"> |
|
|
|
|
<el-select v-model="searchForm.typecn" placeholder="请选择类型"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="(item,index) in interestType" |
|
|
|
|
:key="index" |
|
|
|
|
:label="item.typecn" |
|
|
|
|
:value="item.typecn" |
|
|
|
|
v-for="(item,index) in statusCdList" |
|
|
|
|
:key="item.id" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
@ -151,26 +151,26 @@
|
|
|
|
|
placeholder="请输入地区名称" |
|
|
|
|
></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="新类型名称:" v-if="hiedType"> |
|
|
|
|
<el-input |
|
|
|
|
v-model="editForm.typecn" |
|
|
|
|
placeholder="请输入类型名称(如学校)" |
|
|
|
|
></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="新类型:" v-if="hiedType"> |
|
|
|
|
<el-input |
|
|
|
|
v-model="editForm.type" |
|
|
|
|
placeholder="请输入类型(如school)" |
|
|
|
|
></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<!-- <el-form-item label="新类型名称:" v-if="hiedType">--> |
|
|
|
|
<!-- <el-input--> |
|
|
|
|
<!-- v-model="editForm.typecn"--> |
|
|
|
|
<!-- placeholder="请输入类型名称(如学校)"--> |
|
|
|
|
<!-- ></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="新类型:" v-if="hiedType">--> |
|
|
|
|
<!-- <el-input--> |
|
|
|
|
<!-- v-model="editForm.type"--> |
|
|
|
|
<!-- placeholder="请输入类型(如school)"--> |
|
|
|
|
<!-- ></el-input>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<el-form-item label="已有类型:"> |
|
|
|
|
<el-select v-model="editForm.oldType" clearable placeholder="请选择类型(上面填写不可选择) " @change="refreshData" style="width: 60%" > |
|
|
|
|
|
|
|
|
|
<el-option |
|
|
|
|
v-for="(item,index) in interestType" |
|
|
|
|
v-for="(item,index) in statusCdList" |
|
|
|
|
:key="index" |
|
|
|
|
:label="item.typecn" |
|
|
|
|
:value="item.type" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
@ -301,6 +301,7 @@
|
|
|
|
|
<script> |
|
|
|
|
import { |
|
|
|
|
delData, |
|
|
|
|
getDict, |
|
|
|
|
updateData, |
|
|
|
|
queryGroupList, |
|
|
|
|
addGroupData, |
|
|
|
@ -359,6 +360,10 @@ export default {
|
|
|
|
|
label: "备注", |
|
|
|
|
prop: "remark", |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "地址", |
|
|
|
|
prop: "address", |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "经度", |
|
|
|
|
prop: "lon", |
|
|
|
@ -404,16 +409,16 @@ export default {
|
|
|
|
|
title: "新增轮播图", |
|
|
|
|
dialogReadOnly: false, |
|
|
|
|
editForm: { |
|
|
|
|
lon: { |
|
|
|
|
longitude: [ |
|
|
|
|
{ validator: validateLongitude, trigger: 'blur' }, |
|
|
|
|
{ validator: validateLongitude, trigger: 'change' } |
|
|
|
|
], |
|
|
|
|
lat: [ |
|
|
|
|
{ validator: validateLatitude, trigger: 'blur' }, |
|
|
|
|
{ validator: validateLatitude, trigger: 'change' } |
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
// lon: { |
|
|
|
|
// longitude: [ |
|
|
|
|
// { validator: validateLongitude, trigger: 'blur' }, |
|
|
|
|
// { validator: validateLongitude, trigger: 'change' } |
|
|
|
|
// ], |
|
|
|
|
// lat: [ |
|
|
|
|
// { validator: validateLatitude, trigger: 'blur' }, |
|
|
|
|
// { validator: validateLatitude, trigger: 'change' } |
|
|
|
|
// ] |
|
|
|
|
// }, |
|
|
|
|
}, |
|
|
|
|
dialogVisible: false, |
|
|
|
|
statusCdList: [], |
|
|
|
@ -441,10 +446,10 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
this.onSubmit(); |
|
|
|
|
// getDict("land_color_type_list").then((res) => { |
|
|
|
|
// this.statusCdList = res.data.data; |
|
|
|
|
// //console.log(this.statusCdList) |
|
|
|
|
// }); |
|
|
|
|
getDict("rim").then((res) => { |
|
|
|
|
this.statusCdList = res.data.data; |
|
|
|
|
// console.log(this.statusCdList) |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// queryGroupList({ size: 99999 }).then((res) => { |
|
|
|
|
// this.groupList = res.data.data.records; |
|
|
|
@ -480,7 +485,7 @@ export default {
|
|
|
|
|
//验证 |
|
|
|
|
UpNumber(e) { |
|
|
|
|
// 输入框中只允许输入数字 |
|
|
|
|
e.target.value = e.target.value.replace(/[^\d^\.]+/g,'') |
|
|
|
|
e.target.value = e.target.value.replace(/[^\d^\.]+/g,null) |
|
|
|
|
// 输入框中只允许输入小数点和数字,小数点后只能跟一位 |
|
|
|
|
e.target.value = (e.target.value.match(/^\d*(.?\d{0,20})/g)[0]) || null |
|
|
|
|
}, |
|
|
|
@ -539,7 +544,7 @@ export default {
|
|
|
|
|
this.page.total = response.data.data.total; |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
this.selectTypeLists(); |
|
|
|
|
// this.selectTypeLists(); |
|
|
|
|
}, |
|
|
|
|
// 重置 |
|
|
|
|
onReset() { |
|
|
|
@ -613,40 +618,43 @@ export default {
|
|
|
|
|
this.dialogVisible = false; |
|
|
|
|
this.onSubmit(); |
|
|
|
|
this.hiedType =true; |
|
|
|
|
this.$message.success("修改成功"); |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
let boer = true; |
|
|
|
|
// console.log(this.editForm.oldType) |
|
|
|
|
// console.log(this.editForm.type) |
|
|
|
|
if(this.editForm.oldType === undefined && this.editForm.type === undefined){ |
|
|
|
|
this.$message.warning("请选择重新填写类型或选择已有类型") |
|
|
|
|
if(this.editForm.oldType === undefined ){ |
|
|
|
|
this.$message.warning("请选择已有类型") |
|
|
|
|
boer =false; |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
if(this.editForm.oldType === '' && this.editForm.type === undefined){ |
|
|
|
|
this.$message.warning("请选择重新填写类型或选择已有类型") |
|
|
|
|
if(this.editForm.oldType === '' ){ |
|
|
|
|
this.$message.warning("请选择已有类型") |
|
|
|
|
boer =false; |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
if(this.editForm.oldType === '' && this.editForm.type === ''){ |
|
|
|
|
this.$message.warning("请选择重新填写类型或选择已有类型") |
|
|
|
|
boer =false; |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
if(this.editForm.oldType !== undefined && this.editForm.type !== undefined && this.editForm.typecn !== undefined){ |
|
|
|
|
if(this.editForm.oldType !== '' && this.editForm.type !== '' && this.editForm.typecn !== ''){ |
|
|
|
|
this.$message.warning("选择了已有类型不用在添加类型") |
|
|
|
|
boer =false; |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// if(this.editForm.oldType === '' && this.editForm.type === ''){ |
|
|
|
|
// this.$message.warning("请选择已有类型") |
|
|
|
|
// boer =false; |
|
|
|
|
// return ; |
|
|
|
|
// } |
|
|
|
|
// if(this.editForm.oldType !== undefined && this.editForm.type !== undefined && this.editForm.typecn !== undefined){ |
|
|
|
|
// if(this.editForm.oldType !== '' && this.editForm.type !== '' && this.editForm.typecn !== ''){ |
|
|
|
|
// this.$message.warning("选择了已有类型不用在添加类型") |
|
|
|
|
// boer =false; |
|
|
|
|
// return ; |
|
|
|
|
// } |
|
|
|
|
// |
|
|
|
|
// } |
|
|
|
|
if(boer){ |
|
|
|
|
let param = Object.assign( |
|
|
|
|
this.editForm); |
|
|
|
|
console.log(param); |
|
|
|
|
addInterest(param).then((res) => { |
|
|
|
|
this.dialogVisible = false; |
|
|
|
|
this.onSubmit(); |
|
|
|
|
this.$message.success("添加成功"); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|