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

src/views/trials/trials-list/components/activate-page.vue

@@ -210,7 +210,7 @@ export default {
       document.body.removeChild(eleLink);
     },
     downloadXmlFile() {
-      fileDownload(this.form.code, "激活码");
+      fileDownload(this.form.code, "_Activation_Code.lic");
     },
   },
 };

src/views/trials/trials-list/components/activate-project.vue

@@ -318,7 +318,7 @@ export default {
     },
     // 下载
     async getCode() {
-      fileDownload(this.form.Authorization, "项目码");
+      fileDownload(this.form.Authorization, "_Request_Code.req");
     },
     // 上传并读取文件
     uploadFile(file) {

src/views/trials/trials-panel/reading/read-task/index.vue

@@ -5,6 +5,22 @@
   >
     <div slot="search-container" style="position: relative">
       <el-form :inline="true">
+        <!-- 阅片标准 -->
+        <el-form-item :label="$t('trials:processCfg:form:criterion')">
+          <el-select
+            v-model="searchData.TrialReadingCriterionId"
+            clearable
+            filterable
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of trialCriterionList"
+              :key="item.TrialReadingCriterionId"
+              :label="item.TrialReadingCriterionName"
+              :value="item.TrialReadingCriterionId"
+            />
+          </el-select>
+        </el-form-item>
         <!-- 受试者编号 -->
         <el-form-item :label="$t('trials:reviewTrack:table:subjectCode')">
           <el-input
@@ -277,6 +293,7 @@
             <el-button
               v-hasPermi="['trials:readTask:reread']"
               circle
+              :disabled="scope.row.TaskState > 0"
               :title="$t('trials:readTask:button:reread')"
               icon="el-icon-collection"
               @click="openApplyReReading(scope.row)"

src/views/trials/trials-panel/reading/reread-task/index.vue

@@ -572,8 +572,8 @@ export default {
       changeURLStatic("TaskName", "");
     }
     this.trialId = this.$route.query.trialId;
-    this.getSite();
-    // this.getList()
+    // this.getSite();
+    this.getList();
     this.getTrialCriterionList();
   },
   methods: {
@@ -594,7 +594,7 @@ export default {
     getList() {
       this.loading = true;
       this.searchData.TrialId = this.trialId;
-      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
+      // this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
       getIRReReadingTaskList(this.searchData)
         .then((res) => {
           this.list = res.Result.CurrentPageData;