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

src/permission.js

@@ -26,7 +26,6 @@ router.beforeEach(async (to, from, next) => {
     to.query.trialId !==
     store.state.trials.config.trialId
   ) {
-    console.log(to.query.path)
     let res = await getTrialExtralConfig({
       TrialId: to.query.trialId,
     })

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

@@ -121,6 +121,24 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- 采集影像 -->
+      <el-form-item
+        :label="$t('trials:processCfg:form:CollectImagesEnum')"
+        prop="CollectImagesEnum"
+      >
+        <el-radio-group
+          v-model="form.CollectImagesEnum"
+          :disabled="form.IsTrialProcessConfirmed && !isEdit"
+        >
+          <el-radio
+            v-for="item of $d.CollectImagesType"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <!-- 修约小数位数 -->
       <!-- <el-form-item
         :label="$t('trials:processCfg:form:digitPlaces')"
@@ -1157,6 +1175,7 @@ export default {
         ClinicalDataTrialSetIds: [],
         ClinicalDataSetNamesStr: '',
         QCProcessEnum: null,
+        CollectImagesEnum: null,
         IsImageConsistencyVerification: null,
         ReadingMode: null,
         // ImagePlatform: null,
@@ -1189,6 +1208,13 @@ export default {
             trigger: 'blur',
           },
         ],
+        CollectImagesEnum: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         QCProcessEnum: [
           {
             required: true,
@@ -1455,6 +1481,14 @@ export default {
             this.initialForm.IsImageConsistencyVerification
           ),
         },
+        {
+          Name: this.$t('trials:processCfg:form:CollectImagesEnum'), // 采集影像
+          NewVal: this.$fd('CollectImagesType', this.form.CollectImagesEnum),
+          OldVal: this.$fd(
+            'CollectImagesType',
+            this.initialForm.CollectImagesEnum
+          ),
+        },
         // {
         //   Name: this.$t('trials:processCfg:form:criterion'), // 阅片标准
         //   NewVal: criterions.length > 0 ? criterions.join(', ') : '',

src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue

@@ -169,6 +169,7 @@
           <el-tab-pane
             :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
             name="dicom"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-dicom-files
               v-if="uploadVisible"
@@ -183,6 +184,7 @@
           <el-tab-pane
             :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
             name="non-dicom"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-non-dicom-files
               v-if="activeName === 'non-dicom'"
@@ -473,6 +475,13 @@ export default {
           this.uploadBtnLoading = false
           if (res.IsSuccess) {
             dicomStore.studyList = []
+            if (
+              [0, 1].includes(this.$store.state.trials.config.CollectImagesEnum)
+            ) {
+              this.activeName = 'dicom'
+            } else {
+              this.activeName = 'non-dicom'
+            }
             this.uploadVisible = true
           }
         })

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

@@ -118,6 +118,7 @@
           <el-tab-pane
             :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
             name="dicom"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-dicom-files :data="data" :subject-id="data.SubjectId" :subject-visit-id="data.Id" @close="closeUpload" @getList="reFreshList" />
           </el-tab-pane>
@@ -125,6 +126,7 @@
           <el-tab-pane
             :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
             name="non-dicom"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-non-dicom-files v-if="activeName==='non-dicom'" :data="data" :allow-add-or-edit="true" :body-parts="bodyParts" :modalities="modalities" :subject-visit-id="data.Id" @getList="reFreshList" />
           </el-tab-pane>
@@ -347,6 +349,11 @@ export default {
           this.uploadBtnLoading = false;
           if (res.IsSuccess) {
             dicomStore.studyList = [];
+            if ([0, 1].includes(this.$store.state.trials.config.CollectImagesEnum)) {
+              this.activeName = 'dicom'
+            } else {
+              this.activeName = 'non-dicom'
+            }
             this.uploadVisible = true;
           }
         })

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

@@ -742,15 +742,16 @@
             </el-button>
           </el-form-item>
         </el-form>
-        <div class="tip">
+        <!-- <div class="tip">
           <i class="el-icon-warning-outline"></i>
           <div v-html="$t('trials:uploadedDicoms:tip:message')"></div>
-        </div>
+        </div> -->
         <el-tabs v-model="activeName" type="border-card" style="flex: 1">
           <!-- DICOM影像上传 -->
           <el-tab-pane
             :label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
             name="dicom"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-dicom-files2
               :data="rowData"
@@ -766,6 +767,7 @@
           <el-tab-pane
             :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
             name="non-dicom"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
           >
             <upload-non-dicom-files
               v-if="activeName === 'non-dicom'"
@@ -890,8 +892,16 @@
           </el-form-item>
         </el-form>
         <!-- DICOM影像  -->
-        <h4 class="box-title">{{ $t('trials:crcUpload:label:dicom') }}</h4>
+        <h4
-        <el-card class="box-card">
+          class="box-title"
+          v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+        >
+          {{ $t('trials:crcUpload:label:dicom') }}
+        </h4>
+        <el-card
+          class="box-card"
+          v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           <StudyInfo
             v-if="rowData.Id"
             :data="rowData"
@@ -900,10 +910,17 @@
           />
         </el-card>
         <!-- 非DICOM影像 -->
-        <h4 class="box-title" style="margin-top: 10px">
+        <h4
+          class="box-title"
+          style="margin-top: 10px"
+          v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           {{ $t('trials:crcUpload:label:noneDicom') }}
         </h4>
-        <el-card class="box-card">
+        <el-card
+          class="box-card"
+          v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+        >
           <UploadNonDicomFiles
             v-if="rowData.Id"
             :data="rowData"
@@ -1929,7 +1946,12 @@ export default {
     },
     CRChandleUpload2(row) {
       dicomStore.studyList = []
+      if ([0, 1].includes(this.$store.state.trials.config.CollectImagesEnum)) {
         this.activeName = 'dicom'
+      } else {
+        this.activeName = 'non-dicom'
+      }
+
       this.rowData = { ...row }
       this.$store.state.trials.checkTaskId = row.Id
       this.uploadVisible = true

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -860,18 +860,33 @@
         </el-form>
         <div>
           <!-- DICOM影像 -->
-          <h4 class="box-title">{{ $t('trials:audit:tab:dicoms') }}</h4>
+          <h4
-          <el-card class="box-card">
+            class="box-title"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+          >
+            {{ $t('trials:audit:tab:dicoms') }}
+          </h4>
+          <el-card
+            class="box-card"
+            v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
+          >
             <DicomFiles v-if="rowData.Id" :data="rowData" />
           </el-card>
         </div>
 
         <div>
           <!-- 非DICOM影像 -->
-          <h4 class="box-title" style="margin-top: 10px">
+          <h4
+            class="box-title"
+            style="margin-top: 10px"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+          >
             {{ $t('trials:audit:tab:nonDicoms') }}
           </h4>
-          <el-card class="box-card">
+          <el-card
+            class="box-card"
+            v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
+          >
             <UploadNonDicomFiles
               v-if="rowData.Id"
               :body-parts="OtherInfo.BodyPartTypes"