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

2024-05-30 10:58:11 +08:00 · 2024-05-30 10:58:11 +08:00 · 8dbe02438c
parent df5a6b7fdd 3bbe3b3fa3
commit 8dbe02438c
5 changed files with 222 additions and 64 deletions
--- a/src/components/BaseForm/search-form.vue
+++ b/src/components/BaseForm/search-form.vue
@ -2,9 +2,20 @@
 <template>
  <div class="base-search-form">
    <el-form :size="size" :inline="true" :label-width="labelWidth">
-      <el-form-item v-for="item in searchForm" :key="item.prop" :label="item.label">
+      <el-form-item
+        v-for="item in searchForm"
+        :key="item.prop"
+        :label="item.label"
+      >
        <!-- 输入框 -->
-        <el-input v-if="item.type==='Input'" v-model="searchData[item.prop]" :placeholder="item.placeholder" size="mini" :style="{width:item.width}" :readonly="item.readonly" />
+        <el-input
+          v-if="item.type === 'Input'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          size="mini"
+          :style="{ width: item.width }"
+          :readonly="item.readonly"
+        />
        <!-- 下拉框 -->
        <el-select
          v-if="item.type === 'Select'"
@ -12,7 +23,6 @@
          :placeholder="item.placeholder"
          size="mini"
          :style="{ width: item.width }"
-
          @change="item.change && item.change(that, searchData[item.prop])"
        >
          <el-option
@ -28,7 +38,6 @@
          :placeholder="item.placeholder"
          size="mini"
          :style="{ width: item.width }"
-
          @change="item.change && item.change(that, searchData[item.prop])"
        >
          <el-option
@ -39,33 +48,104 @@
          />
        </el-select>
        <!-- 单选 -->
-        <el-radio-group v-if="item.type==='Radio'" v-model="searchData[item.prop]" :style="{width:item.width}">
-          <el-radio v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio>
+        <el-radio-group
+          v-if="item.type === 'Radio'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        >
+          <el-radio
+            v-for="ra in item.radios"
+            :key="ra.value"
+            :label="ra.value"
+            >{{ ra.label }}</el-radio
+          >
        </el-radio-group>
        <!-- 单选按钮 -->
-        <el-radio-group v-if="item.type==='RadioButton'" v-model="searchData[item.prop]" :style="{width:item.width}" @change="item.change && item.change(searchData[item.prop])">
-          <el-radio-button v-for="ra in item.radios" :key="ra.value" :label="ra.value">{{ ra.label }}</el-radio-button>
+        <el-radio-group
+          v-if="item.type === 'RadioButton'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+          @change="item.change && item.change(searchData[item.prop])"
+        >
+          <el-radio-button
+            v-for="ra in item.radios"
+            :key="ra.value"
+            :label="ra.value"
+            >{{ ra.label }}</el-radio-button
+          >
        </el-radio-group>
        <!-- 复选框 -->
-        <el-checkbox-group v-if="item.type==='Checkbox'" v-model="searchData[item.prop]" :style="{width:item.width}">
-          <el-checkbox v-for="ch in item.checkboxs" :key="ch.value" :label="ch.value">{{ ch.label }}</el-checkbox>
+        <el-checkbox-group
+          v-if="item.type === 'Checkbox'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        >
+          <el-checkbox
+            v-for="ch in item.checkboxs"
+            :key="ch.value"
+            :label="ch.value"
+            >{{ ch.label }}</el-checkbox
+          >
        </el-checkbox-group>
        <!-- 日期 -->
-        <el-date-picker v-if="item.type==='Date'" v-model="searchData[item.prop]" :placeholder="item.placeholder" :style="{width:item.width}" value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="item.pickerOption" />
+        <el-date-picker
+          v-if="item.type === 'Date'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          :style="{ width: item.width }"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          :picker-options="item.pickerOption"
+        />
        <!-- 时间 -->
-        <el-time-select v-if="item.type==='Time'" v-model="searchData[item.prop]" :placeholder="item.placeholder" type="" :style="{width:item.width}" />
+        <el-time-select
+          v-if="item.type === 'Time'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          type=""
+          :style="{ width: item.width }"
+        />
        <!-- 日期时间 -->
-        <el-date-picker v-if="item.type==='DateTime'" v-model="searchData[item.prop]" :placeholder="item.placeholder" type="datetime" :disabled="item.disable && item.disable(searchData[item.prop])" :style="{width:item.width}" />
+        <el-date-picker
+          v-if="item.type === 'DateTime'"
+          v-model="searchData[item.prop]"
+          :placeholder="item.placeholder"
+          type="datetime"
+          :disabled="item.disable && item.disable(searchData[item.prop])"
+          :style="{ width: item.width }"
+        />
+        <!-- 日期时间段 -->
+        <el-date-picker
+          v-if="item.type === 'Daterange'"
+          v-model="searchData[item.prop]"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :style="{ width: item.width }"
+          clearable
+        />
        <!-- 滑块 -->
        <!-- <el-slider v-if="item.type==='Slider'" v-model="searchData[item.prop]"></el-slider> -->
        <!-- 开关 -->
