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

src/views/trials/trials-inspection/components/research-trials-list.vue

@@ -37,21 +37,21 @@
         prop="ResearchProgramNo"
         :label="$t('trials:trials-list:table:researchNumber')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="120"
       ></el-table-column>
       <!--试验名称-->
       <el-table-column
         prop="ExperimentName"
         :label="$t('trials:trials-list:table:experimentName')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="120"
       ></el-table-column>
       <!--申办方-->
       <el-table-column
         prop="Sponsor"
         :label="$t('trials:trials-list:table:sponsor')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="120"
       ></el-table-column>
       <!--匹配受试者编号-->
       <el-table-column
@@ -65,21 +65,21 @@
         prop="ShortName"
         :label="$t('trials:researchStaff:table:Name')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="120"
       ></el-table-column>
       <!--年龄-->
       <el-table-column
         prop="Age"
         :label="$t('trials:subject:table:age')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="120"
       ></el-table-column>
       <!--性别-->
       <el-table-column
         prop="Sex"
         :label="$t('trials:subject:table:gender')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="100"
       >
         <template slot-scope="scope">
           <span>{{ $fd("sex", scope.row.Sex) }}</span>
@@ -90,27 +90,19 @@
         prop="TrialStatusStr"
         :label="$t('trials:trials-list:table:status')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="100"
       >
         <template slot-scope="scope">
           <el-tag
-            v-if="scope.row.TrialStatusStr === 'Initializing'"
-            type="info"
+            :type="
+              ['info', 'primary', 'warning', 'danger'][
+                ['Initializing', 'Ongoing', 'Completed', 'Stopped'].indexOf(
+                  scope.row.TrialStatusStr
+                )
+              ]
+            "
             >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
           >
-          <el-tag
-            v-if="scope.row.TrialStatusStr === 'Ongoing'"
-            type="primary"
-            >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
-          >
-          <el-tag
-            v-if="scope.row.TrialStatusStr === 'Completed'"
-            type="warning"
-            >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
-          >
-          <el-tag v-if="scope.row.TrialStatusStr === 'Stopped'" type="danger">{{
-            $fd("TrialStatusEnum", scope.row.TrialStatusStr)
-          }}</el-tag>
         </template></el-table-column
       >
       <!--加入时间-->
@@ -121,7 +113,7 @@
         min-width="140"
       ></el-table-column>
       <!--操作-->
-      <el-table-column :label="$t('common:action:action')" width="250">
+      <el-table-column :label="$t('common:action:action')" width="100">
         <template slot-scope="scope">
           <!-- 详情 -->
           <el-button

src/views/trials/trials-inspection/components/view-study-list.vue

@@ -75,7 +75,7 @@
         prop="Description"
         :label="$t('trials:inspection:table:studyDescription')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="120"
         sortable="custom"
       ></el-table-column>
       <!--检查类型-->
@@ -84,7 +84,7 @@
         prop="Modalities"
         :label="$t('trials:audit:table:modality')"
         show-overflow-tooltip
-        min-width="140"
+        min-width="120"
         sortable="custom"
       ></el-table-column>
       <!--Called AE-->
@@ -131,7 +131,7 @@
         sortable="custom"
       ></el-table-column>
       <!--操作-->
-      <el-table-column :label="$t('common:action:action')" width="250">
+      <el-table-column :label="$t('common:action:action')" width="100">
         <template slot-scope="scope">
           <!-- 影像 -->
           <el-button

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

@@ -113,7 +113,7 @@
           prop="PatientIdStr"
           :label="$t('trials:uploadDicomList:table:pId')"
           show-overflow-tooltip
-          min-width="140"
+          min-width="120"
           sortable="custom"
         ></el-table-column>
         <!--患者姓名-->
@@ -121,7 +121,7 @@
           prop="PatientName"
           :label="$t('trials:uploadDicomList:table:patientName')"
           show-overflow-tooltip
