@@ -468,7 +461,9 @@
class="message break-word"
style="white-space: pre-wrap"
v-if="reviewerData.ResearchPublicationView.Publications"
- >{{ reviewerData.ResearchPublicationView.Publications }}
+ >
+ {{ reviewerData.ResearchPublicationView.Publications }}
+
item.IsMain
+ ) || {}
+ )
+ }
+ return {}
+ },
hasFile() {
return (
(this.sowList && this.sowList.length > 0) ||
diff --git a/src/views/reviewers/index.vue b/src/views/reviewers/index.vue
index 2315da26..6a331035 100644
--- a/src/views/reviewers/index.vue
+++ b/src/views/reviewers/index.vue
@@ -525,13 +525,19 @@ export default {
},
// 发送邮件
async sendEmail() {
- var pattern =
- /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
- if (!pattern.test(this.email))
- return this.$message.warning(this.$t('rules:email'))
+ let emailList = this.email.split('|')
+ let isError = false
+ emailList.forEach((item) => {
+ var pattern =
+ /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
+ if (!pattern.test(item)) {
+ isError = true
+ }
+ })
+ if (isError) return this.$message.warning(this.$t('rules:email'))
this.emailLoading = true
let res = await doctorSendEmail({
- Email: this.email,
+ Email: emailList,
Url: `ReviewersResearch?lang=${this.$store.getters.language}`,
})
this.emailLoading = false
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 49089c8a..5b20a67f 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -386,18 +386,61 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -408,9 +451,8 @@ import store from '@/store'
import { mapGetters } from 'vuex'
import { getSelectionReviewerList, selectReviewers } from '@/api/trials'
import BaseModel from '@/components/BaseModel'
-import reviewerAdd from '@/views/reviewers/new'
-import reviewerEdit from '@/views/reviewers/edit'
-import { doctorSendEmail } from '@/api/reviewers'
+import curriculumVitae from '@/views/reviewers/curriculumVitae'
+import { doctorSendEmail, useEmialGetDoctorInfo } from '@/api/reviewers'
const getListQueryDefault = () => {
return {
TrialId: '',
@@ -435,8 +477,7 @@ export default {
BaseContainer,
Pagination,
BaseModel,
- reviewerAdd,
- reviewerEdit,
+ curriculumVitae,
},
dicts: ['ReadingType', 'Subspeciality', 'Position', 'Rank'],
data() {
@@ -456,10 +497,33 @@ export default {
},
shareLink: null,
email: null,
- emailLoading: false,
visible: false,
- resumeType: 'add',
reviewerId: null,
+
+ emailVisible: false,
+ emailLoading: false,
+ emailForm: {
+ EmailOrPhone: null,
+ },
+ emailRule: {
+ EmailOrPhone: [
+ {
+ required: true,
+ message: this.$t('passwordReset:formRule:email'),
+ trigger: 'blur',
+ },
+ {
+ type: 'email',
+ message: this.$t('rules:email'),
+ trigger: 'blur,change',
+ },
+ {
+ max: 400,
+ message: this.$t('form:rules:maxLength:400'),
+ trigger: 'blur',
+ },
+ ],
+ },
}
},
computed: {
@@ -469,6 +533,31 @@ export default {
this.initPage()
},
methods: {
+ handleCancle() {
+ Object.keys(this.emailForm).forEach((key) => {
+ this.emailForm[key] = null
+ })
+ this.emailVisible = false
+ },
+ async handleSave() {
+ try {
+ let validate = await this.$refs.emailForm.validate()
+ if (!validate) return false
+ this.emailLoading = true
+ this.emailForm.trialId = this.$route.query.trialId
+ let res = await useEmialGetDoctorInfo(this.emailForm)
+ this.emailLoading = false
+ if (res.IsSuccess) {
+ this.handleCancle()
+ sessionStorage.setItem('reviewerId', res.Result.DoctorId)
+ zzSessionStorage.setItem('trialId', this.$route.query.trialId)
+ this.visible = true
+ }
+ } catch (err) {
+ this.emailLoading = false
+ console.log(err)
+ }
+ },
copyCode() {
this.$copyText(
`${this.$t('reviewers-list:button:copyCode')}: ${this.shareLink}`
@@ -494,13 +583,19 @@ export default {
},
// 发送邮件
async sendEmail() {
- var pattern =
- /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
- if (!pattern.test(this.email))
- return this.$message.warning(this.$t('rules:email'))
+ let emailList = this.email.split('|')
+ let isError = false
+ emailList.forEach((item) => {
+ var pattern =
+ /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
+ if (!pattern.test(item)) {
+ isError = true
+ }
+ })
+ if (isError) return this.$message.warning(this.$t('rules:email'))
this.emailLoading = true
let res = await doctorSendEmail({
- Email: this.email,
+ Email: emailList,
Url: `ReviewersResearch?lang=${this.$store.getters.language}&trialId=${this.$route.query.trialId}`,
})
this.emailLoading = false
@@ -513,10 +608,13 @@ export default {
},
// 打开新增或修改简历弹框
openViewer(type, row) {
- this.resumeType = type
- if (row) {
- this.reviewerId = row.Id
+ if (type === 'add') {
+ return (this.emailVisible = true)
}
+ if (row) {
+ sessionStorage.setItem('reviewerId', row.Id)
+ }
+ zzSessionStorage.setItem('trialId', this.$route.query.trialId)
this.visible = true
},
go(path) {
From 30ee433de38e8e3e7a47393d0534fddacdb0d824 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 21 Nov 2024 16:50:18 +0800
Subject: [PATCH 11/28] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E7=AE=80=E5=8E=86?=
=?UTF-8?q?=E9=A2=84=E8=A7=88=E7=9B=B2=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trials-panel/enrolled-reviewers/resume/index.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
index 3c245266..26f1e8d1 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
@@ -24,6 +24,7 @@ export default {
isInit: false,
reviewerId: '',
trialId: null,
+ isAll: true,
}
},
created() {
@@ -34,11 +35,12 @@ export default {
isEN() {
return this.$i18n.locale !== 'zh'
},
- isAll() {
- return this.hasPermi(['role:pm', 'role:admin', 'role:apm', 'role:ir'])
- },
+ // isAll() {
+ // return this.hasPermi(['role:pm', 'role:admin', 'role:apm', 'role:ir'])
+ // },
},
mounted() {
+ this.isAll = this.$route.query.blindState !== '0'
const token = getQueryString('token')
if (token) {
store.dispatch('user/setToken', token)
From 0b09bcb702d2f4b632bb10fed5fce8cfd1c3b4df Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 21 Nov 2024 16:55:21 +0800
Subject: [PATCH 12/28] 1
---
.../trials/trials-panel/enrolled-reviewers/resume/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
index 26f1e8d1..6883faf6 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
@@ -40,7 +40,7 @@ export default {
// },
},
mounted() {
- this.isAll = this.$route.query.blindState !== '0'
+ this.isAll = !this.$route.query.blindState
const token = getQueryString('token')
if (token) {
store.dispatch('user/setToken', token)
From d82e009206ed002e35333dfb57c6be4a76b880b7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 21 Nov 2024 17:19:41 +0800
Subject: [PATCH 13/28] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../attachments/site-research/index.vue | 4 +
.../reading/read-task-allocation/index.vue | 4 +
.../email-manage/components/EmailList.vue | 6 +-
.../visit/consistency-check/index.vue | 1 +
.../trials-panel/visit/crc-question/index.vue | 163 ++++-----
.../trials-panel/visit/qc-question/index.vue | 339 +++++++++++++-----
6 files changed, 340 insertions(+), 177 deletions(-)
diff --git a/src/views/trials/trials-panel/attachments/site-research/index.vue b/src/views/trials/trials-panel/attachments/site-research/index.vue
index 1ac34f64..7b665215 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -156,6 +156,7 @@
prop="SiteName"
:label="$t('trials:researchRecord:table:siteName')"
min-width="100"
+ sortable="custom"
show-overflow-tooltip
/>
@@ -163,6 +164,7 @@
prop="UserName"
:label="$t('trials:researchRecord:table:contactor')"
min-width="100"
+ sortable="custom"
show-overflow-tooltip
/>
@@ -210,6 +212,7 @@
prop="State"
:label="$t('trials:researchRecord:table:status')"
min-width="150"
+ sortable="custom"
show-overflow-tooltip
>
@@ -232,6 +235,7 @@
prop="IsDeleted"
:label="$t('trials:researchRecord:table:isDeleted')"
min-width="100"
+ sortable="custom"
show-overflow-tooltip
>
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 4f21b510..29d095c9 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -103,6 +103,7 @@
:label="$t('trials:reviewAssign:table:visit')"
width="140"
show-overflow-tooltip
+ sortable="custom"
>
{{scope.row.VisitTaskTypeCount}}
@@ -115,6 +116,7 @@
width="140"
show-overflow-tooltip
v-if="OtherInfo && OtherInfo.IsGlobalReading"
+ sortable="custom"
>
{{scope.row.GlobalTaskTypeCount}}
@@ -127,6 +129,7 @@
width="140"
show-overflow-tooltip
v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
+ sortable="custom"
>
{{scope.row.JudgeTaskTypeCount}}
@@ -139,6 +142,7 @@
width="140"
show-overflow-tooltip
v-if="OtherInfo && OtherInfo.IsOncologyReading"
+ sortable="custom"
>
{{scope.row.OncologyTaskTypeCount}}
diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
index 4c0a0ea3..581d0ac2 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
@@ -203,7 +203,7 @@
-
+
- {{ $t("common:button:export") }}
+ {{ $t('common:button:export') }}
@@ -174,19 +174,19 @@
{{
- $fd("CurrentQCType", 0)
+ $fd('CurrentQCType', 0)
}}
--
{{
- $fd("CurrentQCType", scope.row.CurrentQCEnum)
+ $fd('CurrentQCType', scope.row.CurrentQCEnum)
}}
{{ $fd("CurrentQCType", scope.row.CurrentQCEnum) }}{{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}
--
@@ -214,12 +214,13 @@
:label="$t('trials:crcQuestion:table:isOverTime')"
show-overflow-tooltip
width="140"
+ sortable="custom"
>
{{
- $fd("YesOrNo", scope.row.IsOverTime)
+ $fd('YesOrNo', scope.row.IsOverTime)
}}
- {{ $fd("YesOrNo", scope.row.IsOverTime) }}
+ {{ $fd('YesOrNo', scope.row.IsOverTime) }}
@@ -240,10 +241,10 @@
>
{{
- $fd("YesOrNo", scope.row.IsClosed)
+ $fd('YesOrNo', scope.row.IsClosed)
}}
{{
- $fd("YesOrNo", scope.row.IsClosed)
+ $fd('YesOrNo', scope.row.IsClosed)
}}
@@ -266,13 +267,13 @@
--
{{
- $fd("ReuploadEnum", scope.row.ReuploadEnum)
+ $fd('ReuploadEnum', scope.row.ReuploadEnum)
}}
{{
- $fd("ReuploadEnum", scope.row.ReuploadEnum)
+ $fd('ReuploadEnum', scope.row.ReuploadEnum)
}}
{{
- $fd("ReuploadEnum", scope.row.ReuploadEnum)
+ $fd('ReuploadEnum', scope.row.ReuploadEnum)
}}
@@ -349,24 +350,24 @@ import {
getTrialVisitStageSelect,
getQCChallengeDialogList,
getNextCRCChallenge,
-} from "@/api/trials";
-import { getQCChallengeList_Export } from "@/api/export";
-import ChatForm from "./components/chatForm";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
+} from '@/api/trials'
+import { getQCChallengeList_Export } from '@/api/export'
+import ChatForm from './components/chatForm'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
const searchDataDefault = () => {
return {
IsOverTime: null,
- SubjectCode: "",
- TrialSiteId: "",
+ SubjectCode: '',
+ TrialSiteId: '',
VisitPlanArray: [],
IsClosed: null,
PageIndex: 1,
PageSize: 20,
- };
-};
+ }
+}
export default {
- name: "CrcQusetion",
+ name: 'CrcQusetion',
components: { BaseContainer, Pagination, ChatForm },
data() {
return {
@@ -380,143 +381,143 @@ export default {
visitPlanOptions: [],
otherInfo: {},
trialId: this.$route.query.trialId,
- };
+ }
},
mounted() {
- this.getList();
- this.getSite();
- this.getVisitPlanOptions();
+ this.getList()
+ this.getSite()
+ this.getVisitPlanOptions()
},
watch: {
chatVisible() {
if (!this.chatVisible) {
- this.$store.state.trials.checkTaskId = null;
+ this.$store.state.trials.checkTaskId = null
}
},
},
methods: {
beforeClose() {
- this.chatVisible = false;
- this.$store.state.trials.checkTaskId = null;
+ this.chatVisible = false
+ this.$store.state.trials.checkTaskId = null
},
handleExport() {
getQCChallengeList_Export(this.searchData)
.then((res) => {})
.catch(() => {
- this.loading = false;
- });
+ this.loading = false
+ })
},
// 获取质疑列表
getList() {
- this.loading = true;
- this.searchData.TrialId = this.trialId;
+ this.loading = true
+ this.searchData.TrialId = this.trialId
getCRCChallengeList(this.searchData)
.then((res) => {
- this.loading = false;
- this.list = res.Result.CurrentPageData;
- this.total = res.Result.TotalCount;
- this.otherInfo = res.OtherInfo;
+ this.loading = false
+ this.list = res.Result.CurrentPageData
+ this.total = res.Result.TotalCount
+ this.otherInfo = res.OtherInfo
})
.catch(() => {
- this.loading = false;
- });
+ this.loading = false
+ })
},
// 回复质疑
handleReplay(row) {
- this.loading = true;
+ this.loading = true
getQCChallengeDialogList(row.Id)
.then((res) => {
- this.loading = false;
+ this.loading = false
if (res.IsSuccess) {
if (res.Result.length > 0) {
- Object.assign(row, res.Result[0]);
+ Object.assign(row, res.Result[0])
}
- this.currentQCRow = { ...row };
- this.$store.state.trials.checkTaskId = row.SubjectVisitId;
- this.chatVisible = true;
+ this.currentQCRow = { ...row }
+ this.$store.state.trials.checkTaskId = row.SubjectVisitId
+ this.chatVisible = true
}
})
.catch(() => {
- this.loading = false;
- });
+ this.loading = false
+ })
},
async getNextTask(qcChallengeId) {
try {
const params = {
trialId: this.trialId,
qcChallengeId: qcChallengeId,
- };
- const res = await getNextCRCChallenge(params);
+ }
+ const res = await getNextCRCChallenge(params)
if (res.IsSuccess) {
- const res2 = await getQCChallengeDialogList(res.Result.Id);
+ const res2 = await getQCChallengeDialogList(res.Result.Id)
if (res2.IsSuccess) {
- Object.assign(res.Result, res2.Result[0]);
- this.chatVisible = false;
- this.currentQCRow = res.Result;
+ Object.assign(res.Result, res2.Result[0])
+ this.chatVisible = false
+ this.currentQCRow = res.Result
this.$nextTick(() => {
- this.chatVisible = true;
- });
+ this.chatVisible = true
+ })
}
}
} catch (e) {
- this.chatVisible = false;
- console.log(e);
+ this.chatVisible = false
+ console.log(e)
}
},
getDialogList() {
- this.loading = true;
+ this.loading = true
getQCChallengeDialogList(this.currentQCRow.Id)
.then((res) => {
- this.loading = false;
+ this.loading = false
if (res.IsSuccess && res.Result.length > 0) {
var i = this.list.findIndex(
(item) => item.Id === this.currentQCRow.Id
- );
+ )
if (i > -1) {
- this.currentQCRow = Object.assign(this.list[i], res.Result[0]);
- this.$refs["chatForm"].addMessage(
+ this.currentQCRow = Object.assign(this.list[i], res.Result[0])
+ this.$refs['chatForm'].addMessage(
res.Result[0].DialogList[res.Result[0].DialogList.length - 1]
- );
+ )
}
}
})
.catch(() => {
- this.loading = false;
- });
+ this.loading = false
+ })
},
// 重置
handleReset() {
- this.searchData = searchDataDefault();
- this.getList();
+ this.searchData = searchDataDefault()
+ this.getList()
},
// 查询
handleSearch() {
- this.searchData.PageIndex = 1;
- this.getList();
+ this.searchData.PageIndex = 1
+ this.getList()
},
// 排序
handleSortByColumn(column) {
- if (column.order === "ascending") {
- this.searchData.Asc = true;
+ if (column.order === 'ascending') {
+ this.searchData.Asc = true
} else {
- this.searchData.Asc = false;
+ this.searchData.Asc = false
}
- this.searchData.SortField = column.prop;
- this.searchData.PageIndex = 1;
- this.getList();
+ this.searchData.SortField = column.prop
+ this.searchData.PageIndex = 1
+ this.getList()
},
// 获取site下拉框数据
getSite() {
getTrialSiteSelect(this.trialId).then((res) => {
- this.siteOptions = res.Result;
- });
+ this.siteOptions = res.Result
+ })
},
// 获取访视下拉框数据
getVisitPlanOptions() {
getTrialVisitStageSelect(this.trialId).then((res) => {
- this.visitPlanOptions = res.Result;
- });
+ this.visitPlanOptions = res.Result
+ })
},
},
-};
+}
diff --git a/src/views/trials/trials-panel/visit/qc-question/index.vue b/src/views/trials/trials-panel/visit/qc-question/index.vue
index 0cb89312..ec396cc2 100644
--- a/src/views/trials/trials-panel/visit/qc-question/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-question/index.vue
@@ -5,7 +5,12 @@
-
+
-
+
-
+
@@ -34,46 +42,81 @@
>
{{ item.VisitName }}
-
+
-
+
{{ item.Creator }}
-
+
{{ item.CreatorRealName }}
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
@@ -81,7 +124,11 @@
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
@@ -96,7 +143,7 @@
{{ scope.row.ChallengeCode }}
-
- {{ $fd('CurrentQCType', 0) }}
+ {{
+ $fd('CurrentQCType', 0)
+ }}
--
- {{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}
- {{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}
+ {{
+ $fd('CurrentQCType', scope.row.CurrentQCEnum)
+ }}
+ {{ $fd('CurrentQCType', scope.row.CurrentQCEnum) }}
--
@@ -218,6 +272,7 @@
:label="$t('trials:qcQuality:table:qsDuration')"
show-overflow-tooltip
width="120"
+ sortable="custom"
/>
- {{ $fd('YesOrNo', scope.row.IsOverTime) }}
+ {{
+ $fd('YesOrNo', scope.row.IsOverTime)
+ }}
{{ $fd('YesOrNo', scope.row.IsOverTime) }}
@@ -240,7 +298,9 @@
sortable="custom"
>
- {{ $fd('YesOrNo', scope.row.IsClosed) }}
+ {{
+ $fd('YesOrNo', scope.row.IsClosed)
+ }}
{{ $fd('YesOrNo', scope.row.IsClosed) }}
@@ -262,9 +322,15 @@
>
--
- {{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}
- {{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}
- {{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}
+ {{
+ $fd('ReuploadEnum', scope.row.ReuploadEnum)
+ }}
+ {{
+ $fd('ReuploadEnum', scope.row.ReuploadEnum)
+ }}
+ {{
+ $fd('ReuploadEnum', scope.row.ReuploadEnum)
+ }}
@@ -276,7 +342,12 @@
sortable="custom"
/>
@@ -305,7 +379,13 @@
-
+
@@ -314,10 +394,19 @@
:visible.sync="chatVisible"
:close-on-click-modal="false"
width="800px"
- :title="$t('trials:qcQuality:dialogTitle:reply') + `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`"
+ :title="
+ $t('trials:qcQuality:dialogTitle:reply') +
+ `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`
+ "
@getList="getList"
>
-
+
-
+
- {{ $t('trials:qcQuality:radio:reason1') }}
- {{ $t('trials:qcQuality:radio:reason2') }}
+ {{
+ $t('trials:qcQuality:radio:reason1')
+ }}
+ {{
+ $t('trials:qcQuality:radio:reason2')
+ }}
@@ -356,23 +456,33 @@
:label="$t('trials:consistencyCheck:label:closereason')"
prop="Remake"
:rules="[
- { required: true, message: $t('common:ruleMessage:specify')},
+ { required: true, message: $t('common:ruleMessage:specify') },
]"
>
@@ -380,7 +490,14 @@
From aeeb13d0352ecc60a5dca60886b86c6dfe7993e8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 22 Nov 2024 09:08:43 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=E7=9B=B2=E5=8C=96=E5=AD=A6=E6=9C=AF?=
=?UTF-8?q?=E6=88=90=E6=9E=9C=E9=95=BF=E5=BA=A6=E6=A0=A1=E9=AA=8C=E6=94=B9?=
=?UTF-8?q?=E4=B8=BA4000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/reviewers/components/Setting.vue | 4 ++--
.../reviewers/curriculumVitae/components/info/setting.vue | 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/views/reviewers/components/Setting.vue b/src/views/reviewers/components/Setting.vue
index 2887467d..3d0305b5 100644
--- a/src/views/reviewers/components/Setting.vue
+++ b/src/views/reviewers/components/Setting.vue
@@ -279,8 +279,8 @@ export default {
],
BlindPublications: [
{
- max: 400,
- message: this.$t('form:rules:maxLength:400'),
+ max: 4000,
+ message: this.$t('form:rules:maxLength:4000'),
trigger: 'blur',
},
],
diff --git a/src/views/reviewers/curriculumVitae/components/info/setting.vue b/src/views/reviewers/curriculumVitae/components/info/setting.vue
index d885aa86..22e374f3 100644
--- a/src/views/reviewers/curriculumVitae/components/info/setting.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/setting.vue
@@ -144,10 +144,6 @@
import {
getAuditState,
updateAuditResume,
- getVacationList,
- addOrUpdateVacation,
- deleteVacation,
- getIsVacation,
} from '@/api/reviewers'
const defaultForm = () => {
return {
@@ -205,8 +201,8 @@ export default {
],
BlindPublications: [
{
- max: 400,
- message: this.$t('form:rules:maxLength:400'),
+ max: 4000,
+ message: this.$t('form:rules:maxLength:4000'),
trigger: 'blur',
},
],
From 056aa800975da18555f5d97af82cde07978e3141 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 22 Nov 2024 10:22:58 +0800
Subject: [PATCH 15/28] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reviewers/components/TrialExperience.vue | 44 +++++++++-
.../components/info/clinicalTrials.vue | 11 ++-
.../components/info/continuingTraining.vue | 1 +
.../components/info/educationalExperience.vue | 1 +
.../curriculumVitae/components/info/other.vue | 7 +-
.../curriculumVitae/components/info/pay.vue | 1 +
.../info/scientificResearchProject.vue | 7 +-
.../components/info/summarize.vue | 7 +-
.../components/info/treatise.vue | 7 +-
src/views/reviewers/curriculumVitae/index.vue | 3 +
.../reviewers/curriculumVitae/preview.vue | 81 ++++++++++++-------
11 files changed, 128 insertions(+), 42 deletions(-)
diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index 4c8b3ae8..467a4e29 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -129,7 +129,7 @@
{
+ if (
+ value &&
+ this.clinicalTrialForm.EndTime &&
+ !moment(value).isBefore(moment(this.clinicalTrialForm.EndTime))
+ ) {
+ callback(
+ new Error(
+ this.$t('system:TrialExperience:rule:startBeforeEnd')
+ )
+ )
+ } else {
+ callback()
+ }
+ },
+ trigger: 'blur',
+ },
+ ],
+ EndTime: [
+ {
+ validator: (rule, value, callback) => {
+ if (
+ value &&
+ this.clinicalTrialForm.StartTime &&
+ moment(value).isBefore(
+ moment(this.clinicalTrialForm.StartTime)
+ )
+ ) {
+ callback(
+ new Error(
+ this.$t('system:TrialExperience:rule:endBeforeStart')
+ )
+ )
+ } else {
+ callback()
+ }
+ },
+ trigger: 'blur',
+ },
],
OtherStages: [
{
diff --git a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
index 302ea51c..41949338 100644
--- a/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue
@@ -156,11 +156,13 @@
-
- {{
+
{{ $t('curriculumVitae:noData') }}
@@ -1042,6 +1044,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
.message {
margin: auto;
diff --git a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
index 71300555..a5d17c5e 100644
--- a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
@@ -500,6 +500,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
}
.el-select,
diff --git a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
index 5d74b9a1..ce78e6f3 100644
--- a/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/educationalExperience.vue
@@ -506,6 +506,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
}
.el-select,
diff --git a/src/views/reviewers/curriculumVitae/components/info/other.vue b/src/views/reviewers/curriculumVitae/components/info/other.vue
index 876e37da..823047dc 100644
--- a/src/views/reviewers/curriculumVitae/components/info/other.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/other.vue
@@ -12,8 +12,10 @@
- {{ DATA.AwardsHonors }}
- {{ DATA.AwardsHonorsCN }}
+
{{ $t('curriculumVitae:noData') }}
@@ -177,6 +179,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
.message {
margin: auto;
diff --git a/src/views/reviewers/curriculumVitae/components/info/pay.vue b/src/views/reviewers/curriculumVitae/components/info/pay.vue
index b95bbd42..5c2148db 100644
--- a/src/views/reviewers/curriculumVitae/components/info/pay.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/pay.vue
@@ -294,6 +294,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
.message {
margin: auto;
diff --git a/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue b/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
index 5b0e550f..3876188a 100644
--- a/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/scientificResearchProject.vue
@@ -28,8 +28,10 @@
:label="$t('curriculumVitae:scientificResearchProject:subject')"
>
- {{ DATA.Grants }}
- {{ DATA.GrantsCN }}
+
@@ -264,6 +266,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
.message {
margin: auto;
diff --git a/src/views/reviewers/curriculumVitae/components/info/summarize.vue b/src/views/reviewers/curriculumVitae/components/info/summarize.vue
index 00f70fc4..fc545270 100644
--- a/src/views/reviewers/curriculumVitae/components/info/summarize.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/summarize.vue
@@ -14,9 +14,9 @@
- {{ isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize }}
-
+ style="white-space: pre-wrap"
+ v-html="isEN ? mainSummarize.SummarizeEn : mainSummarize.Summarize"
+ >{{ $t('curriculumVitae:noData') }}
@@ -264,6 +264,7 @@ export default {
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
+ font-weight: bold;
}
.message {
width: 100%;
diff --git a/src/views/reviewers/curriculumVitae/components/info/treatise.vue b/src/views/reviewers/curriculumVitae/components/info/treatise.vue
index 295d8648..7e449186 100644
--- a/src/views/reviewers/curriculumVitae/components/info/treatise.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/treatise.vue
@@ -11,7 +11,11 @@
{{ $t('common:button:edit') }}