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

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

@@ -617,7 +617,7 @@ const searchDataDefault = () => {
     DoctorUserIdeaEnum: null,
     BeginAllocateDate: null,
     EndAllocateDate: null,
-    IsEffect: true
+    IsInvalid: false
   }
 }
 export default {

src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue

@@ -137,7 +137,7 @@
           prop="IsUrgent"
           :label="$t('trials:pmMedicalReview:table:isUrgent')"
           show-overflow-tooltip
-          width="120"
+          min-width="120"
           sortable="custom"
         >
           <template slot-scope="scope">
@@ -149,7 +149,7 @@
         <el-table-column
           prop="TrialSiteCode"
           :label="$t('trials:pmMedicalReview:table:siteCode')"
-          width="100"
+          min-width="100"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -157,7 +157,7 @@
         <el-table-column
           prop="SubjectCode"
           :label="$t('trials:pmMedicalReview:table:subjectCode')"
-          width="120"
+          min-width="120"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -172,7 +172,7 @@
         <el-table-column
           prop="VisitTaskNum"
           :label="$t('trials:pmMedicalReview:table:taskName')"
-          width="130"
+          min-width="130"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -195,7 +195,7 @@
         <el-table-column
           prop="ReadingCategory"
           :label="$t('trials:pmMedicalReview:table:taskType')"
-          width="140"
+          min-width="140"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -226,7 +226,7 @@
         <el-table-column
           prop="DoctorUser.UserName"
           :label="$t('trials:pmMedicalReview:table:reader')"
-          width="120"
+          min-width="120"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -238,7 +238,7 @@
         <el-table-column
           prop="ArmEnum"
           :label="$t('trials:pmMedicalReview:table:role')"
-          width="100"
+          min-width="100"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -255,7 +255,7 @@
         <el-table-column
           prop="MedicalManagerUser.UserName"
           :label="$t('trials:pmMedicalReview:table:mim')"
-          width="120"
+          min-width="120"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -267,7 +267,7 @@
         <el-table-column
           prop="AuditState"
           :label="$t('trials:pmMedicalReview:table:auditState')"
-          width="100"
+          min-width="100"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -281,7 +281,7 @@
         <el-table-column
           prop="IsHaveQuestion"
           :label="$t('trials:pmMedicalReview:table:IsHaveQuestion')"
-          width="120"
+          min-width="120"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -293,7 +293,7 @@
         <el-table-column
           prop="AuditAdviceEnum"
           :label="$t('trials:pmMedicalReview:table:auditAdvice')"
-          width="130"
+          min-width="130"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -305,7 +305,7 @@
         <el-table-column
           prop="DoctorUserIdeaEnum"
           :label="$t('trials:pmMedicalReview:table:whetherAgree')"
-          width="180"
+          min-width="180"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -318,7 +318,7 @@
         <el-table-column
           prop="AllocateTime"
           :label="$t('trials:pmMedicalReview:table:allocateTime')"
-          width="180"
+          min-width="180"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -326,7 +326,7 @@
         <el-table-column
           prop="AuditSignTime"
           :label="$t('trials:pmMedicalReview:table:auditSignTime')"
-          width="140"
+          min-width="140"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -335,7 +335,7 @@
         <el-table-column
           prop="TrialReadingCriterionName"
           :label="$t('trials:pmMedicalReview:table:criterionName')"
-          width="180"
+          min-width="180"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -368,7 +368,7 @@
         
         <el-table-column
           :label="$t('common:action:action')"
-          width="90"
+          min-width="90"
           fixed="right"
         >
           <template slot-scope="scope">
@@ -418,7 +418,7 @@ const searchDataDefault = () => {
     EndSignTime: null,
     AuditAdviceEnum: null,
     DoctorUserIdeaEnum: null,
-    IsInvalid: false
+    IsInvalid: true
   }
 }
 export default {

src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue

@@ -519,7 +519,7 @@ const searchDataDefault = () => {
     EndSignTime: null,
     AuditAdviceEnum: null,
     DoctorUserIdeaEnum: null,
-    IsInvalid: true,
+    IsInvalid: false,
     IsHaveQuestion:  null
   }
 }

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -986,7 +986,9 @@ export default {
                 let obj = this.trialBodyPartList.filter(
                   (item) => item.Code === data.Code
                 );
-                this.$refs.bodyPartTable.toggleRowSelection(obj[0]);
+                if(obj[0]){
+                  this.$refs.bodyPartTable.toggleRowSelection(obj[0]);
+                }
               });
               var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
                 return this.changeBodyPart(i.trim());