Commit 14404fe6 authored by jingnan's avatar jingnan 👀

合并冲突

parent a675cd63
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
}, },
data() { data() {
return { return {
creatorId: null, creatorId: localStorage.getItem('userId'),
disabledVal: false, disabledVal: false,
option: { option: {
id: localStorage.getItem('userId'), id: localStorage.getItem('userId'),
...@@ -59,13 +59,11 @@ export default { ...@@ -59,13 +59,11 @@ export default {
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
if (!this.form.creatorId) { if (this.form.creatorId) {
this.creatorId = localStorage.getItem('userId') this.creatorId = this.form.creator.id
} else {
this.creatorId = this.form.creator.userName
} }
})
this.$emit('input', this.creatorId) this.$emit('input', this.creatorId)
})
}, },
methods: { methods: {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment