From f9b6e984e8abfa4535d329693037b6d6480e2ace Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 8 May 2024 11:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/noticeMarquee.vue              |   2 +-
 .../trials-list/components/TrialForm.vue      |  18 +++
 src/views/trials/trials-list/index.vue        |   3 +-
 src/views/trials/trials-notice/index.vue      | 114 +++++++++---------
 .../trials-panel/reading/read-task/index.vue  |  51 +++++---
 .../trial-summary/audit-record/index.vue      |   4 +-
 6 files changed, 112 insertions(+), 80 deletions(-)

diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue
index 86363d5..6ddc026 100644
--- 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"
-      max-width="500"
+      width="500"
       @mouseout="start()"
       @mouseover="stop()"
     >
diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue
index e4375fc..1ed7475 100644
--- a/src/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@@ -249,6 +249,24 @@ export default {
             message: this.$t("trials:trials-list:formRule:minMaxAuthorized"),
             trigger: "blur",
           },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes(".") ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(
+                  new Error(
+                    this.$t("trials:trials-list:formRule:notDecimalsAuthorized")
+                  )
+                );
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },
         ],
         // 阅片标准
         CriterionTypeList: [
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 12dcc25..d939ecf 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -160,7 +160,7 @@
           prop="ExperimentName"
           :label="$t('trials:trials-list:table:experimentName')"
           show-overflow-tooltip
-          min-width="100"
+          min-width="140"
           sortable="custom"
         />
 
@@ -206,6 +206,7 @@
           :label="$t('trials:trials-list:table:CriterionTypeList')"
           show-overflow-tooltip
           v-if="hasPermi(['role:pm', 'role:pi', 'role:sr'])"
+          min-width="140"
         >
           <template slot-scope="scope">
             <span>{{
diff --git a/src/views/trials/trials-notice/index.vue b/src/views/trials/trials-notice/index.vue
index 0e1c9e3..bc5d9af 100644
--- a/src/views/trials/trials-notice/index.vue
+++ b/src/views/trials/trials-notice/index.vue
@@ -222,65 +222,65 @@ export default {
     },
     showDetail(row) {
       var currentNoticeType = this.$fd("NoteType", row.NoticeTypeEnum);
-      if (row.IsRead || row.ActualNoticeStateEnum !== 1) {
-        this.$alert(row.NoticeContent, currentNoticeType, {
-          showConfirmButton: false,
-        });
-      } else {
-        const h = this.$createElement;
-        let _this = this;
-        this.$msgbox({
-          title: currentNoticeType,
-          message: h("div", null, [
-            h("span", null, row.NoticeContent),
-            row.Path
-              ? h(
-                  "div",
-                  {
-                    style: {
-                      marginTop: "10px",
-                    },
+      // if (row.IsRead || row.ActualNoticeStateEnum !== 1) {
+      //   this.$alert(row.NoticeContent, currentNoticeType, {
+      //     showConfirmButton: false,
+      //   });
+      // } else {
+      const h = this.$createElement;
+      let _this = this;
+      this.$msgbox({
+        title: currentNoticeType,
+        message: h("div", null, [
+          h("span", null, row.NoticeContent),
+          row.Path
+            ? h(
+                "div",
+                {
+                  style: {
+                    marginTop: "10px",
                   },
-                  _this.$t("trials:notice:message:tipTitle")
-                )
-              : "",
-            row.Path
-              ? h(
-                  "a",
-                  {
-                    attrs: {
-                      href: _this.OSSclientConfig.basePath + row.Path,
-                      target: "_blank",
-                    },
-                    style: {
-                      color: "#428bca",
-                    },
+                },
+                _this.$t("trials:notice:message:tipTitle")
+              )
+            : "",
+          row.Path
+            ? h(
+                "a",
+                {
+                  attrs: {
+                    href: _this.OSSclientConfig.basePath + row.Path,
+                    target: "_blank",
                   },
-                  row.FileName
-                )
-              : "",
-          ]),
-          beforeClose: (action, instance, done) => {
-            if (action === "confirm") {
-              instance.confirmButtonLoading = true;
-              setSystemNoticeHaveRead(row.Id)
-                .then(async (res) => {
-                  if (res.IsSuccess) {
-                    await this.$store.dispatch("global/getNoticeList");
-                    this.getList();
-                  }
-                  instance.confirmButtonLoading = false;
-                  done();
-                })
-                .catch(() => {
-                  instance.confirmButtonLoading = false;
-                });
-            } else {
-              done();
-            }
-          },
-        });
-      }
+                  style: {
+                    color: "#428bca",
+                  },
+                },
+                row.FileName
+              )
+            : "",
+        ]),
+        beforeClose: (action, instance, done) => {
+          if (action === "confirm") {
+            instance.confirmButtonLoading = true;
+            setSystemNoticeHaveRead(row.Id)
+              .then(async (res) => {
+                if (res.IsSuccess) {
+                  await this.$store.dispatch("global/getNoticeList");
+                  this.getList();
+                }
+                instance.confirmButtonLoading = false;
+                done();
+              })
+              .catch(() => {
+                instance.confirmButtonLoading = false;
+              });
+          } else {
+            done();
+          }
+        },
+      });
+      // }
     },
     downLoadFile(filePath) {
       if (!filePath) return;
diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 3eb28ae..4d86a86 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -274,13 +274,13 @@
               @click="handleReadImage(scope.row)"
             />
             <!-- 重阅 -->
-            <!-- <el-button
+            <el-button
               v-hasPermi="['trials:readTask:reread']"
               circle
               :title="$t('trials:readTask:button:reread')"
               icon="el-icon-collection"
               @click="openApplyReReading(scope.row)"
-            /> -->
+            />
             <!-- 下载报告 -->
             <!-- <el-button
               v-hasPermi="['trials:readTask:report']"
@@ -697,7 +697,7 @@ export default {
     getList() {
       this.loading = true;
       this.searchData.TrialId = this.trialId;
-      this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
+      // this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId;
       if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
         this.searchData.BeginSignDate = this.$moment(this.dateValue[0]).format(
           "YYYY-MM-DD HH:mm:ss"
@@ -751,22 +751,35 @@ export default {
       var routeData = this.$router.resolve({ path });
       this.openWindow = window.open(routeData.href, "_blank");
     },
-    openApplyReReading(row) {
-      this.rowData = { ...row };
-      this.loading = true;
-      getReReadingOrBackInfluenceTaskList(row.Id, true)
-        .then((res) => {
-          this.InfluenceTaskList = res.Result;
-          this.ApplyforReasonVisible = true;
-          this.ApplyforReasonForm = {
-            Type: null,
-            Remake: null,
-          };
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+    async openApplyReReading(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t("trials:readTask:message:msg2"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+          }
+        );
+        if (!confirm) return;
+        let params = {
+          TrialId: row.TrialId,
+          TrialReadingCriterionId: row.TrialReadingCriterionId,
+          VisitTaskId: row.Id,
+        };
+        this.loading = true;
+        let res = await aIRReReading(params);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.getList();
+          this.$message({
+            message: this.$t("trials:readTask:message:msg3"),
+            type: "success",
+          });
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
     },
     // 申请重阅
     applyReReading() {
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 1ef1222..31f8abe 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -136,7 +136,7 @@
         stripe
         height="100"
         :default-sort="{
-          prop: 'TrialReadingCriterionName',
+          prop: 'CreateTime',
           order: 'descending',
         }"
       >
@@ -1245,7 +1245,7 @@ export default {
   data() {
     const searchDataDefault = () => {
       return {
-        SortField: "TrialReadingCriterionName",
+        SortField: "CreateTime",
         Asc: false,
         PageIndex: 1,
         PageSize: 20,