-        <el-switch v-if="item.type==='Switch'" v-model="searchData[item.prop]" :style="{width:item.width}" />
+        <el-switch
+          v-if="item.type === 'Switch'"
+          v-model="searchData[item.prop]"
+          :style="{ width: item.width }"
+        />
        <!-- 具名slot -->
        <slot v-if="item.type === 'Custom'" :name="item.slot" />
      </el-form-item>
      <el-form-item v-for="item in searchHandle" :key="item.label">
        <slot v-if="item.slot" :name="item.slot" />
-        <el-button v-else :type="item.type" :size="item.size || size" :icon="item.icon || ''" @click="handleClick(item.emitKey)">{{ item.label }}</el-button>
+        <el-button
+          v-else
+          :type="item.type"
+          :size="item.size || size"
+          :icon="item.icon || ''"
+          @click="handleClick(item.emitKey)"
+          >{{ item.label }}</el-button
+        >
      </el-form-item>
    </el-form>
  </div>
@ -76,42 +156,40 @@ export default {
  props: {
    that: {
      type: Object,
-      default: this
+      default: this,
    },
    isHandle: {
      type: Boolean,
-      default: true
+      default: true,
    },
    labelWidth: {
      type: String,
-      default: ''
+      default: "",
    },
    size: {
      type: String,
-      default: 'mini'
+      default: "mini",
    },
    searchForm: {
      type: Array,
-      default: () => []
+      default: () => [],
    },
    searchHandle: {
      type: Array,
-      default: () => []
+      default: () => [],
    },
    searchData: {
      type: Object,
-      default: () => {}
-    }
+      default: () => {},
+    },
  },
  methods: {
    handleClick(emitKey) {
      // emit事件
-      this.$emit(`${emitKey}`)
-    }
-  }
-
-}
-
+      this.$emit(`${emitKey}`);
+    },
+  },
+};
 </script>
 <style lang="scss">
 .base-search-form {
--- a/src/components/uploadImage/index.vue
+++ b/src/components/uploadImage/index.vue
@ -6,12 +6,18 @@
    custom-class="upload-dialog"
    :before-close="beforeClose"
  >
-    <span slot="title">{{ $t("trials:uploadImage:title:uploadImages") }}</span>
+    <span slot="title">{{ title }}</span>
    <el-divider content-position="left">{{
      $t("trials:uploadImage:button:uploadTableTitle1")
    }}</el-divider>
    <!--已上传影像检查-->
-    <el-table :data="list" style="width: 100%" height="300" :loading="loading">
+    <el-table
+      :data="list"
+      style="width: 100%"
+      height="300"
+      v-adaptive="{ bottomOffset: 50, notAdaptive: isUpload }"
+      :loading="loading"
+    >
      <!--受试者-->
      <el-table-column
        prop="SubjectCode"
@ -60,6 +66,7 @@
        <template slot-scope="scope">
          <!--下载--->
          <el-button
+            v-if="!isUpload && Criterion.ImageDownloadEnum > 0"
            circle
            icon="el-icon-download"
            :title="$t('trials:uploadImage:button:download')"
@ -67,6 +74,7 @@
          />
          <!--删除--->
          <el-button
+            v-if="isUpload"
            circle
            icon="el-icon-delete"
            :title="$t('trials:uploadImage:button:delete')"
@ -76,7 +84,7 @@
      </el-table-column>
    </el-table>
    <upload-list
-      v-if="Criterion.ImageUploadEnum > 0"
+      v-if="Criterion.ImageUploadEnum > 0 && isUpload"
      :StudyInstanceUidList="StudyInstanceUidList"
      :SopInstanceUidList="SopInstanceUidList"
      @getList="getList"
@ -110,6 +118,10 @@ export default {
        return {};
      },
    },
+    status: {
+      type: String,
+      default: "upload",
+    },
  },
  components: {
    "upload-list": uploadList,
@ -132,6 +144,18 @@ export default {
      modelList: [],
    };
  },
+  computed: {
+    title() {
+      let str = this.$t("trials:uploadImage:title:uploadImages");
+      if (this.status === "download") {
+        str = this.$t("trials:uploadImage:title:uploadImagesDownLoad");
+      }
+      return str;
+    },
+    isUpload() {
+      return this.status === "upload";
+    },
+  },
  created() {
    this.getList();
  },
