部分问题修复

2024-05-07 17:33:44 +08:00 · 2024-05-07 17:33:44 +08:00 · 0699b35a06
parent b3decf3439
commit 0699b35a06
10 changed files with 61 additions and 39 deletions
--- a/src/views/trials/trials-inspection/components/view-study-list.vue
+++ b/src/views/trials/trials-inspection/components/view-study-list.vue
@ -92,7 +92,7 @@
        prop="CalledAE"
        :label="$t('trials:inspection:table:CalledAE')"
        show-overflow-tooltip
-        min-width="140"
+        min-width="120"
      >
      </el-table-column>
      <!--Calling AE-->
@ -100,7 +100,7 @@
        prop="CallingAE"
        :label="$t('trials:inspection:table:CallingAE')"
        show-overflow-tooltip
-        min-width="140"
+        min-width="120"
      >
      </el-table-column>
      <!--序列数量-->
@ -109,7 +109,7 @@
        prop="SeriesCount"
        :label="$t('trials:audit:table:seriesCount')"
        show-overflow-tooltip
-        min-width="140"
+        min-width="100"
        sortable="custom"
      ></el-table-column>
      <!--图像数量-->
@ -118,7 +118,7 @@
        prop="InstanceCount"
        :label="$t('trials:audit:table:instanceCount')"
        show-overflow-tooltip
-        min-width="140"
+        min-width="100"
        sortable="custom"
      ></el-table-column>
      <!--检查日期-->
@ -127,7 +127,7 @@
        prop="StudyTime"
        :label="$t('trials:audit:table:studyDate')"
        show-overflow-tooltip
-        min-width="140"
+        min-width="180"
        sortable="custom"
      ></el-table-column>
      <!--操作-->
--- a/src/views/trials/trials-layout/components/noticeMarquee.vue
+++ b/src/views/trials/trials-layout/components/noticeMarquee.vue
@ -4,7 +4,7 @@
      ref="mar"
      hspace="0"
      direction="left"
-      width="500"
+      max-width="500"
      @mouseout="start()"
      @mouseover="stop()"
    >
--- a/src/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@ -121,6 +121,7 @@
            :key="item.Id"
            :label="item.CriterionName"
            :value="item.CriterionType"
+            :title="item.Description"
          />
        </el-select>
      </el-form-item>
@ -277,11 +278,11 @@ export default {
            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
            trigger: "blur",
          },
