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

.env.usa

@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-14/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-29/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false

src/views/trials/trials-list/index.vue

@@ -457,7 +457,7 @@
           min-width="160"
         />
         <el-table-column
-          v-if="hasPermi(['role:iqc'])"
+          v-if="hasPermi(['role:mim'])"
           prop="MIM_UrgentCount"
           :label="$t('trials:trials-list:table:MIM_UrgentCount')"
           show-overflow-tooltip

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -69,7 +69,7 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:status')"
-          width="100"
+          width="140"
           sortable="custom"
         >
           <template slot-scope="scope">
@@ -78,10 +78,12 @@
                 v-model="scope.row.IsEnable"
                 :active-value="true"
                 :inactive-value="false"
+                :active-text="$fd('IsEnable', true)"
+                :inactive-text="$fd('IsEnable', false)"
                 @change="(v) => {return isEnableChange(scope.row, v)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span> {{$fd('IsEnable', scope.row.IsEnable)}}</span>
+              <!-- <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span> -->
             </div>
           </template>
         </el-table-column>
@@ -124,11 +126,13 @@
                 v-model="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"
                 :active-value="true"
                 :inactive-value="false"
+                :active-text="$fd('YesOrNo', true)"
+                :inactive-text="$fd('YesOrNo', false)"
                 @change="(v) => {return isConsistencyChange(scope.row, ite, v, true)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
+              <!-- <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
-              <span v-else> {{$fd('YesOrNo',false)}}</span>
+              <span v-else> {{$fd('YesOrNo',false)}}</span> -->
             </template>
           </el-table-column>
           <el-table-column

src/views/trials/trials-panel/reading/consistency-analysis/index.vue

@@ -635,6 +635,7 @@
         :title="$t('trials:reviewTrack:button:export')"
         :visible.sync="exportVisible"
         :close-on-click-modal="false"
+        width="35%"
         append-to-body>
         <exportList :trial-reading-criterion-id="TrialReadingCriterionId" @handleExport="handleExport"/>
       </el-dialog>

src/views/trials/trials-workbench/index.vue

@@ -247,6 +247,8 @@
           </div>
         </div>
         <div style="width: auto;flex:1;padding: 0 20px">
+          <!-- 加急影像提交 -->
+          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
           <!-- PM/APM -->
           <!-- 阅片期 -->
           <!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
@@ -275,8 +277,6 @@
             <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 影像重传 -->
             <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-          <!-- 加急影像提交 -->
-            <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
           <!-- IQC -->
           <!-- 影像质控 -->
             <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />