合并冲突

applications/dee-mes/src/privateComponents/components/Creator/index.vue

@@ -34,7 +34,7 @@ export default {
   },
   data() {
     return {
-      creatorId: null,
+      creatorId: localStorage.getItem('userId'),
       disabledVal: false,
       option: {
         id: localStorage.getItem('userId'),
@@ -59,13 +59,11 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      if (!this.form.creatorId) {
-        this.creatorId = localStorage.getItem('userId')
-      } else {
-        this.creatorId = this.form.creator.userName
+      if (this.form.creatorId) {
+        this.creatorId = this.form.creator.id
       }
-    })
       this.$emit('input', this.creatorId)
+    })
   },
   methods: {
   }