From 88a401540460085f6f16137b4d4fff7f1fcf0cb0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 21 Jul 2022 17:30:40 +0800
Subject: [PATCH] 冲突
---
src/views/life/life.vue | 8 ++------
src/views/architecture/architecture.vue | 1 +
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/views/architecture/architecture.vue b/src/views/architecture/architecture.vue
index 5f47478..c0e730b 100644
--- a/src/views/architecture/architecture.vue
+++ b/src/views/architecture/architecture.vue
@@ -317,6 +317,7 @@
this.form["jd"] = res[0]
this.form["wd"] = res[1]
this.form["addressName"] = res[2]
+ this.form["address"] = res[2]
},
rowSave (row, done, loading) {
diff --git a/src/views/life/life.vue b/src/views/life/life.vue
index fbc891e..9966a40 100644
--- a/src/views/life/life.vue
+++ b/src/views/life/life.vue
@@ -357,13 +357,9 @@
this.form["jd"] = res[0]
this.form["wd"] = res[1]
this.form["addressName"] = res[2]
+ this.form["address"] = res[2]
},
- initData () {
- getDeptTree().then((res) => {
- const column = this.findObject(this.option.column, "type")
- column.dicData = res.data.data
- })
- },
+
rowSave (row, done, loading) {
var d = []
// var dk = [];
--
Gitblit v1.9.3