MIM关闭医学审核任务逻辑更改

src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue

@@ -209,24 +209,28 @@ export default {
   },
   methods: {
     // 初始化聊天信息
-    getMessageList() {
+    async getMessageList() {
+      try {
         this.loading = true
         var param = {
           taskMedicalReviewId: this.taskMedicalReviewId
         }
-      getMedicalReviewDialog(param).then(res => {
+        let res = await getMedicalReviewDialog(param)
         this.otherInfo = res.OtherInfo
         this.recordContent = res.Result
         this.setScrollHeight()
         this.loading = false
-      }).catch(() => {
+      } catch(e) {
+        console.log(e)
         this.loading = false
-      })
+      }
     },
     setScrollHeight() {
       setTimeout(() => {
         var container = document.querySelectorAll('.chat-content')[0]
+        if (container && container.scrollHeight) {
           container.scrollTop = container.scrollHeight
+        }
       }, 100)
     },
     // 回复质疑

src/views/trials/trials-panel/reading/mim-medical-audit/components/CloseQC.vue

@@ -80,26 +80,32 @@ export default {
     handleClose() {
       this.$emit('close')
     },
-    handleSave() {
+    async handleSave() {
-      this.$refs['closeQCForm'].validate((valid) => {
+      let validate = await this.$refs['closeQCForm'].validate()
-        if (!valid) return
+      if (!validate) return
-        this.loading = true
       this.form.TaskMedicalReviewId = this.taskMedicalReviewId
       this.form.IsClosedDialog = true
-        closedMedicalReviewDialog(this.form)
+      this.$emit('closeAndSign', this.form)
-          .then(res => {
+    },
-            this.loading = false
+    // handleSave() {
-            if (res.IsSuccess) {
+    //   this.$refs['closeQCForm'].validate((valid) => {
-              // 关闭成功!
+    //     if (!valid) return
-              this.$message.success(this.$t('trials:qcQuality:message:closedSuccessfully'))
+    //     this.loading = true
-              this.$emit('close')
+    //     this.form.TaskMedicalReviewId = this.taskMedicalReviewId
-              this.$emit('refresh')
+    //     this.form.IsClosedDialog = true
-            }
+    //     closedMedicalReviewDialog(this.form)
-          }).catch(() => {
+    //       .then(res => {
-            this.loading = false
+    //         this.loading = false
-          })
+    //         if (res.IsSuccess) {
-      })
+    //           // 关闭成功!
-    }
+    //           this.$message.success(this.$t('trials:qcQuality:message:closedSuccessfully'))
+    //           this.$emit('refresh')
+    //         }
+    //       }).catch(() => {
+    //         this.loading = false
+    //       })
+    //   })
+    // }
   }
 }
 </script>

src/views/trials/trials-panel/reading/mim-medical-audit/index.vue

@@ -553,8 +553,8 @@
     >
       <CloseQC
         :task-medical-review-id="currentRow.Id"
+        @closeAndSign="closeAndSign"
         @close="closeQuestionVisible = false"
-        @refresh="refresh"
       />
     </el-dialog>
     <!--签名框 -->
@@ -645,7 +645,8 @@ export default {
       signCode: null,
       currentUser: zzSessionStorage.getItem('userName'),
       signVisible: false,
-      timeList: []
+      timeList: [],
+      closeObj: null
     }
   },
   watch: {
@@ -697,6 +698,12 @@ export default {
         this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
       }).catch(() => {})
     },
+    closeAndSign(obj) {
+      this.closeObj = Object.assign({}, obj)
+      const { MedicalAudit } = const_.processSignature
+      this.signCode = MedicalAudit
+      this.signVisible = true
+    },
     // 关闭签名框并设置确认状态
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
@@ -706,38 +713,39 @@ export default {
       }
     },
     // 签名确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
+      try {
         this.loading = true
         const params = {
           data: {
-          taskMedicalReviewId: this.currentRow.Id
+            taskMedicalReviewId: this.currentRow.Id,
+            isClosedDialog: this.closeObj.IsClosedDialog,
+            medicalDialogCloseEnum: this.closeObj.MedicalDialogCloseEnum,
+            dialogCloseReason: this.closeObj.DialogCloseReason,
           },
           signInfo: signInfo
         }
-      FinishMedicalReview(params).then(res => {
+        let res = await FinishMedicalReview(params)
         if (res.IsSuccess) {
+          await this.$refs['chatForm'].getMessageList()
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.$refs['signForm'].btnLoading = false
           this.signVisible = false
           this.$nextTick(() => {
+            this.closeQuestionVisible = false
             this.chatForm.visible = false
           })
+          await this.getList()
+          this.$emit('nextTask', this.taskMedicalReviewId)
         }
         this.loading = false
-        this.getList()
-          .then(() => {
-            this.loading = true
-            this.$emit('nextTask', this.taskMedicalReviewId)
-          })
-          .catch(action => {
 
-          })
+      } catch(e) {
-      }).catch(_ => {
         this.loading = false
         if (this.$refs['signForm']) {
           this.$refs['signForm'].btnLoading = false
         }
-      })
+      }
     },
     changeTimeList() {
       if (this.timeList) {