部分问题修复
parent
cea2a70344
commit
2eb2ce97d2
|
@ -128,7 +128,7 @@ const actions = {
|
||||||
if (response.IsSuccess) {
|
if (response.IsSuccess) {
|
||||||
var noticeList = []
|
var noticeList = []
|
||||||
response.Result.forEach(el => {
|
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)
|
commit('SET_NOTICE', noticeList)
|
||||||
|
|
|
@ -235,7 +235,7 @@ export default {
|
||||||
showClose: true,
|
showClose: true,
|
||||||
width: "600px",
|
width: "600px",
|
||||||
title: "",
|
title: "",
|
||||||
appendToBody: true,
|
appendToBody: false,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
@ -330,3 +330,8 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
<style lang="scss">
|
||||||
|
.el-upload-list__item .el-icon-close-tip {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
:label="
|
:label="
|
||||||
item.ShortName || item.Sex
|
item.ShortName || item.Sex
|
||||||
? `${item.SubjectCode}(${item.ShortName},${
|
? `${item.SubjectCode}(${item.ShortName},${
|
||||||
item.Sex ? $fd('sex', Number(item.Sex)) : ''
|
item.Sex ? $fd('sex',item.Sex) : ''
|
||||||
})`
|
})`
|
||||||
: item.SubjectCode
|
: item.SubjectCode
|
||||||
"
|
"
|
||||||
|
|
|
@ -55,9 +55,38 @@ export default {
|
||||||
currentNoticeType = this.noteType[i].Value;
|
currentNoticeType = this.noteType[i].Value;
|
||||||
}
|
}
|
||||||
const h = this.$createElement;
|
const h = this.$createElement;
|
||||||
|
let _this = this;
|
||||||
this.$msgbox({
|
this.$msgbox({
|
||||||
title: currentNoticeType,
|
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) => {
|
beforeClose: (action, instance, done) => {
|
||||||
if (action === "confirm") {
|
if (action === "confirm") {
|
||||||
instance.confirmButtonLoading = true;
|
instance.confirmButtonLoading = true;
|
||||||
|
|
|
@ -149,7 +149,7 @@
|
||||||
>
|
>
|
||||||
<div style="position: relative">
|
<div style="position: relative">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="trialForm.AuthorizationDuration"
|
v-model.number="trialForm.AuthorizationDuration"
|
||||||
type="number"
|
type="number"
|
||||||
clearable
|
clearable
|
||||||
:max="200"
|
:max="200"
|
||||||
|
@ -241,6 +241,15 @@ export default {
|
||||||
),
|
),
|
||||||
trigger: "blur",
|
trigger: "blur",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
type: "number",
|
||||||
|
min: 1,
|
||||||
|
max: 200,
|
||||||
|
message: this.$t(
|
||||||
|
"trials:trials-list:formRule:minMaxAuthorized"
|
||||||
|
),
|
||||||
|
trigger: "blur",
|
||||||
|
},
|
||||||
],
|
],
|
||||||
// 阅片标准
|
// 阅片标准
|
||||||
CriterionTypeList: [
|
CriterionTypeList: [
|
||||||
|
@ -271,7 +280,7 @@ export default {
|
||||||
trigger: "blur",
|
trigger: "blur",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
pattern: "^[\u4e00-\u9fa5a-zA-Z]+$",
|
pattern: "^[\u4e00-\u9fa5a-zA-Z/\\]+$",
|
||||||
message: this.$t("trisals:trials-list:formRule:onlyEN"),
|
message: this.$t("trisals:trials-list:formRule:onlyEN"),
|
||||||
trigger: "blur",
|
trigger: "blur",
|
||||||
},
|
},
|
||||||
|
|
|
@ -228,9 +228,38 @@ export default {
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const h = this.$createElement;
|
const h = this.$createElement;
|
||||||
|
let _this = this;
|
||||||
this.$msgbox({
|
this.$msgbox({
|
||||||
title: currentNoticeType,
|
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) => {
|
beforeClose: (action, instance, done) => {
|
||||||
if (action === "confirm") {
|
if (action === "confirm") {
|
||||||
instance.confirmButtonLoading = true;
|
instance.confirmButtonLoading = true;
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
:label="
|
:label="
|
||||||
item.ShortName || item.Sex
|
item.ShortName || item.Sex
|
||||||
? `${item.SubjectCode}(${item.ShortName},${
|
? `${item.SubjectCode}(${item.ShortName},${
|
||||||
item.Sex ? $fd('sex', Number(item.Sex)) : ''
|
item.Sex ? $fd('sex', item.Sex) : ''
|
||||||
})`
|
})`
|
||||||
: item.SubjectCode
|
: item.SubjectCode
|
||||||
"
|
"
|
||||||
|
|
Loading…
Reference in New Issue