部分1问题修复

src/utils/request-download.js

@@ -15,7 +15,7 @@ service.interceptors.request.use(
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
-    console.log(config.headers)
+    // console.log(config.headers)
     if (store.getters.token) {
       config.headers.Authorization = `Bearer ${store.getters.token}`
     }

src/views/system/notice/components/from.vue

@@ -62,10 +62,10 @@
             size="small"
           >
             <el-option
-              v-for="item of $d.UserType"
+              v-for="item of roleList"
-              :key="item.id"
+              :key="item.Id"
-              :label="item.label"
+              :label="item.UserTypeShortName"
-              :value="item.id"
+              :value="item.Id"
             />
           </el-select>
         </el-form-item>

src/views/system/notice/index.vue

@@ -60,10 +60,10 @@
             size="small"
           >
             <el-option
-              v-for="item of $d.UserType"
+              v-for="item of roleList"
-              :key="item.id"
+              :key="item.Id"
-              :label="item.label"
+              :label="item.UserTypeShortName"
-              :value="item.id"
+              :value="item.Id"
             />
           </el-select>
         </el-form-item>
@@ -438,7 +438,11 @@ export default {
     getUserTypeRoleList() {
       getUserTypeRoleList({})
         .then((res) => {
-          this.roleList = res.Result;
+          this.roleList = res.Result.map((item) => {
+            if ([4, 5, 8, 9, 12, 14].includes(item.UserTypeEnum)) {
+              return item;
+            }
+          }).filter((item) => item);
         })
         .catch(() => {});
     },

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

@@ -150,6 +150,14 @@
           sortable="custom"
           show-overflow-tooltip
         />
+        <!-- 阅片标准 -->
+        <el-table-column
+          prop="TrialReadingCriterionName"
+          :label="$t('trials:adReview:table:TrialReadingCriterionName')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 任务状态 -->
         <el-table-column
           prop="TaskState"

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -317,7 +317,7 @@ export default {
       loading: false,
       total: 0,
       // 修改检查
-      reportBtnLoading: false,
+      reportFlag: {},
     };
   },
   created() {
@@ -331,16 +331,21 @@ export default {
     },
     // 评估报告
     async showReport(item) {
-      if (this.reportBtnLoading) return;
+      if (this.reportFlag[item.Id]) return;
       let data = {
         VisitTaskId: item.Id,
       };
       try {
-        this.reportBtnLoading = true;
+        if (!this.reportFlag.hasOwnProperty(item.Id)) {
+          this.$set(this.reportFlag, item.Id, true);
+        }
+        if (!this.reportFlag[item.Id]) {
+          this.reportFlag[item.Id] = true;
+        }
         let res = await downLoadReadReport(data);
-        this.reportBtnLoading = false;
+        this.reportFlag[item.Id] = false;
       } catch (err) {
-        this.reportBtnLoading = false;
+        this.reportFlag[item.Id] = false;
         console.log(err);
       }
     },

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

@@ -8,9 +8,9 @@
           <el-input v-model="searchData.Code" style="width: 130px" clearable />
         </el-form-item>
         <!-- 患者编号 -->
-        <!-- <el-form-item :label="$t('trials:uploadDicomList:table:pId')">
+        <el-form-item :label="$t('trials:uploadDicomList:table:pId')">
-          <el-input v-model="searchData.Code" style="width: 130px" />
+          <el-input v-model="searchData.PatientIdStr" style="width: 130px" />
-        </el-form-item> -->
+        </el-form-item>
         <!-- 姓名 -->
         <el-form-item :label="$t('trials:researchStaff:table:Name')">
           <el-input
@@ -36,7 +36,7 @@
           </el-select>
         </el-form-item>
         <!-- 状态 -->
-        <el-form-item :label="$t('trials:subject:table:status')">
+        <!-- <el-form-item :label="$t('trials:subject:table:status')">
           <el-select v-model="searchData.Status" clearable style="width: 130px">
             <el-option
               v-for="item of $d.Subject_Visit_Status"
@@ -45,7 +45,7 @@
               :label="item.label"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -318,6 +318,7 @@ import patientStudyList from "./components/patient-study-list.vue";
 // import confirmVisitList from "../../../trials-inspection/components/confirm-visit-list.vue";
 const searchDataDefault = () => {
   return {
+    PatientIdStr: null,
     Code: "",
     Status: "",
     Sex: "",

src/views/trials/trials-panel/trial-summary/trial-information/index.vue

@@ -116,13 +116,13 @@
         <el-descriptions-item
           :label="$t('trials:trial-information:title:activationDate')"
         >
-          {{ trialInfo.AuthorizationDate }}
+          {{ otherInfo.ActiveTime }}
         </el-descriptions-item>
         <!--授权日期-->
         <el-descriptions-item
           :label="$t('trials:trials-list:table:dateAuthorized')"
         >
-          {{ trialInfo.AuthorizationDate }}
+          {{ otherInfo.AuthorizationDeadLineDate }}
         </el-descriptions-item>
       </el-descriptions>
       <el-button