Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/api/trials.js

@@ -4453,7 +4453,7 @@ export function editPatientInfo(data) {
 //修正患者基本信息
 export function amendmentPatientInfo(data) {
   return request({
-    url: `/Study/amendmentPatientInfo`,
+    url: `/Inspection/Study/amendmentPatientInfo`,
     method: 'post',
     data
   })

src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue

@@ -358,6 +358,19 @@
         <PreviewFile v-if="previewObj.visible" :file-path="previewObj.filePath" :file-type="previewObj.fileType" />
       </div>
     </el-dialog>
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
+      append-to-body custom-class="base-dialog-wrapper">
+      <div slot="title">
+        <span style="font-size: 18px">{{
+          $t('common:dialogTitle:sign')
+        }}</span>
+        <span style="font-size: 12px; margin-left: 5px">{{
+          `(${$t('common:label:sign')}${currentUser})`
+        }}</span>
+      </div>
+      <SignForm ref="signForm" :sign-code-enum="signCode" :subject-visit-id="subjectVisitId"
+        @closeDialog="closeSignDialog" />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -378,7 +391,9 @@ import PreviousOther from './previousOther'
 import PreviousFiles from './previousFiles'
 import clinicalDataQuestions from '@/components/clinicalDataQuestions'
 import PreviewFile from '@/components/PreviewFile/index'
+import SignForm from '@/views/trials/components/newSignForm'
 import moment from 'moment'
+import const_ from '@/const/sign-code'
 export default {
   name: 'uploadPetClinicalData',
   components: {
@@ -388,6 +403,7 @@ export default {
     PreviousFiles,
     clinicalDataQuestions,
     PreviewFile,
+    SignForm
   },
   props: {
     data: {
@@ -489,7 +505,10 @@ export default {
         ],
       },
       formLoading: false,
-      isPatientFormCanEdit: false
+      isPatientFormCanEdit: false,
+      signVisible: false,
+      signCode: '',
+      currentUser: zzSessionStorage.getItem('userName')
     }
   },
   mounted() {
@@ -845,24 +864,47 @@ export default {
       try {
         let valid = await this.$refs.patientForm.validate()
         if (!valid) return
-        this.formLoading = true
-        let res = null
         if (this.isAudit) {
-          res = await amendmentPatientInfo(this.formData)
+          const { CorrectImageExaminationInformation } = const_.processSignature
+          this.signCode = CorrectImageExaminationInformation
+          this.signVisible = true
         } else {
-          res = await editPatientInfo(this.formData)
-        }
-        this.formLoading = false
-        if (res && res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.formLoading = true
+          let res = await editPatientInfo(this.formData)
+          this.formLoading = false
+          if (res && res.IsSuccess) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$emit('close')
+          }
         }
+        
       } catch(e) {
         this.formLoading = false
         console.log(e)
       }
       
+    },
+    async closeSignDialog(isSign, signInfo) {
+      try {
+        if (isSign) {
+          let data = {
+            data: this.formData,
+            signInfo
+          }
+          let res = await amendmentPatientInfo(data)
+          if (res && res.IsSuccess) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.signVisible = false
+            this.$emit('close')
+          }
+        } else {
+          this.signVisible = false
+        }
+      } catch(e) {
+        console.log(e)
+      }
     }
-  },
+  }
 }
 </script>
 <style lang="scss">

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -921,7 +921,7 @@
     </div>
     <!--petct临床数据预览-->
     <el-dialog v-if="petVisible" :show-close="true" :visible.sync="petVisible" append-to-body>
-      <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="rowData" :allow-add-or-edit="false" :isPatientFormAllowEdit="isAuditToEdit" :isAudit="isAuditToEdit"/>
+      <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="rowData" :allow-add-or-edit="false" :isPatientFormAllowEdit="isAuditToEdit" :isAudit="isAuditToEdit" @close="petVisible = false"/>
     </el-dialog>
   </div>
 </template>