冲突

shuishen

2022-07-21 88a401540460085f6f16137b4d4fff7f1fcf0cb0

冲突

 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) {

 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 = [];