-          min-width="140"
+          min-width="120"
           sortable="custom"
         ></el-table-column>
         <!--出生日期-->
@@ -129,7 +129,7 @@
           prop="PatientBirthDate"
           :label="$t('trials:inspection:table:birthdate')"
           show-overflow-tooltip
-          min-width="140"
+          min-width="120"
           sortable="custom"
         ></el-table-column>
         <!--性别-->
@@ -137,7 +137,7 @@
           prop="PatientSex"
           :label="$t('trials:trials-myinfo:form:gender')"
           show-overflow-tooltip
-          min-width="140"
+          min-width="100"
           sortable="custom"
         >
           <template slot-scope="scope">
@@ -149,7 +149,7 @@
           prop="CalledAEList"
           :label="$t('trials:inspection:table:CalledAE')"
           show-overflow-tooltip
-          min-width="140"
+          min-width="120"
         >
           <template slot-scope="scope">
             <span
@@ -166,7 +166,7 @@
           prop="CallingAEList"
           :label="$t('trials:inspection:table:CallingAE')"
           show-overflow-tooltip
-          min-width="140"
+          min-width="120"
         >
           <template slot-scope="scope">
             <span
@@ -185,7 +185,7 @@
           prop="TrialList"
           :label="$t('trials:trials-list:table:researchName')"
           show-overflow-tooltip
-          min-width="160"
+          min-width="120"
         >
           <template slot-scope="scope">
             <el-button
@@ -208,7 +208,7 @@
           prop="StudyCount"
           :label="$t('trials:studyList:table:count')"
           show-overflow-tooltip
-          min-width="160"
+          min-width="100"
           sortable="custom"
         >
           <template slot-scope="scope">
@@ -227,11 +227,11 @@
           prop="LatestPushTime"
           :label="$t('trials:inspection:table:latestReceiveTime')"
           show-overflow-tooltip
-          min-width="140"
+          min-width="180"
           sortable="custom"
         ></el-table-column>
         <!--操作-->
-        <el-table-column :label="$t('common:action:action')" width="250">
+        <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
               circle

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

@@ -96,13 +96,13 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="PublishUserName"
           min-width="100"
           :label="$t('trials:notice:table:publisher')"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           prop="PublishedTime"
           min-width="100"
@@ -117,7 +117,7 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <el-table-column
+        <!-- <el-table-column
           prop="FileName"
           min-width="100"
           :label="$t('trials:notice:table:appendix')"
@@ -132,7 +132,7 @@
               >{{ scope.row.FileName }}</a
             >
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           prop="IsRead"
           min-width="100"

src/views/trials/trials-panel/reading/pending-review/index.vue

@@ -189,6 +189,7 @@
                 :label="$t('trials:researchStaff:table:Name')"
                 show-overflow-tooltip
                 sortable="custom"
+                min-width="120"
               />
               <!-- 任务名称 -->
               <el-table-column

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

@@ -188,6 +188,7 @@
                 :label="$t('trials:researchStaff:table:Name')"
                 show-overflow-tooltip
                 sortable="custom"
+                min-width="120"
               />
               <!-- 任务名称 -->
               <el-table-column

src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue

@@ -27,6 +27,10 @@
         <el-form-item :label="$t('trials:staff:table:organization')">
           <el-input v-model="listQuery.OrganizationName" class="mr" clearable />
         </el-form-item>
+        <!-- 邮箱 -->
+        <el-form-item :label="$t('trials:staff:table:email')">
+          <el-input v-model="listQuery.Email" class="mr" clearable />
+        </el-form-item>
         <!-- 状态 -->
         <el-form-item :label="$t('trials:staff:table:status')">
           <el-select v-model="listQuery.IsDeleted" clearable class="mr">
@@ -350,6 +354,7 @@ const getListQueryDefault = () => {
     UserName: "",
     UserTypeId: "",
     OrganizationName: "",
+    Email: "",
     IsDeleted: null,
     PageIndex: 1,
     PageSize: 20,