解决冲突

pull/24/head
lukeyan 1 year ago
commit 823117b31a

@ -121,9 +121,6 @@
</el-form-item> </el-form-item>
<el-form-item label="纬度" prop="latitude"> <el-form-item label="纬度" prop="latitude">
<el-input v-model="form.latitude"></el-input> <el-input v-model="form.latitude"></el-input>
</el-form-item>
<el-form-item>
</el-form-item> </el-form-item>
<el-form-item label="企业地址"> <el-form-item label="企业地址">
<el-input v-model="form.companyAddress"></el-input> <el-input v-model="form.companyAddress"></el-input>
@ -230,6 +227,7 @@ export default {
this.$refs["company_position_form"].resetFields(); this.$refs["company_position_form"].resetFields();
this.$refs["jurisdiction_form"].resetFields(); this.$refs["jurisdiction_form"].resetFields();
this.dialogTitle = "新建"; this.dialogTitle = "新建";
this.form = {};
} else if (num === 2) { } else if (num === 2) {
this.dialogTitle = "查看档案"; this.dialogTitle = "查看档案";
} else if (num === 3) { } else if (num === 3) {
@ -237,7 +235,6 @@ export default {
console.log("item", item); console.log("item", item);
this.imageUrl = item.picUrl; this.imageUrl = item.picUrl;
this.form = Object.assign(this.form, item); this.form = Object.assign(this.form, item);
console.log("form123", this.form);
} }
}, },
getCheck() { getCheck() {
@ -325,6 +322,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
this.$message.success("编辑成功"); this.$message.success("编辑成功");
this.visible = false; this.visible = false;
this.form = {};
} else { } else {
this.$message.warning("编辑失败"); this.$message.warning("编辑失败");
} }

Loading…
Cancel
Save