diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 42a39ad53..90a91b04b 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -790,6 +790,7 @@ export default { return; } if (this.taskId > 0) { + // 如果当前打开着任务窗口则关闭对话窗口 this.$store.dispatch("openDialog", 0); } this.$store.dispatch("openTask", this.dialogData.group_info.id); diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 56e260d5b..5a4b84a4a 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1082,7 +1082,7 @@ export default { this.$refs.upload.handleClick() }, - msgDialog() { + msgDialog(msgText = null) { if (this.sendLoad > 0) { return; } @@ -1106,14 +1106,15 @@ export default { $A.onBlur(); this.$store.state.dialogMsgTransfer = { time: $A.Time() + 10, - msgText: this.msgText, + msgRecord: this.msgRecord, msgFile: this.msgFile, - msgRecord: this.msgRecord + msgText: typeof msgText === 'string' && msgText ? msgText : this.msgText, }; this.msgRecord = {}; this.msgFile = []; this.msgText = ""; if (this.dialogId > 0) { + // 如果当前打开着对话窗口则关闭任务窗口 this.$store.dispatch("openTask", 0); } this.$store.dispatch('openDialog', data.dialog_id) @@ -1183,9 +1184,9 @@ export default { this.msgDialog() }, - onSend() { + onSend(msgText) { this.$refs.chatInput && this.$refs.chatInput.hidePopover(); - this.msgDialog(); + this.msgDialog(msgText); }, deleteFile(file) {