--- a/src/directive/adaptive/adaptive.js
+++ b/src/directive/adaptive/adaptive.js
@ -9,6 +9,7 @@ const doResize = async(el, binding, vnode) => {
  const { componentInstance: $table } = await vnode
  // 获取调用传递过来的数据
  const { value } = binding
+  if (value && value.notAdaptive) return;
  // 获取距底部距离（用于展示页码等信息）
  const bottomOffset = (value && value.bottomOffset) || 40
  if (!$table) return
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@ -68,9 +68,9 @@ const searchDataDefault = () => {
    UserType: null,
    PageIndex: 1,
    PageSize: 20,
-    Asc: true,
+    Asc: false,
    RealName: '',
-    SortField: ''
+    SortField: 'CreateTime'
  }
 }
 export default {
@ -163,6 +163,13 @@ export default {
          minWidth: 100,
          sortable: 'custom',
          showOverflowTooltip: true },
+        {
+          prop: "CreateTime",
+          label: this.$t("system:userlist:table:createTime"),
+          minWidth: 200,
+          sortable: "custom",
+          showOverflowTooltip: true,
+        },
        { type: 'operate',
          label: this.$t('common:action:action'),
          minWidth: 200,
@ -193,6 +200,13 @@ export default {
          width: '120px',
          placeholder: ''
        },
+        {
+          type: "Input",
+          label: this.$t("system:userlist:label:EMail"),
+          prop: "EMail",
+          width: "120px",
+          placeholder: "",
+        },
        {
          type: 'Input',
          label: this.$t('system:userlist:label:Organization'),
@ -247,7 +261,14 @@ export default {
          options: [], // 下拉选项
          props: { label: 'UserType', value: 'Id' }, // 下拉选项配置信息，必填
          placeholder: ''
-        }
+        },
+        {
+          type: "Daterange",
+          label: this.$t("system:userlist:label:CreateTime"),
+          prop: "CreateTimeArr",
+          width: "400px",
+          placeholder: "",
+        },
      ],
      searchHandle: [
        { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset' },
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@ -1,8 +1,26 @@
 <template>
-  <BaseContainer v-loading="loading" style="height:100%;background-color: #fff;">
-    <el-tabs v-if="TrialReadingCriterionId" v-model="TrialReadingCriterionId" type="border-card">
-      <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
-        <div v-if="(isReadingTaskViewInOrder === 1 || isReadingTaskViewInOrder === 2) && TrialReadingCriterionId === item.TrialReadingCriterionId">
+  <BaseContainer
+    v-loading="loading"
+    style="height: 100%; background-color: #fff"
+  >
+    <el-tabs
+      v-if="TrialReadingCriterionId"
+      v-model="TrialReadingCriterionId"
+      type="border-card"
+    >
+      <el-tab-pane
+        v-for="item of trialCriterionList"
+        :key="item.TrialReadingCriterionId"
+        :label="item.TrialReadingCriterionName"
+        :name="item.TrialReadingCriterionId"
+      >
+        <div
+          v-if="
+            (isReadingTaskViewInOrder === 1 ||
+              isReadingTaskViewInOrder === 2) &&
+            TrialReadingCriterionId === item.TrialReadingCriterionId
+          "
+        >
          <div slot="search-container">
            <el-form :inline="true">
              <!-- 受试者编号 -->
@ -161,14 +179,22 @@
                  <!-- 上传 -->
                  <el-button
                    v-hasPermi="['role:ir']"
-                    v-if="
-                      item.CriterionType === 0 &&
-                      (item.ImageDownloadEnum > 0 || item.ImageUploadEnum > 0)
-                    "
+                    v-if="item.CriterionType === 0 && item.ImageUploadEnum > 0"
                    circle
                    icon="el-icon-upload2"
                    :title="$t('trials:pendingReadingTasks:button:upload')"
-                    @click="upload(scope.row, item)"
+                    @click="openUploadImage(scope.row, item, 'upload')"
+                  />
+                  <!-- 下载 -->
+                  <el-button
+                    v-hasPermi="['role:ir']"
+                    v-if="
+                      item.CriterionType === 0 && item.ImageDownloadEnum > 0
+                    "
+                    circle
+                    icon="el-icon-download"
+                    :title="$t('trials:pendingReadingTasks:button:download')"
+                    @click="openUploadImage(scope.row, item, 'download')"
                  />
                </template>
              </el-table-column>
@ -182,7 +208,12 @@
            />
          </div>
        </div>
-        <div v-else-if="isReadingTaskViewInOrder === 0 && TrialReadingCriterionId === item.TrialReadingCriterionId">
+        <div
+          v-else-if="
+            isReadingTaskViewInOrder === 0 &&
+            TrialReadingCriterionId === item.TrialReadingCriterionId
+          "
+        >
          <el-descriptions :column="2" border style="width: 800px">
            <!-- 剩余任务量 -->
            <el-descriptions-item
@ -280,6 +311,7 @@
      :visible.sync="uploadImageVisible"
      :SubjectId="uploadSubjectId"
      :Criterion="uploadTrialCriterion"
+      :status="uploadStatus"
      @getList="getList"
    />
  </BaseContainer>
@ -325,6 +357,7 @@ export default {
      uploadImageVisible: false,
      uploadSubjectId: null,
      uploadTrialCriterion: {},
+      uploadStatus: "upload",
    };
  },
  watch: {
@ -346,10 +379,11 @@ export default {
    }
  },
  methods: {
-    // 上传
-    upload(item, trialCriterion) {
+    // 打开上传下载弹框
+    openUploadImage(item, trialCriterion, status) {
      this.uploadSubjectId = item.SubjectId;
      this.uploadTrialCriterion = trialCriterion;
+      this.uploadStatus = status;
      this.uploadImageVisible = true;
    },
    getTrialCriterionList() {