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

src/store/modules/global.js

@@ -128,7 +128,7 @@ const actions = {
         if (response.IsSuccess) {
           var noticeList = []
           response.Result.forEach(el => {
-            noticeList.push({ Id: el.Id, Content: el.NoticeContent, NoticeTypeEnum: el.NoticeTypeEnum })
+            noticeList.push({ Id: el.Id, Content: el.NoticeContent, NoticeTypeEnum: el.NoticeTypeEnum, Path: el.Path, FileName: el.FileName })
           })
 
           commit('SET_NOTICE', noticeList)

src/views/system/notice/components/from.vue

@@ -235,7 +235,7 @@ export default {
         showClose: true,
         width: "600px",
         title: "",
-        appendToBody: true,
+        appendToBody: false,
       },
     };
   },
@@ -330,3 +330,8 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.el-upload-list__item .el-icon-close-tip {
+  display: none !important;
+}
+</style>

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

@@ -53,7 +53,7 @@
                   :label="
                     item.ShortName || item.Sex
                       ? `${item.SubjectCode}（${item.ShortName}，${
-                          item.Sex ? $fd('sex', Number(item.Sex)) : ''
+                          item.Sex ? $fd('sex',item.Sex) : ''
                         }）`
                       : item.SubjectCode
                   "

src/views/trials/trials-layout/components/noticeMarquee.vue

@@ -55,9 +55,38 @@ export default {
         currentNoticeType = this.noteType[i].Value;
       }
       const h = this.$createElement;
+      let _this = this;
       this.$msgbox({
         title: currentNoticeType,
-        message: h("span", null, item.Content),
+        message: h("div", null, [
+          h("span", null, item.Content),
+          item.Path
+            ? h(
+                "div",
+                {
+                  style: {
+                    marginTop: "10px",
+                  },
+                },
+                _this.$t("trials:notice:message:tipTitle")
+              )
+            : "",
+          item.Path
+            ? h(
+                "a",
+                {
+                  attrs: {
+                    href: _this.OSSclientConfig.basePath + item.Path,
+                    target: "_blank",
+                  },
+                  style: {
+                    color: "#428bca",
+                  },
+                },
+                item.FileName
+              )
+            : "",
+        ]),
         beforeClose: (action, instance, done) => {
           if (action === "confirm") {
             instance.confirmButtonLoading = true;

src/views/trials/trials-list/components/TrialForm.vue

@@ -149,7 +149,7 @@
       >
         <div style="position: relative">
           <el-input
-            v-model="trialForm.AuthorizationDuration"
+            v-model.number="trialForm.AuthorizationDuration"
             type="number"
             clearable
             :max="200"
@@ -241,6 +241,15 @@ export default {
             ),
             trigger: "blur",
           },
+          {
+            type: "number",
+            min: 1,
+            max: 200,
+            message: this.$t(
+              "trials:trials-list:formRule:minMaxAuthorized"
+            ),
+            trigger: "blur",
+          },
         ],
         // 阅片标准
         CriterionTypeList: [
@@ -271,7 +280,7 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: "^[\u4e00-\u9fa5a-zA-Z]+$",
+            pattern: "^[\u4e00-\u9fa5a-zA-Z/\\]+$",
             message: this.$t("trisals:trials-list:formRule:onlyEN"),
             trigger: "blur",
           },

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

@@ -228,9 +228,38 @@ export default {
         });
       } else {
         const h = this.$createElement;
+        let _this = this;
         this.$msgbox({
           title: currentNoticeType,
-          message: h("span", null, row.NoticeContent),
+          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",
+                    },
+                  },
+                  row.FileName
+                )
+              : "",
+          ]),
           beforeClose: (action, instance, done) => {
             if (action === "confirm") {
               instance.confirmButtonLoading = true;

src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue

@@ -41,7 +41,7 @@
                 :label="
                   item.ShortName || item.Sex
                     ? `${item.SubjectCode}（${item.ShortName}，${
-                        item.Sex ? $fd('sex', Number(item.Sex)) : ''
+                        item.Sex ? $fd('sex', item.Sex) : ''
                       }）`
                     : item.SubjectCode
                 "