From 3bbe3b3fa3a30ba1b5340e09f1b23dfaed4cb463 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 30 May 2024 10:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E8=BD=BD=E5=BD=B1?=
 =?UTF-8?q?=E5=83=8F=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/uploadImage/index.vue | 30 +++++++++++++++++++++++++---
 src/directive/adaptive/adaptive.js   |  5 +++--
 src/views/system/user/list/index.vue | 27 ++++++++++++++++++++++---
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/src/components/uploadImage/index.vue b/src/components/uploadImage/index.vue
index 93559574..1897cd08 100644
--- 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();
   },
diff --git a/src/directive/adaptive/adaptive.js b/src/directive/adaptive/adaptive.js
index fe949b30..112f526c 100644
--- a/src/directive/adaptive/adaptive.js
+++ b/src/directive/adaptive/adaptive.js
@@ -4,11 +4,12 @@ import {
 } from 'element-ui/src/utils/resize-event'
 
 // 设置表格高度
-const doResize = async(el, binding, vnode) => {
+const doResize = async (el, binding, vnode) => {
   // 获取表格Dom对象
   const { componentInstance: $table } = await vnode
   // 获取调用传递过来的数据
   const { value } = binding
+  if (value && value.notAdaptive) return;
   // 获取距底部距离（用于展示页码等信息）
   const bottomOffset = (value && value.bottomOffset) || 40
   if (!$table) return
@@ -24,7 +25,7 @@ export default {
   // 初始化设置
   bind(el, binding, vnode) {
     // 设置resize监听方法
-    el.resizeListener = async() => {
+    el.resizeListener = async () => {
       await doResize(el, binding, vnode)
     }
     // 绑定监听方法到addResizeListener
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index f347279f..76bf7489 100644
--- 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' },