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

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -112,7 +112,7 @@
               </div>
               <div style="display: inline-block; margin-right: 2px">
                 <span v-if="scope.row.dicomInfo.modality.length > 0">{{ scope.row.dicomInfo.modality.join('、')
-                  }},</span>
+                }},</span>
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
@@ -1130,6 +1130,7 @@ export default {
       return new Promise(function (resolve, reject) {
         try {
           let subjectVisitId = null
+          let dicomInfo = {}
           if (scope.VisitTaskId) {
             scope.StudyInstanceUidList.forEach((item) => {
               if (item.VisitTaskId === scope.VisitTaskId) {
@@ -1159,7 +1160,7 @@ export default {
             .then(async (res) => {
               scope.uploadQueues[index].dicomInfo.failedFileCount = 0
               scope.$set(scope.uploadQueues[index].dicomInfo, 'isInit', true)
-              let dicomInfo = scope.uploadQueues[index].dicomInfo
+              dicomInfo = scope.uploadQueues[index].dicomInfo
               let seriesNum = scope.uploadQueues[index].seriesList.length
               let fileNum = scope.uploadQueues[index].fileList.length
               let seriesList = scope.uploadQueues[index].seriesList
@@ -1206,7 +1207,7 @@ export default {
                   patientId: dicomInfo.patientId,
                   patientName: '',
                   patientAge: dicomInfo.patientAge,
-                  patientSex: config.DicomStoreInfo.SubjectSex || dicomInfo.patientSex,
+                  patientSex: config?.DicomStoreInfo.SubjectSex || dicomInfo.patientSex,
                   accessionNumber: dicomInfo.accNumber,
                   patientBirthDate: '',
                   acquisitionTime: dicomInfo.acquisitionTime,

src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue

@@ -56,7 +56,7 @@
                 <el-form-item :label="$t('trials:researchRecord:ImageManual:Equipment')">
                     <el-radio-group v-model="form.IsCloseEquipmentSurvey" @input="handleInput">
                         <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label
-                            }}</el-radio>
+                        }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
             </el-form>
@@ -199,6 +199,14 @@ export default {
                 EfficacyEvaluatorType: false,
                 IsFollowStudyParameters: false,
                 NotFollowReson: false,
+                IsRoutineMRIPDEE: false,
+                MRIPDFFScanTime: false,
+                MRIPDFFLeadTime: false,
+                MRIPDFFOther: false,
+                IsAuthorizeRadiologistsParticipate: false,
+                AssignFixedTechnologists: false,
+                ISStrictManualBurnFlag: false,
+                NotStrictManualBurnFlagReason: false, 
             },
             loading: false
         }

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -39,8 +39,9 @@
         </el-form-item>
         <!-- 受试者中止状态 -->
         <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:IsSubjectQuit')">
-          <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
-            <el-option v-for="item of $d.Subject_Visit_Status" :value="item.value" :label="item.label" :key="item.label" />
+          <el-select v-model="searchData.SubjectStatus" clearable style="width: 120px">
+            <el-option v-for="item of $d.Subject_Visit_Status" :value="item.value" :label="item.label"
+              :key="item.label" />
           </el-select>
         </el-form-item>
         <!-- 审核状态 -->
@@ -875,6 +876,7 @@ const searchDataDefault = () => {
     SubmitState: null,
     ChallengeState: null,
     IsSubjectQuit: "",
+    SubjectStatus: null
     // SortField: '',
     // Asc: false
   }
@@ -1022,7 +1024,7 @@ export default {
   methods: {
     // 申请影像退回
     async imageBack(row) {
-      try { 
+      try {
         let title = `${this.$t('trials:crcUpload:confirmMessage:imageBackTitle').replace('xxx', row.SubjectCode).replace('yyy', row.VisitName)}`
         this.$prompt(`<p style="margin-left: 5px;">${title}</p><span style="color:#F56C6C">*</span><span>${this.$t("trials:crcUpload:confirmMessage:ApplyReason")}</span>`, this.$t("trials:crcUpload:confirmMessage:imageBack"), {
           confirmButtonText: this.$t("common:button:save"),