-          {
-            pattern: /^[\u4e00-\u9fa5a-zA-Z\/\\]+$/,
-            message: this.$t("trisals:trials-list:formRule:onlyEN"),
-            trigger: "blur",
-          },
+          // {
+          //   pattern: /^[\u4e00-\u9fa5a-zA-Z\/\\]+$/,
+          //   message: this.$t("trisals:trials-list:formRule:onlyEN"),
+          //   trigger: "blur",
+          // },
        ],
        TrialType: [
          {
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@ -145,12 +145,14 @@
          prop="TrialCode"
          :label="$t('trials:trials-list:table:trialId')"
          show-overflow-tooltip
+          min-width="100"
          sortable="custom"
        />
        <el-table-column
          prop="ResearchProgramNo"
          :label="$t('trials:trials-list:table:researchNumber')"
          show-overflow-tooltip
+          min-width="120"
          sortable="custom"
        />

@ -158,12 +160,14 @@
          prop="ExperimentName"
          :label="$t('trials:trials-list:table:experimentName')"
          show-overflow-tooltip
+          min-width="100"
          sortable="custom"
        />

        <el-table-column
          prop="Sponsor"
          :label="$t('trials:trials-list:table:sponsor')"
+          min-width="100"
          show-overflow-tooltip
          sortable="custom"
        />
@ -225,20 +229,28 @@
          show-overflow-tooltip
          v-if="hasPermi(['role:pm', 'role:pi', 'role:sr'])"
        />
+        <!--到期日-->
        <el-table-column
+          prop="AuthorizationDate"
+          :label="$t('trials:trials-list:table:dateAuthorized')"
+          show-overflow-tooltip
+          min-width="180"
+          sortable="custom"
+        />
+        <!-- <el-table-column
          prop="CreateTime"
          :label="$t('trials:trials-list:table:createDate')"
          show-overflow-tooltip
          sortable="custom"
-        />
+        /> -->
        <!--授权时长-->
-        <el-table-column
+        <!-- <el-table-column
          prop="AuthorizationDuration"
          :label="$t('trials:trials-list:form:projectCycle')"
          show-overflow-tooltip
          sortable="custom"
-        />
-        <el-table-column label="" min-width="150" align="left" fixed="right">
+        /> -->
+        <el-table-column label="" min-width="200" align="left" fixed="right">
          <template slot-scope="scope">
            <!-- 详情 -->
            <el-button
--- a/src/views/trials/trials-panel/hirVisit/index.vue
+++ b/src/views/trials/trials-panel/hirVisit/index.vue
@ -108,7 +108,7 @@
        height="100"
        @sort-change="handleSortByColumn"
      >
-        <el-table-column width="40">
+        <el-table-column min-width="20">
          <template slot-scope="scope">
            <i
              v-if="
@ -127,6 +127,7 @@
          :label="$t('trials:uploadMonitor:table:subjectId')"
          show-overflow-tooltip
          sortable="custom"
+          min-width="120"
        />
        <!-- 患者编号 -->
        <el-table-column
@ -153,6 +154,7 @@
          :label="$t('trials:researchStaff:table:Name')"
          show-overflow-tooltip
          sortable="custom"
+          min-width="100"
        />
        <!-- 性别 -->
        <el-table-column
@ -171,6 +173,7 @@
          :label="$t('trials:uploadMonitor:table:visitName')"
          show-overflow-tooltip
          sortable="custom"
+          min-width="100"
        >
          <template slot-scope="scope">
            <el-button type="text" @click="handleOpenStudyDialog(scope.row)">
@ -184,6 +187,7 @@
          :label="$t('trials:trials-panel:table:EarliestScanDate')"
          show-overflow-tooltip
          sortable="custom"
+          min-width="140"
        />
        <!-- 最晚拍片日期 -->
        <el-table-column
@ -191,6 +195,7 @@
          :label="$t('trials:linkedRP:table:latestScanDate')"
          show-overflow-tooltip
          sortable="custom"
+          min-width="120"
        />
        <!-- 状态 -->
        <el-table-column
@ -217,6 +222,7 @@
          prop="PackState"
          :label="$t('trials:hirVisit:table:PackState')"
          show-overflow-tooltip
+          min-width="100"
          sortable="custom"
        >
          <template slot-scope="scope">
@ -238,19 +244,20 @@
          prop="SubmitTime"
          :label="$t('trials:crcUpload:table:submitTime')"
          show-overflow-tooltip
+          min-width="100"
          sortable="custom"
        />
        <!--操作-->
        <el-table-column
          :label="$t('common:action:action')"
-          min-width="100"
+          min-width="200"
          fixed="right"
          v-if="
            hasPermi([
              'trials:trials-panel:hirVisit:edit',
              'trials:trials-panel:hirVisit:submit',
              'trials:trials-panel:hirVisit:remove',
-              'trials:trials-panel:hirVisit:downlaod',
+              'trials:trials-panel:hirVisit:download',
            ])
          "
        >
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@ -223,7 +223,7 @@
          show-overflow-tooltip
        />
        <!-- 申请状态 -->
-        <el-table-column
+        <!-- <el-table-column
          v-if="!hasPermi(['role:air'])"
          prop="ReReadingApplyState"
          :label="$t('trials:readTask:table:reReadingApplyState')"
@ -249,17 +249,19 @@
              $fd("ReReadingApplyState", scope.row.ReReadingApplyState)
            }}</el-tag>
          </template>
-        </el-table-column>
+        </el-table-column> -->
        <!--操作-->
        <el-table-column
          :label="$t('common:action:action')"
-          width="250"
+          min-width="100"
          fixed="right"
          v-if="
-            hasPermi(['trials:readTask:view']) ||
-            hasPermi(['trials:readTask:reread']) ||
-            hasPermi(['trials:readTask:report']) ||
-            hasPermi(['trials:readTask:auditRecord'])
+            hasPermi([
+              'trials:readTask:view',
+              'trials:readTask:reread',
+              'trials:readTask:report',
+              'trials:readTask:auditRecord',
+            ])
          "
        >
          <template slot-scope="scope">
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@ -193,21 +193,21 @@
        </template>
      </el-table-column>
      <!-- 授权时间 -->
-      <el-table-column
+      <!-- <el-table-column
        prop="CreateTime"
        :label="$t('trials:staff:table:authorizationTime')"
        show-overflow-tooltip
        sortable
        width="180"
-      />
+      /> -->
      <!-- 禁用时间 -->
-      <el-table-column
+      <!-- <el-table-column
        prop="DeletedTime"
        :label="$t('trials:staff:table:disableTime')"
        show-overflow-tooltip
        sortable
        min-width="60"
-      />
+      /> -->

      <el-table-column
        v-if="hasPermi(['trials:trials-panel:setting:personnel-manage:status'])"
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffForm.vue
@ -111,13 +111,13 @@
            min-width="100"
          />
          <!-- 用户名 -->
-          <!-- <el-table-column
+          <el-table-column
            prop="UserName"
            :label="$t('trials:staff:table:uid')"
            show-overflow-tooltip
            sortable="custom"
            min-width="100"
-          /> -->
+          />
          <!-- 电话 -->
          <el-table-column
            prop="Phone"
@ -139,7 +139,7 @@
            prop="OrganizationName"
            :label="$t('trials:staff:table:organization')"
            show-overflow-tooltip
-            min-width="100"
+            min-width="150"
            sortable="custom"
          />
          <!-- 用户类型 -->
--- a/src/views/trials/trials-panel/study/components/list.vue
+++ b/src/views/trials/trials-panel/study/components/list.vue
@ -94,14 +94,14 @@
        height="100"
        @sort-change="handleSortByColumn"
      >
-        <el-table-column type="index" width="40" />
+        <el-table-column type="index" width="30" />
        <!-- 受试者编号 -->
        <el-table-column
          prop="SubjectCode"
          :label="$t('trials:subject:table:subjectId')"
          show-overflow-tooltip
          sortable="custom"
-          min-width="100"
+          min-width="120"
        />
        <!-- 患者编号 -->
        <el-table-column
@ -214,7 +214,7 @@
        </el-table-column>
        <el-table-column
          :label="$t('common:action:action')"
-          min-width="120"
+          min-width="150"
          fixed="right"
        >
          <template slot-scope="scope">
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@ -151,15 +151,15 @@
            {{ $fd("UserType", scope.row.LoginUserTypeEnum) }}
          </template>
        </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
          v-if="!isMine"
          :label="$t('trials:loginLog:table:optUserName')"
          prop="optUserName"
          min-width="90"
          show-overflow-tooltip
          sortable="custom"
-        />
-        <el-table-column
+        /> -->
+        <!-- <el-table-column
          v-if="!isMine"
          :label="$t('trials:loginLog:table:optUserType')"
          prop="OptUserTypeEnum"
@ -170,7 +170,7 @@
          <template slot-scope="scope">
            {{ $fd("UserType", scope.row.OptUserTypeEnum) }}
          </template>
-        </el-table-column>
+        </el-table-column> -->
        <el-table-column
          :label="$t('trials:loginLog:table:createTime')"
          prop="CreateTime"