{{ $t('trials:crcUpload:label:dicom') }}
-+ {{ $t('trials:crcUpload:label:dicom') }} +
+
+
{{ $t('trials:crcUpload:label:noneDicom') }}
-
+
- {{ $t('trials:audit:tab:dicoms') }}
-
+
+ {{ $t('trials:audit:tab:dicoms') }}
+
+
-
+
{{ $t('trials:audit:tab:nonDicoms') }}
-
+
Date: Wed, 18 Dec 2024 18:05:28 +0800
Subject: [PATCH 002/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../template/components/CriterionQuestionForm.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 8cb54177..1d9010aa 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -890,6 +890,7 @@ export default {
mounted() {
this.initForm()
this.getCalculateQuestions('number')
+
},
methods: {
typeValueChange(v) {
@@ -905,6 +906,14 @@ export default {
}
})
},
+ getBasicConfigSelect() {
+ getCriterionDictionaryList({
+ CriterionId: this.criterionId,
+ SystemCriterionId: this.criterionId
+ }).then(res => {
+ this.dicList = res.Result
+ })
+ },
getCalculateQuestions(type) {
getSystemCalculateQuestions({
systemCriterionId: this.criterionId,
@@ -944,6 +953,7 @@ export default {
await this.getParentQuestions()
await this.getLesionTypeDictionary()
await this.getLesionType()
+ await this.getBasicConfigSelect()
if (Object.keys(this.data).length > 0) {
for (const k in this.form) {
if (this.data.hasOwnProperty(k)) {
From 97caeae753594f330ad9b52b5542915a6f4a2e9e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 19 Dec 2024 11:02:34 +0800
Subject: [PATCH 003/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/CriterionQuestionForm.vue | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 1d9010aa..25bad6b7 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -446,6 +446,7 @@
/>
+
+
+
+
+
Date: Thu, 19 Dec 2024 11:45:21 +0800
Subject: [PATCH 004/194] =?UTF-8?q?=E5=88=97=E8=A1=A8label=E5=90=8D?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dictionary/attachment/components/CommonTemplate/index.vue | 2 +-
.../dictionary/attachment/components/EmailTemplate/index.vue | 2 +-
.../attachment/components/SignatureTemplate/index.vue | 2 +-
.../dictionary/attachment/components/UploadTemplate/index.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/dictionary/attachment/components/CommonTemplate/index.vue b/src/views/dictionary/attachment/components/CommonTemplate/index.vue
index 8e9e6fe1..fbe06690 100644
--- a/src/views/dictionary/attachment/components/CommonTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/CommonTemplate/index.vue
@@ -98,7 +98,7 @@
+
@@ -8,7 +8,7 @@
-
-
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
- {{ $fd('TrainingStatus', !scope.row.IsDeleted) }}
- {{ $fd('TrainingStatus', !scope.row.IsDeleted) }}
+ {{
+ $fd('TrainingStatus', !scope.row.IsDeleted)
+ }}
+ {{
+ $fd('TrainingStatus', !scope.row.IsDeleted)
+ }}
@@ -137,7 +151,11 @@
min-width="100"
>
- {{ scope.row.NeedConfirmedUserTypes?scope.row.NeedConfirmedUserTypes.join(', '):'' }}
+ {{
+ scope.row.NeedConfirmedUserTypes
+ ? scope.row.NeedConfirmedUserTypes.join(', ')
+ : ''
+ }}
@@ -148,14 +166,21 @@
min-width="300"
/> -->
-
-
-
@@ -215,16 +250,25 @@
append-to-body
custom-class="base-dialog-wrapper"
>
-
-
-
-
+
+
@@ -20,10 +31,16 @@
-
+
-
+
@@ -45,10 +62,22 @@
-
-
-
-
- {{ isEN ? item.HospitalName : item.HospitalNameCN }}
-
-
-
+ @change="handleChange"
+ >
+
+
+
-
-
{
RankOther: '',
RankOtherCN: '',
HospitalId: '',
+ HospitalName: null,
+ HospitalNameCN: null,
WorkPartTime: null,
WorkPartTimeEn: null,
UniversityAffiliated: null,
@@ -616,11 +632,18 @@ export default {
trigger: 'blur',
},
],
- HospitalId: [
+ HospitalName: [
{
required: true,
- message: this.$t('common:ruleMessage:select'),
- trigger: 'blur',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
+ },
+ ],
+ HospitalNameCN: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
},
],
UniversityAffiliated: [
@@ -648,16 +671,72 @@ export default {
loading: false,
dictionaryList: {},
otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+ hospitalSelectList: [],
}
},
computed: {
...mapGetters(['hospitalList']),
},
+ watch: {
+ hospitalList: {
+ handler() {
+ if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+ return false
+ this.hospitalSelectList = []
+ this.hospitalList.forEach((item) => {
+ if (this.isEN) {
+ this.hospitalSelectList.push({
+ value: item.HospitalName,
+ ...item,
+ })
+ } else {
+ this.hospitalSelectList.push({
+ value: item.HospitalNameCN,
+ ...item,
+ })
+ }
+ })
+ },
+ deep: true,
+ },
+ },
mounted() {
this.getDicData()
store.dispatch('global/getHospital')
},
methods: {
+ handleChange(v) {
+ if (v) return
+ this.form.UniversityAffiliated = null
+ this.form.City = null
+ this.form.UniversityAffiliatedCN = null
+ this.form.CityCN = null
+ },
+ querySearch(queryString, cb) {
+ var hospitalList = this.hospitalSelectList
+ var results = queryString
+ ? hospitalList.filter(this.createFilter(queryString))
+ : hospitalList
+ // 调用 callback 返回建议列表的数据
+ cb(results)
+ },
+ createFilter(queryString) {
+ return (hospitalList) => {
+ if (this.isEN) {
+ return (
+ hospitalList.HospitalName.toLowerCase().indexOf(
+ queryString.toLowerCase()
+ ) >= 0
+ )
+ } else {
+ return (
+ hospitalList.HospitalNameCN.toLowerCase().indexOf(
+ queryString.toLowerCase()
+ ) >= 0
+ )
+ }
+ }
+ },
openEdit() {
this.form = defaultForm()
Object.keys(this.form).forEach((key) => {
@@ -666,8 +745,6 @@ export default {
}
})
this.model_cfg.visible = true
- console.log(this.form)
- console.log(this.DATA)
},
handleCancle() {
this.form = defaultForm()
@@ -680,8 +757,13 @@ export default {
if (this.reviewerId) {
this.form.Id = this.reviewerId
}
+ let data = Object.assign({}, this.form)
+ if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+ data.HospitalName = data.HospitalId
+ data.HospitalId = null
+ }
this.loading = true
- let res = await addOrUpdateDoctorBasicInfoAndEmployment(this.form)
+ let res = await addOrUpdateDoctorBasicInfoAndEmployment(data)
this.loading = false
if (res.IsSuccess) {
this.$emit('update:reviewerId', res.Result.Id)
@@ -701,13 +783,18 @@ export default {
})
.catch(() => {})
},
- handleHospitalChange(value) {
- const item = this.hospitalList.filter((item) => item.Id === value)
- if (item.length) {
- this.form.UniversityAffiliated = item[0].UniversityAffiliated
- this.form.City = item[0].City
- this.form.UniversityAffiliatedCN = item[0].UniversityAffiliatedCN
- this.form.CityCN = item[0].CityCN
+ handleSelect(value) {
+ const item = value
+ if (item) {
+ this.form.UniversityAffiliated = item.UniversityAffiliated
+ this.form.City = item.City
+ this.form.UniversityAffiliatedCN = item.UniversityAffiliatedCN
+ this.form.CityCN = item.CityCN
+ } else {
+ this.form.UniversityAffiliated = null
+ this.form.City = null
+ this.form.UniversityAffiliatedCN = null
+ this.form.CityCN = null
}
},
},
From 5866535fb509de619e5e4eca416b8a6696ad3501 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 23 Dec 2024 13:34:46 +0800
Subject: [PATCH 007/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/CriterionQuestionForm.vue | 33 ++++++++++++----
.../template/components/TableQsForm.vue | 38 ++++++++++++++-----
2 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 25bad6b7..74f8191a 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -877,6 +877,7 @@ export default {
btnLoading: false,
parentOptions: [],
parentTriggerValOptions: [],
+ reParentTriggerValOptions: [],
groupOptions: [],
isParentExistGroup: false,
lesionTypes: [],
@@ -1001,8 +1002,15 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
+
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1020,8 +1028,13 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.reParentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1212,15 +1225,21 @@ export default {
}
form.ParentTriggerValue = ''
},
- relevanceQuestionChange(val, form) {
+ async relevanceQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex((item) => {
return item.QuestionId === val
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.reParentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
var options = []
this.parentOptions[index].TypeValue.split('|').forEach(
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index cde88917..69e50bc4 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -710,7 +710,13 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -726,8 +732,12 @@ export default {
})
if (i !== -1) {
if (this.parentOptions[i].QuestionGenre === 3) {
- console.log(this.$d[this.parentOptions[i].DictionaryCode])
- this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+ // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+ let dicCode = this.parentOptions[i].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[i].TypeValue.split('|').forEach((item, index) => {
@@ -805,14 +815,20 @@ export default {
form.RelevanceValue = ''
}
},
- parentQuestionChange(val, form) {
+ async parentQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex(item => {
return item.QuestionId === val
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -824,16 +840,20 @@ export default {
}
form.ParentTriggerValue = ''
},
- relevanceQuestionChange(val, form) {
+ async relevanceQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex(item => {
return item.QuestionId === val
})
- console.log(this.$d[this.parentOptions[index].DictionaryCode], this.parentOptions[index].QuestionGenre)
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- console.log(this.$d[this.parentOptions[index].DictionaryCode])
- this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
From d9091fbb79add9078332c4e97b7edad19a55ea98 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 23 Dec 2024 13:59:35 +0800
Subject: [PATCH 008/194] =?UTF-8?q?SPM/CPM=E5=A2=9E=E5=8A=A0=20=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=AE=A1=E6=89=B9=E4=B8=8E=E5=90=A6=E7=9A=84=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/trials.js | 8 ++
.../components/staffExternalForm.vue | 101 +++++++++++++++++-
2 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/src/api/trials.js b/src/api/trials.js
index 26fd4bb2..d3df4757 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3914,4 +3914,12 @@ export function getVisitClinicalDataName(data) {
method: 'post',
data
})
+}
+// 修改外部人员权限配置
+export function configTrialSPMInfo(data) {
+ return request({
+ url: `/TrialConfig/configTrialSPMInfo`,
+ method: 'post',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d6071671..afe0f3f5 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -19,8 +19,12 @@
{{ $t('common:button:reset') }}
+
+
+ {{ $t('trials:staff:button:permissionConfiguration') }}
+
-
+
{{ $t('trials:staff:button:sendEmail') }}
@@ -113,12 +117,52 @@
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ {{ $t('common:button:cancel') }}
+
+
+ {{ $t('common:button:save') }}
+
+
+
+
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a2cf9be9..5b57f3fc 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,5 @@
import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
-import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user'
+import { login, loginOut, getUserMenuTree, getUserPermissions, getUserLoginRoleList, loginSelectUserRole } from '@/api/user'
import { resetRouter } from '@/router'
import md5 from 'js-md5'
@@ -16,13 +16,17 @@ const getDefaultState = () => {
TotalNeedSignSystemDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
TotalNeedSignTrialDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
TrialStatusStr: null,
- isTestUser: false
+ isTestUser: false,
+ roles: []
}
}
const state = getDefaultState()
const mutations = {
+ SET_ROLES: (state, roles) => {
+ state.roles = roles
+ },
RESET_STATE: (state) => {
Object.assign(state, getDefaultState())
},
@@ -78,6 +82,9 @@ const mutations = {
}
const actions = {
+ setRoles({ commit }, roles) {
+ commit('SET_ROLES', roles)
+ },
changeUserName({ commit }, userName) {
commit('SET_USERNAME', userName)
},
@@ -91,7 +98,7 @@ const actions = {
if (UserId) {
data.UserId = UserId;
}
- login(data).then(async response => {
+ getUserLoginRoleList(data).then(async response => {
if (response.IsSuccess) {
zzSessionStorage.removeItem('lastWorkbench')
zzSessionStorage.setItem('my_username', username.trim())
@@ -99,6 +106,7 @@ const actions = {
zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail)
localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
const data = response.Result
+ commit('SET_ROLES', data.BasicInfo.AccountList)
if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
try {
zzSessionStorage.setItem('userId', data.BasicInfo.Id)
@@ -127,12 +135,12 @@ const actions = {
zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
zzSessionStorage.setItem('userId', user.id)
zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
- var permissions = await getUserPermissions()
- var menuTree = await getUserMenuTree()
- commit('SET_TREE', menuTree.Result)
- commit('SET_PERMISSIONS', permissions.Result)
- zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
- zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+ // var permissions = await getUserPermissions()
+ // var menuTree = await getUserMenuTree()
+ // commit('SET_TREE', menuTree.Result)
+ // commit('SET_PERMISSIONS', permissions.Result)
+ // zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+ // zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
} catch (e) {
console.log(e)
}
@@ -146,6 +154,39 @@ const actions = {
})
})
},
+ loginByRole({ commit }, userInfo) {
+ const { UserTypeId } = userInfo
+ let params = {
+ UserTypeId
+ }
+ return new Promise((resolve, reject) => {
+
+ loginSelectUserRole(params).then(async response => {
+ if (response.IsSuccess) {
+ const data = response.Result
+
+ try {
+ commit('SET_TOKEN', data)
+ setToken(data)
+ var permissions = await getUserPermissions()
+ var menuTree = await getUserMenuTree()
+ commit('SET_TREE', menuTree.Result)
+ commit('SET_PERMISSIONS', permissions.Result)
+ zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+ zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+ } catch (e) {
+ console.log(e)
+ }
+ resolve(response.Result)
+
+ } else {
+ reject(response.ErrorMessage)
+ }
+ }).catch(() => {
+ reject()
+ })
+ })
+ },
setTree({ commit }, tree) {
commit('SET_TREE', tree)
},
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2286bd3a..a069c363 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -243,6 +243,7 @@
@@ -253,9 +254,10 @@ import TopLang from './topLang'
import Vcode from 'vue-puzzle-vcode'
import browserTip from '@/views/dictionary/template/browser/tip.vue'
import Img1 from '@/assets/pic-2.png'
+import toggleRole from '@/components/toggleRole'
export default {
name: 'Login',
- components: { TopLang, Vcode, browserTip },
+ components: { TopLang, Vcode, browserTip, toggleRole },
data() {
return {
NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
@@ -298,6 +300,7 @@ export default {
isShow: false,
showCode: false,
Img1,
+ toggleRoleVisible: false,
}
},
computed: {
@@ -416,31 +419,49 @@ export default {
// this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
this.$message.warning(this.$t('login:message:login4'))
}
- this.$store.dispatch('permission/generateRoutes').then((res) => {
- this.loading = false
- if (res && res.length > 0) {
- this.$store.dispatch('global/getNoticeList')
- this.$router.addRoutes(res)
- if (this.loginType === 'DevOps') {
- this.$router.replace({ path: res[0].path })
- return
- }
- if (this.hasPermi(['role:radmin'])) {
- this.$router.replace({ path: res[0].path })
- return
- }
- if (
- this.hasPermi(['role:air', 'role:rpm', 'role:rcrc', 'role:rir'])
- ) {
- this.$router.replace({ path: '/trials/trials-list' })
+ return (this.toggleRoleVisible = true)
+ })
+ .catch(() => {
+ this.showCode = true
+ this.loading = false
+ })
+ },
+ loginByRole(UserTypeId) {
+ this.$store
+ .dispatch('user/loginByRole', { UserTypeId })
+ .then((res) => {
+ if (res) {
+ this.$store.dispatch('permission/generateRoutes').then((res) => {
+ this.loading = false
+ if (res && res.length > 0) {
+ this.$store.dispatch('global/getNoticeList')
+ this.$router.addRoutes(res)
+ if (this.loginType === 'DevOps') {
+ this.$router.replace({ path: res[0].path })
+ return
+ }
+ if (this.hasPermi(['role:radmin'])) {
+ this.$router.replace({ path: res[0].path })
+ return
+ }
+ if (
+ this.hasPermi([
+ 'role:air',
+ 'role:rpm',
+ 'role:rcrc',
+ 'role:rir',
+ ])
+ ) {
+ this.$router.replace({ path: '/trials/trials-list' })
+ } else {
+ this.$router.replace({ path: '/trials' })
+ }
} else {
- this.$router.replace({ path: '/trials' })
+ // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+ this.$message.warning(this.$t('login:message:login2'))
}
- } else {
- // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
- this.$message.warning(this.$t('login:message:login2'))
- }
- })
+ })
+ }
})
.catch(() => {
this.showCode = true
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index afe0f3f5..29522388 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -225,7 +225,7 @@ export default {
// 保存权限配置
async savePermission(){
try{
- let validate = this.$refs.permissionForm.validate();
+ let validate =await this.$refs.permissionForm.validate();
if(!validate) return false;
this.assignLoadStatus = true;
let data = Object.assign({ Id: this.trialId },this.permission)
From 177510643da3f6b22d197c851b7b0ae39c879cfc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 23 Dec 2024 18:05:21 +0800
Subject: [PATCH 011/194] =?UTF-8?q?=E5=88=86=E8=A7=92=E8=89=B2=E7=99=BB?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/toggleRole/index.vue | 12 ++++++++----
src/store/getters.js | 1 +
src/store/modules/permission.js | 1 +
src/store/modules/user.js | 20 ++++++++++++++------
src/views/login/index.vue | 14 +++++++++++---
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/components/toggleRole/index.vue b/src/components/toggleRole/index.vue
index c928068a..b792865b 100644
--- a/src/components/toggleRole/index.vue
+++ b/src/components/toggleRole/index.vue
@@ -8,14 +8,15 @@
append-to-body
:title="$t('toggleRole:tip:title')"
center
+ top="30vh"
:show-close="false"
@close="cancel"
>
@@ -37,7 +38,11 @@ export default {
props: {
visible: {
type: Boolean,
- default: true,
+ default: false,
+ },
+ loading: {
+ type: Boolean,
+ default: false,
},
},
data() {
@@ -45,7 +50,6 @@ export default {
form: {
UserTypeId: null,
},
- loading: false,
}
},
computed: {
diff --git a/src/store/getters.js b/src/store/getters.js
index 9f5c1c33..30e43422 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -7,6 +7,7 @@ const getters = {
tree: state => state.user.tree,
userName: state => state.user.userName,
userId: state => state.user.userId,
+ userRoleId: state => state.user.userRoleId,
routes: state => state.permission.routes,
asyncRoutes: state => state.permission.addRoutes,
visitedViews: state => state.tagsView.visitedViews,
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index aef32a5b..5afee253 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -118,6 +118,7 @@ const actions = {
return new Promise(resolve => {
var newTree = JSON.parse(zzSessionStorage.getItem('newTree'))
const sidebarRoutes = filterAsyncRouter(newTree || [])
+ console.log(sidebarRoutes, 'sidebarRoutes')
commit('SET_ROUTES', sidebarRoutes)
resolve(sidebarRoutes)
})
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5b57f3fc..196f0186 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -9,6 +9,7 @@ const getDefaultState = () => {
name: '',
userName: '',
userId: '',
+ userRoleId: '',
avatar: '',
permissions: [],
tree: [],
@@ -53,6 +54,9 @@ const mutations = {
SET_USERID: (state, id) => {
state.userId = id
},
+ SET_USEROLEID: (state, id) => {
+ state.userRoleId = id
+ },
SET_ISTESTUSER: (state, isTestUser) => {
state.isTestUser = eval(isTestUser)
},
@@ -127,13 +131,13 @@ const actions = {
zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
commit('SET_USERNAME', data.BasicInfo.UserName)
- commit('SET_USERID', data.BasicInfo.Id)
+ commit('SET_USERID', data.BasicInfo.IdentityUserId)
setToken(data.JWTStr)
setName(data.BasicInfo.RealName)
const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
const user = JSON.parse(userString)
zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
- zzSessionStorage.setItem('userId', user.id)
+ zzSessionStorage.setItem('userId', user.identityUserId)
zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
// var permissions = await getUserPermissions()
// var menuTree = await getUserMenuTree()
@@ -155,9 +159,9 @@ const actions = {
})
},
loginByRole({ commit }, userInfo) {
- const { UserTypeId } = userInfo
+ const { userRoleId } = userInfo
let params = {
- UserTypeId
+ userRoleId
}
return new Promise((resolve, reject) => {
@@ -166,6 +170,8 @@ const actions = {
const data = response.Result
try {
+ commit('SET_USEROLEID', userRoleId)
+ zzSessionStorage.setItem('userRoleId', userRoleId)
commit('SET_TOKEN', data)
setToken(data)
var permissions = await getUserPermissions()
@@ -212,14 +218,16 @@ const actions = {
commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
const user = JSON.parse(userString)
commit('SET_NAME', zzSessionStorage.getItem('realName'))
- commit('SET_USERID', user.id)
+ commit('SET_USEROLEID', user.userRoleId)
+ commit('SET_USERID', user.identityUserId)
commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
zzSessionStorage.setItem('userName', user.name)
- zzSessionStorage.setItem('userId', user.id)
+ zzSessionStorage.setItem('userId', user.identityUserId)
+ zzSessionStorage.setItem('userRoleId', user.userRoleId)
zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
return user
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a069c363..cbc18c50 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -243,7 +243,11 @@
@@ -25,7 +25,7 @@
-
+
Male
Female
@@ -37,13 +37,24 @@
-
-
+
-
+
-
+
Affiliation
-
+
Internal
External
-
+
@@ -78,19 +100,24 @@
type="primary"
size="small"
:disabled="isDisabled"
- style="margin:10px 15px"
+ style="margin: 10px 15px"
@click="handleSave"
- >Save
+ >Save
-
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e14181dc..f37debd8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -244,6 +244,7 @@
{{ $t('system:userlist:title:Information') }}
-
+
-
+
-
+
-
+
+
+ {{ $t('common:button:confirm') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('common:button:confirm') }}
+
+
+
+ {{ $t('common:button:cancel') }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index f00d9a15..36a149a9 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -35,6 +35,16 @@
{{ scope.row.Sex ? 'Male' : 'Female' }}
+
+ {{
+ Array.isArray(scope.row.UserRoleList) &&
+ scope.row.UserRoleList.length > 0
+ ? scope.row.UserRoleList.map((item) => item.UserTypeShortName).join(
+ ','
+ )
+ : ''
+ }}
+
{{ scope.row.RoleNameList.map((role) => role.RoleName).join(',') }}
@@ -115,7 +125,7 @@ export default {
showOverflowTooltip: true,
},
{
- prop: 'RealName',
+ prop: 'FullName',
label: this.$t('system:userlist:table:RealName'),
minWidth: 120,
sortable: 'custom',
@@ -154,6 +164,7 @@ export default {
prop: 'UserType',
label: this.$t('system:userlist:table:UserType'),
minWidth: 100,
+ slot: 'UserTypeSlot',
sortable: 'custom',
showOverflowTooltip: true,
},
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index c98a697c..48b0f80d 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -104,6 +104,7 @@
/>
{
+ .then(async (res) => {
if (res && res.length > 0) {
- this.$store.dispatch('global/getNoticeList')
+ await this.$store.dispatch('global/getNoticeList')
this.$router.addRoutes(res)
this.toggleRoleLoading = false
if (this.loginType === 'DevOps') {
diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index 488c1954..3f5b19f7 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -107,11 +107,11 @@ export default {
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.07)',
})
- getUser(this.userId)
+ getUser()
.then(async (res) => {
this.user = res.Result
/* eslint-disable */
- zzSessionStorage.setItem('realName', this.user.RealName)
+ zzSessionStorage.setItem('Name', this.user.FullName)
await store.dispatch('user/updateInfo')
loading.close()
})
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index ae323a63..b96ef01c 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -490,7 +490,7 @@ export default {
},
methods: {
getUserInfo() {
- getUser(this.userId).then(async res => {
+ getUser().then(async res => {
this.user = res.Result
}).catch(() => { loading.close() })
},
diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue
index 2dfecd78..94561ea4 100644
--- a/src/views/user/myInfo.vue
+++ b/src/views/user/myInfo.vue
@@ -17,36 +17,78 @@
{{ $t('trials:trials-myinfo:title:basicInfo') }}
-
+
-
-
+
-
-
+
-
+
Male
Female
-
-
+
-
-
+
-
-
+
@@ -68,39 +110,97 @@
-
+
{{ user.UserName }}
-
+
{{ $t('trials:trials-myinfo:button:update') }}
-
+
{{ user.Phone }}
-
+
{{ $t('trials:trials-myinfo:button:update') }}
-
+
{{ user.EMail }}
-
- {{ sendTitle }}
+
+ {{ sendTitle }}
-
-
+
+
{{ $t('trials:trials-myinfo:button:update') }}
@@ -111,18 +211,52 @@
{{ $t('trials:trials-myinfo:title:updatePaasord') }}
-
+
-
-
+
-
-
+
-
-
+
From dec01d779d0aba8517c7ad0e9453ebfa92825aac Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 11:42:11 +0800
Subject: [PATCH 014/194] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/user/components/UserInfo.vue | 2 +-
src/views/system/user/components/roleList.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 22c477ab..84c03f80 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -281,7 +281,7 @@ export default {
this.user.Roles.push(item.UserTypeId)
}
this.user.UserRoleList.push({
- UserTypeEnum: item.UserTypeEnum,
+ UserTypeEnum: item.UserType,
UserTypeId: item.UserTypeId,
IsUserRoleDisabled: item.IsUserRoleDisabled,
UserTypeShortName: item.UserTypeShortName,
diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
index 06d2e0e8..d4138223 100644
--- a/src/views/system/user/components/roleList.vue
+++ b/src/views/system/user/components/roleList.vue
@@ -181,7 +181,7 @@ export default {
arr.forEach((item) => {
this.list.push({
UserTypeEnum: item.UserTypeEnum,
- UserTypeId: item.UserTypeId,
+ UserTypeId: item.Id,
IsUserRoleDisabled: false,
UserTypeShortName: item.UserTypeShortName,
})
From f637f746cbdb2ec4df56351274e89b8c3f8fcf0b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 13:27:31 +0800
Subject: [PATCH 015/194] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/forgetpassword/index.vue | 21 +++++++++++--------
src/views/system/user/components/roleList.vue | 1 +
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 1f18d6f4..d66f6c34 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -76,7 +76,8 @@
>
-
-
+ -->
{
this.formLoading = false
- this.users = res.Result
- if (this.users.length === 1) {
- this.form.UserId = this.users[0].UserId
- this.form.UserType = this.users[0].UserType
- }
+ this.form.UserId = res.Result.Id
+ this.form.UserName = res.Result.UserName
+ // this.users = res.Result
+ // if (this.users.length === 1) {
+ // this.form.UserId = this.users[0].UserId
+ // this.form.UserType = this.users[0].UserType
+ // }
// 验证成功
this.$message.success(
this.$t('passwordReset:message:verifiedSuccessfully')
diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
index d4138223..f8b14998 100644
--- a/src/views/system/user/components/roleList.vue
+++ b/src/views/system/user/components/roleList.vue
@@ -7,6 +7,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
+ :show-close="false"
:title="$t('system:userlist:roleList:title')"
:before-close="cancel"
>
From 9bdb8f64b3b23ef2b0c9c4c0f049e01ff6e6d581 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 14:10:31 +0800
Subject: [PATCH 016/194] 1
---
src/views/email-recompose/index.vue | 1 -
src/views/system/user/components/UserInfo.vue | 1 -
src/views/system/user/components/roleList.vue | 1 -
3 files changed, 3 deletions(-)
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 9a11ceb9..ba74eceb 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -95,7 +95,6 @@ export default {
: 'zh'
/* eslint-disable */
var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
- console.log(!reg1.test(value))
if (!reg1.test(value)) {
callback(
lang === 'zh'
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 84c03f80..6c21913b 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -300,7 +300,6 @@ export default {
: 'zh'
/* eslint-disable */
var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
- console.log(!reg1.test(value))
if (!reg1.test(value)) {
callback(
lang === 'zh'
diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
index f8b14998..f79c7e92 100644
--- a/src/views/system/user/components/roleList.vue
+++ b/src/views/system/user/components/roleList.vue
@@ -168,7 +168,6 @@ export default {
roles.push(item.UserTypeId)
}
})
- console.log(roles)
this.$emit('update:roles', roles)
this.$emit('update:visible', false)
},
From b233535d9554b00feb6d16f77861852874299bae Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 14:47:12 +0800
Subject: [PATCH 017/194] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/trials.js | 9 +
.../personnel-manage/components/staff.vue | 369 +++++++++++++++---
2 files changed, 314 insertions(+), 64 deletions(-)
diff --git a/src/api/trials.js b/src/api/trials.js
index d3df4757..26bba548 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3922,4 +3922,13 @@ export function configTrialSPMInfo(data) {
method: 'post',
data
})
+}
+
+// 项目添加角色修改权限
+export function updateTrialUserRole(data) {
+ return request({
+ url: `/TrialMaintenance/updateTrialUserRole`,
+ method: 'put',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
index 5fb31630..4ddfcaaf 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@@ -16,7 +16,12 @@
-
@@ -42,14 +52,20 @@
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
@@ -57,7 +73,9 @@
+ {{
+ scope.row.TrialUserRoleList.map(
+ (item) => item.UserTypeShortName
+ ).join(',')
+ }}
+
+
+
- {{ $fd('IsUserExitTrial', scope.row.IsDeleted) }}
- {{ $fd('IsUserExitTrial', scope.row.IsDeleted) }}
+ {{
+ $fd('IsUserExitTrial', scope.row.IsDeleted)
+ }}
+ {{
+ $fd('IsUserExitTrial', scope.row.IsDeleted)
+ }}
@@ -156,7 +195,11 @@
width="160"
>
- {{ scope.row.JoinTime?moment(scope.row.JoinTime).format('YYYY-MM-DD'):'' }}
+ {{
+ scope.row.JoinTime
+ ? moment(scope.row.JoinTime).format('YYYY-MM-DD')
+ : ''
+ }}
@@ -168,25 +211,29 @@
width="160"
>
- {{ scope.row.RemoveTime? moment(scope.row.RemoveTime).format('YYYY-MM-DD'):'' }}
+ {{
+ scope.row.RemoveTime
+ ? moment(scope.row.RemoveTime).format('YYYY-MM-DD')
+ : ''
+ }}
-
-
+
-
-
- {{ item.label }}
+
+
+ {{ item.label }}
-
+
-
+
-
-
+
{{ $t('common:button:cancel') }}
-
+
{{ $t('common:button:save') }}
+
+
+
+
+
+
+ {{ $fd('IsEnable', !scope.row.IsDeleted) }}
+
+
+
+
+
+ {{ scope.row.UpdateTime }}
+
+
+
+
+
+
+ {{ scope.row.UpdateTime }}
+
+
+
+
+
+
+ {{ $fd('IsEnable', false) }}
+
+
+ {{ $fd('IsEnable', true) }}
+
+
+
+
+
+
From 7ed4dd7e24f104e31f56894910b6f590a94d7acc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 14:51:36 +0800
Subject: [PATCH 018/194] 1
---
src/views/system/user/components/UserInfo.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 6c21913b..1f8de2ec 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -281,7 +281,7 @@ export default {
this.user.Roles.push(item.UserTypeId)
}
this.user.UserRoleList.push({
- UserTypeEnum: item.UserType,
+ UserTypeEnum: item.UserTypeEnum,
UserTypeId: item.UserTypeId,
IsUserRoleDisabled: item.IsUserRoleDisabled,
UserTypeShortName: item.UserTypeShortName,
From 9d3ba7eb578163d6c82154b0848f636b8f7c8234 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 15:55:36 +0800
Subject: [PATCH 019/194] 1
---
.../trials-layout/components/trialsNavbar.vue | 1 -
.../personnel-manage/components/site.vue | 2 +-
.../components/staffExternalForm.vue | 2 +-
.../personnel-manage/components/staffForm.vue | 158 ++++++++++++------
4 files changed, 106 insertions(+), 57 deletions(-)
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index 48b0f80d..e8404a87 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -154,7 +154,6 @@ export default {
},
created() {
// this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
- console.log(this.$route.path, 'this.$route.path')
this.changeRoute(this.$route)
},
methods: {
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index fed20e1a..8a7224b0 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -412,7 +412,7 @@
>
-
+
{{ $t('trials:staff:table:name') }}:
-
+
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
{{ $t('common:button:add') }}
@@ -101,17 +139,25 @@
sortable="custom"
min-width="100"
/>
-
-
-
+ {{ subjectCode }}
+ {{ taskBlindName }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+
+
+
+
+ {{ item.QuestionName }}
+
+
+
+ 分段
+ 是否可测量
+ 平均值
+
+
+
+
+
+
+
+
+ {{ getLesionName(item.TableQuestions.Questions, q) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 2e7c5019..4f9b4432 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -373,13 +373,13 @@ export default {
})
},
async beforeLeave() {
- if (this.questionFormChangeState && this.CriterionType !== 2) {
- var msg = this.$t('trials:readingReport:message:msg5')
- var isgo = await this.myConfirm(msg)
- if (!isgo) {
- return Promise.resolve(true)
- }
- }
+ // if (this.questionFormChangeState && this.CriterionType !== 2) {
+ // var msg = this.$t('trials:readingReport:message:msg5')
+ // var isgo = await this.myConfirm(msg)
+ // if (!isgo) {
+ // return Promise.resolve(true)
+ // }
+ // }
var list = null
DicomEvent.$emit('getAllUnSaveLesions', val => {
list = val
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js
new file mode 100644
index 00000000..92caea2c
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js
@@ -0,0 +1,404 @@
+import * as cornerstoneTools from 'cornerstone-tools'
+const external = cornerstoneTools.external
+// State
+const getToolState = cornerstoneTools.getToolState
+const textStyle = cornerstoneTools.textStyle
+const toolColors = cornerstoneTools.toolColors
+const toolStyle = cornerstoneTools.toolStyle
+// Drawing
+const getNewContext = cornerstoneTools.import('drawing/getNewContext')
+const draw = cornerstoneTools.import('drawing/draw')
+const drawHandles = cornerstoneTools.import('drawing/drawHandles')
+const drawTextBox = cornerstoneTools.import('drawing/drawTextBox')
+// Utilities
+const getRGBPixels = cornerstoneTools.import('util/getRGBPixels')
+const calculateSUV = cornerstoneTools.import('util/calculateSUV')
+// import { probeCursor } from '../cursors/index.js';
+// import { getLogger } from '../../util/logger.js';
+const throttle = cornerstoneTools.import('util/throttle')
+const getModule = cornerstoneTools.getModule
+const getPixelSpacing = cornerstoneTools.import('util/getPixelSpacing')
+// import numbersWithCommas from './../../util/numbersWithCommas.js';
+const numbersWithCommas = cornerstoneTools.import('util/numbersWithCommas')
+// const logger = getLogger('tools:annotation:ProbeTool');
+import calculateEllipseStatistics from './calculateEllipseStatistics'
+import getCircleCoords from './getCircleCoords'
+/**
+ * @public
+ * @class ProbeTool
+ * @memberof Tools.Annotation
+ * @classdesc Tool which provides a probe of the image data at the
+ * desired position.
+ * @extends Tools.Base.BaseAnnotationTool
+ */
+export default class ProbeTool extends cornerstoneTools.ProbeTool {
+ constructor(props = {}) {
+ const defaultProps = {
+ name: 'Probe',
+ supportedInteractionTypes: ['Mouse', 'Touch'],
+ // svgCursor: probeCursor,
+ configuration: {
+ drawHandles: true,
+ renderDashed: false,
+ handleRadius: 0,
+ fixedRadius: 0,
+ hideHandlesIfMoving: false,
+ digits: 1,
+ showRadius: false,
+ },
+ };
+
+ super(props, defaultProps);
+
+ this.throttledUpdateCachedStats = throttle(this.updateCachedStats, 110);
+ }
+
+ createNewMeasurement(eventData) {
+ const goodEventData =
+ eventData && eventData.currentPoints && eventData.currentPoints.image;
+
+ if (!goodEventData) {
+ logger.error(
+ `required eventData not supplied to tool ${this.name}'s createNewMeasurement`
+ );
+
+ return;
+ }
+
+ return {
+ visible: true,
+ active: true,
+ color: undefined,
+ invalidated: true,
+ handles: {
+ // start: {
+ // x: eventData.currentPoints.image.x,
+ // y: eventData.currentPoints.image.y,
+ // highlight: true,
+ // active: false,
+ // },
+ end: {
+ x: eventData.currentPoints.image.x,
+ y: eventData.currentPoints.image.y,
+ highlight: true,
+ active: true,
+ radius: 0
+ },
+ },
+ };
+ }
+
+ /**
+ *
+ *
+ * @param {*} element
+ * @param {*} data
+ * @param {*} coords
+ * @returns {Boolean}
+ */
+ pointNearTool(element, data, coords) {
+ const hasEndHandle = data && data.handles && data.handles.end;
+ const validParameters = hasEndHandle;
+
+ if (!validParameters) {
+ logger.warn(
+ `invalid parameters supplied to tool ${this.name}'s pointNearTool`
+ );
+ }
+
+ if (!validParameters || data.visible === false) {
+ return false;
+ }
+
+ const probeCoords = external.cornerstone.pixelToCanvas(
+ element,
+ data.handles.end
+ );
+
+ return external.cornerstoneMath.point.distance(probeCoords, coords) < 5;
+ }
+ // pointNearTool(element, data, coords) {
+ // const hasEndHandle = data && data.handles && data.handles.end;
+ // const validParameters = hasEndHandle;
+
+ // if (!validParameters) {
+ // logger.warn(
+ // `invalid parameters supplied to tool ${this.name}'s pointNearTool`
+ // );
+ // }
+
+ // if (!validParameters || data.visible === false) {
+ // return false;
+ // }
+ // // data.handles.end.x = data.handles.end.x + 10
+ // let endCoords = {
+ // x: data.handles.end.x + 50,
+ // y: data.handles.end.y,
+ // highlight: data.handles.end.highlight,
+ // active: data.handles.end.active,
+ // }
+ // const probeCoords = external.cornerstone.pixelToCanvas(
+ // element,
+ // endCoords
+ // );
+
+ // return external.cornerstoneMath.point.distance(probeCoords, coords) < 5;
+ // }
+
+ // updateCachedStats(image, element, data) {
+ // const x = Math.round(data.handles.end.x);
+ // const y = Math.round(data.handles.end.y);
+
+ // const stats = {};
+
+ // if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+ // stats.x = x;
+ // stats.y = y;
+
+ // if (image.color) {
+ // stats.storedPixels = getRGBPixels(element, x, y, 1, 1);
+ // } else {
+ // stats.storedPixels = external.cornerstone.getStoredPixels(
+ // element,
+ // x,
+ // y,
+ // 1,
+ // 1
+ // );
+ // stats.sp = stats.storedPixels[0];
+ // stats.mo = stats.sp * image.slope + image.intercept;
+ // stats.suv = calculateSUV(image, stats.sp);
+ // }
+ // }
+
+ // data.cachedStats = stats;
+ // data.invalidated = false;
+ // }
+ updateCachedStats(image, element, data) {
+ const seriesModule =
+ external.cornerstone.metaData.get('generalSeriesModule', image.imageId) ||
+ {};
+ const modality = seriesModule.modality;
+ const pixelSpacing = getPixelSpacing(image);
+ const { fixedRadius, digits } = this.configuration;
+ const stats = _calculateStats(
+ image,
+ element,
+ data.handles,
+ modality,
+ pixelSpacing,
+ fixedRadius,
+ digits
+ );
+
+ data.cachedStats = stats;
+ data.invalidated = false;
+ }
+
+ renderToolData(evt) {
+ const eventData = evt.detail;
+ const { fixedRadius, renderDashed } = this.configuration;
+ const toolData = getToolState(evt.currentTarget, this.name);
+
+ if (!toolData) {
+ return;
+ }
+
+ // We have tool data for this element - iterate over each one and draw it
+ const context = getNewContext(eventData.canvasContext.canvas);
+ const { image, element } = eventData;
+ const fontHeight = textStyle.getFontSize();
+ const lineDash = getModule('globalConfiguration').configuration.lineDash;
+ const pixelSpacing = getPixelSpacing(image);
+ // Meta
+ const seriesModule =
+ external.cornerstone.metaData.get('generalSeriesModule', image.imageId) ||
+ {};
+
+ // Pixel Spacing
+ const modality = seriesModule.modality;
+ const hasPixelSpacing = pixelSpacing && pixelSpacing.rowPixelSpacing && pixelSpacing.colPixelSpacing;
+ for (let i = 0; i < toolData.data.length; i++) {
+ const data = toolData.data[i];
+ if (data.visible === false) {
+ continue;
+ }
+
+ draw(context, context => {
+ const color = toolColors.getColorIfActive(data);
+
+ if (this.configuration.drawHandles) {
+ // Draw the handles
+ let radius = getCanvasRadius(data.handles, fixedRadius, element, pixelSpacing)
+ data.handles.end.radius = radius
+ const handleOptions = { handleRadius: radius, color };
+
+ if (renderDashed) {
+ handleOptions.lineDash = lineDash;
+ }
+ drawHandles(context, eventData, data.handles, handleOptions);
+ }
+
+ // Update textbox stats
+ if (data.invalidated === true) {
+ if (data.cachedStats) {
+ this.throttledUpdateCachedStats(image, element, data);
+ } else {
+ this.updateCachedStats(image, element, data);
+ }
+ }
+
+ // let text, str;
+ let textLines = []
+ const { x, y, area, mean, radius } = data.cachedStats;
+
+ if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+ // text = `${x}, ${y}`;
+ if (data.remark) {
+ textLines.push(`${data.remark}`)
+ }
+ if (!image.color) {
+ // Draw text
+ let unit = _getUnit(modality, this.configuration.showHounsfieldUnits);
+
+ // textLines.push(_formatArea(area, hasPixelSpacing));
+ if (mean) {
+ // str += `mean: ${parseFloat(mean.toFixed(3))}`;
+ textLines.push(`Mean: ${mean} ${unit}`)
+ }
+ // if (radius) {
+ // str += `radius: ${parseFloat(radius.toFixed(3))}`;
+ // textLines.push(`radius: ${parseFloat(radius.toFixed(3))}`)
+ // }
+ }
+ let r = getPixelRadius(fixedRadius, pixelSpacing)
+ // Coords for text
+ const coords = {
+ // Translate the x/y away from the cursor
+ x: data.handles.end.x + r,
+ y: data.handles.end.y - r,
+ };
+ const textCoords = external.cornerstone.pixelToCanvas(
+ eventData.element,
+ coords
+ );
+ drawTextBox(
+ context,
+ textLines,
+ textCoords.x,
+ textCoords.y ,
+ color
+ );
+ // drawTextBox(context, '', textCoords.x, textCoords.y, color);
+ }
+ });
+ }
+ }
+}
+function _getUnit(modality, showHounsfieldUnits) {
+ return modality === 'CT' && showHounsfieldUnits !== false ? 'HU' : '';
+}
+function _formatArea(area, hasPixelSpacing) {
+ const suffix = hasPixelSpacing
+ ? ` mm${String.fromCharCode(178)}`
+ : ` px${String.fromCharCode(178)}`;
+
+ return `Area: ${numbersWithCommas(area.toFixed(2))}${suffix}`;
+}
+function getCanvasRadius(handles, fixedRadius, element, pixelSpacing) {
+ let startCoords = {
+ x: handles.end.x,
+ y: handles.end.y
+ }
+ const handleCanvasStartCoords = external.cornerstone.pixelToCanvas(
+ element,
+ startCoords
+ );
+ let r = getPixelRadius(fixedRadius, pixelSpacing)
+ let endCoords = {
+ x: handles.end.x + r,
+ y: handles.end.y
+ }
+ const handleCanvasEndCoords = external.cornerstone.pixelToCanvas(
+ element,
+ endCoords
+ );
+ return Math.abs(handleCanvasEndCoords.x - handleCanvasStartCoords.x)
+}
+function getPixelRadius(r, pixelSpacing) {
+ return r / ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)
+}
+function _calculateStats(image, element, handles, modality, pixelSpacing, fixedRadius, digits) {
+ // Retrieve the bounds of the ellipse in image coordinates
+ let startCoords = {
+ x: handles.end.x,
+ y: handles.end.y
+ }
+ let r = getPixelRadius(fixedRadius, pixelSpacing)
+ let endCoords = {
+ x: handles.end.x + r,
+ y: handles.end.y
+ }
+ const circleCoordinates = getCircleCoords(startCoords, endCoords);
+
+ // Retrieve the array of pixels that the ellipse bounds cover
+ const pixels = external.cornerstone.getPixels(
+ element,
+ circleCoordinates.left,
+ circleCoordinates.top,
+ circleCoordinates.width,
+ circleCoordinates.height
+ );
+
+ // Calculate the mean & standard deviation from the pixels and the ellipse details.
+ const ellipseMeanStdDev = calculateEllipseStatistics(
+ pixels,
+ circleCoordinates
+ );
+
+ let meanStdDevSUV;
+
+ if (modality === 'PT') {
+ meanStdDevSUV = {
+ mean: calculateSUV(image, ellipseMeanStdDev.mean, true) || 0,
+ stdDev: calculateSUV(image, ellipseMeanStdDev.stdDev, true) || 0,
+ };
+ }
+
+ const radius =
+ (circleCoordinates.width *
+ ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)) /
+ 2;
+ const perimeter = 2 * Math.PI * radius;
+ const area =
+ Math.PI *
+ ((circleCoordinates.width *
+ ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)) /
+ 2) *
+ ((circleCoordinates.height *
+ ((pixelSpacing && pixelSpacing.rowPixelSpacing) || 1)) /
+ 2);
+ const x = Math.round(handles.end.x);
+ const y = Math.round(handles.end.y);
+
+ const stats = {};
+
+ if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+ stats.x = x;
+ stats.y = y;
+ }
+ return {
+ area: area || 0,
+ radius: radius || 0,
+ perimeter: perimeter || 0,
+ mean: ellipseMeanStdDev.mean.toFixed(digits) || 0,
+ stdDev: ellipseMeanStdDev.stdDev.toFixed(digits) || 0,
+ min: ellipseMeanStdDev.min.toFixed(digits) || 0,
+ max: ellipseMeanStdDev.max.toFixed(digits) || 0,
+ meanStdDevSUV,
+ x: stats.x,
+ y: stats.y
+ };
+}
+
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js
new file mode 100644
index 00000000..867437f5
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js
@@ -0,0 +1,67 @@
+import pointInEllipse from './pointInEllipse.js';
+
+/**
+ * Calculates the statistics of an elliptical region of interest.
+ *
+ * @private
+ * @function calculateEllipseStatistics
+ *
+ * @param {number[]} sp - Array of the image data's pixel values.
+ * @param {Object} ellipse - { top, left, height, width } - An object describing the ellipse.
+ * @returns {Object} { count, mean, variance, stdDev, min, max }
+ */
+export default function(sp, ellipse) {
+ let sum = 0;
+ let sumSquared = 0;
+ let count = 0;
+ let index = 0;
+ let min = null;
+ let max = null;
+
+ for (let y = ellipse.top; y < ellipse.top + ellipse.height; y++) {
+ for (let x = ellipse.left; x < ellipse.left + ellipse.width; x++) {
+ const point = {
+ x,
+ y,
+ };
+
+ if (pointInEllipse(ellipse, point)) {
+ if (min === null) {
+ min = sp[index];
+ max = sp[index];
+ }
+
+ sum += sp[index];
+ sumSquared += sp[index] * sp[index];
+ min = Math.min(min, sp[index]);
+ max = Math.max(max, sp[index]);
+ count++;
+ }
+
+ index++;
+ }
+ }
+
+ if (count === 0) {
+ return {
+ count,
+ mean: 0.0,
+ variance: 0.0,
+ stdDev: 0.0,
+ min: 0.0,
+ max: 0.0,
+ };
+ }
+
+ const mean = sum / count;
+ const variance = sumSquared / count - mean * mean;
+
+ return {
+ count,
+ mean,
+ variance,
+ stdDev: Math.sqrt(variance),
+ min,
+ max,
+ };
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js
new file mode 100644
index 00000000..ddc90942
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js
@@ -0,0 +1,21 @@
+import * as cornerstoneTools from 'cornerstone-tools'
+const external = cornerstoneTools.external
+
+/**
+ * Retrieve the bounds of the circle in image coordinates
+ *
+ * @param {*} startHandle
+ * @param {*} endHandle
+ * @returns {{ left: number, top: number, width: number, height: number }}
+ */
+export default function getCircleCoords(startHandle, endHandle) {
+ const { distance } = external.cornerstoneMath.point
+ const radius = distance(startHandle, endHandle)
+
+ return {
+ left: Math.floor(Math.min(startHandle.x - radius, endHandle.x)),
+ top: Math.floor(Math.min(startHandle.y - radius, endHandle.y)),
+ width: radius * 2,
+ height: radius * 2
+ }
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js
new file mode 100644
index 00000000..e7a09e2e
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js
@@ -0,0 +1,39 @@
+/**
+ * Returns true if a point is within an ellipse
+ * @export @public @method
+ * @name pointInEllipse
+ *
+ * @param {Object} ellipse Object defining the ellipse.
+ * @param {Object} location The location of the point.
+ * @returns {boolean} True if the point is within the ellipse.
+ */
+export default function(ellipse, location) {
+ const xRadius = ellipse.width / 2;
+ const yRadius = ellipse.height / 2;
+
+ if (xRadius <= 0.0 || yRadius <= 0.0) {
+ return false;
+ }
+
+ const center = {
+ x: ellipse.left + xRadius,
+ y: ellipse.top + yRadius,
+ };
+
+ /* This is a more general form of the circle equation
+ *
+ * X^2/a^2 + Y^2/b^2 <= 1
+ */
+
+ const normalized = {
+ x: location.x - center.x,
+ y: location.y - center.y,
+ };
+
+ const inEllipse =
+ (normalized.x * normalized.x) / (xRadius * xRadius) +
+ (normalized.y * normalized.y) / (yRadius * yRadius) <=
+ 1.0;
+
+ return inEllipse;
+}
From 7882c9b631efc11a60fbd8f824a3dd85e57d941b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 26 Dec 2024 11:02:58 +0800
Subject: [PATCH 025/194] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/email-recompose/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index ba74eceb..21c1ce7b 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -29,9 +29,9 @@
-
+
-
+
Date: Thu, 26 Dec 2024 14:07:21 +0800
Subject: [PATCH 029/194] 1
---
.../reading/dicoms/components/MRIPDFF/QuestionForm.vue | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 92df7c74..884a8368 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -47,7 +47,7 @@
- 定位
+ 返回
i.tableQuestionId === qs.Id)
let params = {}
- if (i > -1 && this.markList[i].measureData) {
+ if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
let measureData = this.markList[i].measureData.MeasureData
// 上传截图
DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: measureData.OrderMarkName, lesionType: null, isMarked: !!measureData }, async val => {
From d645df58c2b41cb6d0e8b4daa5e9b21c52582929 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 26 Dec 2024 14:13:20 +0800
Subject: [PATCH 030/194] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/admin.js | 9 +++
src/views/system/user/components/UserInfo.vue | 59 +++++++++++++++++--
src/views/system/user/components/roleList.vue | 48 +++++++++------
3 files changed, 95 insertions(+), 21 deletions(-)
diff --git a/src/api/admin.js b/src/api/admin.js
index 3f8c1073..71a658c3 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -325,3 +325,12 @@ export function useUserIDGetDoctorID(data) {
data
})
}
+
+// 管理端修改用户角色
+export function updateUserRoleInfo(data) {
+ return request({
+ url: `/User/updateUserRoleInfo`,
+ method: 'put',
+ data
+ })
+}
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 1f8de2ec..db0d0c04 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -85,11 +85,32 @@
style="width: 100%"
:disabled="user.CanEditUserType === false || type === 1"
@change="handleChange"
+ v-if="type === 0"
>
-
+
+
+
@@ -193,6 +215,10 @@ export default {
},
methods: {
openRoleList() {
+ this.userRoleList = []
+ this.user.UserRoleList.forEach((item) => {
+ this.userRoleList.push(Object.assign({}, item))
+ })
this.visible = true
},
handleChange(val) {
@@ -274,10 +300,33 @@ export default {
IdentityUserId: this.userId,
}).then((res) => {
this.user = res.Result
+ this.Roles = []
this.user.Roles = []
this.user.UserRoleList = []
res.Result.AccountList.forEach((item) => {
if (!item.IsUserRoleDisabled) {
+ this.Roles.push(item.UserTypeId)
+ this.user.Roles.push(item.UserTypeId)
+ }
+ this.user.UserRoleList.push({
+ UserTypeEnum: item.UserTypeEnum,
+ UserTypeId: item.UserTypeId,
+ IsUserRoleDisabled: item.IsUserRoleDisabled,
+ UserTypeShortName: item.UserTypeShortName,
+ })
+ })
+ })
+ },
+ getRoleList() {
+ getUser({
+ IdentityUserId: this.userId,
+ }).then((res) => {
+ this.Roles = []
+ this.user.Roles = []
+ this.user.UserRoleList = []
+ res.Result.AccountList.forEach((item) => {
+ if (!item.IsUserRoleDisabled) {
+ this.Roles.push(item.UserTypeId)
this.user.Roles.push(item.UserTypeId)
}
this.user.UserRoleList.push({
@@ -315,6 +364,8 @@ export default {
}
}
return {
+ userRoleList: [],
+ Roles: [],
user: {
Roles: [],
UserRoleList: [],
diff --git a/src/views/system/user/components/roleList.vue b/src/views/system/user/components/roleList.vue
index f79c7e92..4a619881 100644
--- a/src/views/system/user/components/roleList.vue
+++ b/src/views/system/user/components/roleList.vue
@@ -7,7 +7,6 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
- :show-close="false"
:title="$t('system:userlist:roleList:title')"
:before-close="cancel"
>
@@ -19,7 +18,12 @@
>
{{ $t('common:button:new') }}
-
+
-
+
{{ $t('common:button:confirm') }}
+
+
+ {{ $t('common:button:cancel') }}
+
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index b068b91c..cb616a7d 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -1,6 +1,6 @@
-
+
{{ $t('trials:externalStaff:table:name') }}:
@@ -12,23 +12,54 @@
{{ $t('trials:externalStaff:table:phone') }}:
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
{{ $t('trials:staff:button:permissionConfiguration') }}
-
+
{{ $t('trials:staff:button:sendEmail') }}
-
+
{{ $t('trials:staff:button:addExternalStaff') }}
@@ -57,7 +88,9 @@
sortable="custom"
min-width="100"
>
- {{ scope.row.LastName + ' / ' + scope.row.FirstName }}
+ {{
+ scope.row.LastName + ' / ' + scope.row.FirstName
+ }}
- {{ userTypeOptions.length > 0 ? userTypeOptions.find((v) => { return v.Id == scope.row.UserTypeId }).UserTypeShortName : '' }}
+ {{
+ userTypeOptions.length > 0
+ ? userTypeOptions.find((v) => {
+ return v.Id == scope.row.UserTypeId
+ }).UserTypeShortName
+ : ''
+ }}
- {{ $fd('IsJoin', scope.row.IsJoin) }}
+ {{
+ $fd('IsJoin', scope.row.IsJoin)
+ }}
-
+
-
-
-
+
+
- {{ item.label }}
+ {{ item.label }}
-
+
- {{ item.label }}
+ {{ item.label }}
-
+
- {{ item.label }}
+ {{ item.label }}
@@ -159,7 +238,14 @@
From 328359dfde7c478585594a3ad37c398580997be9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 14:49:58 +0800
Subject: [PATCH 046/194] =?UTF-8?q?=E7=99=BB=E5=BD=95ip=E4=B8=8D=E4=B8=80?=
=?UTF-8?q?=E8=87=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f37debd8..8944d0a3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -308,6 +308,8 @@ export default {
Img1,
toggleRoleVisible: false,
toggleRoleLoading: false,
+
+ LoginState: 0,
}
},
computed: {
@@ -383,10 +385,12 @@ export default {
loginIn(Id) {
this.loading = true
this.showCode = false
+ this.LoginState = 0
if (Id) this.loginForm.UserId = Id
this.$store
.dispatch('user/login', this.loginForm)
.then((res) => {
+ this.LoginState = res.BasicInfo.LoginState
if (res.BasicInfo.IsFirstAdd) {
// 当前用户为首次登录,请先修改密码之后再次登录
this.$message.success(this.$t('login:message:login1'))
@@ -422,11 +426,12 @@ export default {
},
})
return
- } else if (res.BasicInfo.LoginState === 2) {
- // 本次登录的IP或设备与上次不一致，请确认'
- // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
- this.$message.warning(this.$t('login:message:login4'))
}
+ // else if (res.BasicInfo.LoginState === 2) {
+ // // 本次登录的IP或设备与上次不一致，请确认'
+ // // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
+ // this.$message.warning(this.$t('login:message:login4'))
+ // }
if (
Array.isArray(this.$store.state.user.roles) &&
this.$store.state.user.roles.length === 1
@@ -455,6 +460,9 @@ export default {
if (res && res.length > 0) {
this.$store.dispatch('global/getNoticeList')
this.$router.addRoutes(res)
+ if (this.LoginState === 2) {
+ this.$message.warning(this.$t('login:message:login4'))
+ }
if (this.loginType === 'DevOps') {
this.$router.replace({ path: res[0].path })
return
From d790a95952c0fa3c80dc3e80cb1657a1821becdd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 16:21:01 +0800
Subject: [PATCH 047/194] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E8=A7=92=E8=89=B2=E6=97=B6=E5=8E=BB=E9=99=A4RC?=
=?UTF-8?q?=E5=92=8CDash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/user/components/UserInfo.vue | 4 ++--
src/views/system/user/components/roleList.vue | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index db0d0c04..73a63687 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -89,7 +89,7 @@
>
item.UserTypeId)
return this.userTypeOptions.filter(
- (item) => !arr.includes(item.Id) && item.UserTypeEnum !== 20
+ (item) =>
+ !arr.includes(item.Id) && ![4, 6, 20].includes(userType.UserTypeEnum)
)
},
},
From 41ac3d562ae5cacb6b63984ae9eeb3189cb83763 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 16:24:43 +0800
Subject: [PATCH 048/194] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/BaseForm/search-form.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue
index 378bec3a..101e399b 100644
--- a/src/components/BaseForm/search-form.vue
+++ b/src/components/BaseForm/search-form.vue
@@ -120,6 +120,7 @@
v-if="item.type === 'Daterange'"
v-model="searchData[item.prop]"
type="datetimerange"
+ :default-time="['00:00:00', '23:59:59']"
:range-separator="$t('baseForm:daterange:rangeSeparator')"
:start-placeholder="$t('baseForm:daterange:startPlaceholder')"
:end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
From 3c50254a2dfc13839aa00b74aba8ec30daf5840e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 16:40:07 +0800
Subject: [PATCH 049/194] =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/toggleRole/index.vue | 13 +++++++++++--
src/views/trials/trials-myinfo/account.vue | 8 +++++++-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/components/toggleRole/index.vue b/src/components/toggleRole/index.vue
index d1e9222b..7d508b3a 100644
--- a/src/components/toggleRole/index.vue
+++ b/src/components/toggleRole/index.vue
@@ -40,6 +40,7 @@
type="primary"
size="small"
@click="save"
+ :disabled="saveDisabled"
:loading="loading"
v-if="hasRole"
>
@@ -78,6 +79,9 @@ export default {
hasRole() {
return this.roles && this.roles.length > 0
},
+ saveDisabled() {
+ return this.form.userRoleId === zzSessionStorage.getItem('userId')
+ },
},
methods: {
cancel() {
@@ -98,11 +102,13 @@ export default {
\ No newline at end of file
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 4d543460..401dcaa3 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -127,7 +127,7 @@
1
},
+ saveDisabled() {
+ return this.userRoleId === zzSessionStorage.getItem('userId')
+ },
},
methods: {
// 切换角色
@@ -341,4 +344,7 @@ export default {
.el-radio-group {
margin-top: 12px;
}
+.el-radio {
+ width: 60px;
+}
\ No newline at end of file
From bf407a49fd34bfd9e42b370f910ae6849b230dac Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 17:22:23 +0800
Subject: [PATCH 050/194] 1
---
src/views/system/user/list/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 053e5dc5..ca6636f2 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -209,7 +209,7 @@ export default {
{
prop: 'LastChangePassWordTime',
label: this.$t('system:userlist:table:LastChangePassWordTime'),
- minWidth: 200,
+ minWidth: 250,
sortable: 'custom',
showOverflowTooltip: true,
},
From 13ba919484c75c3ab15c68bb82dd355362848435 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 27 Dec 2024 18:02:18 +0800
Subject: [PATCH 051/194] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trials-panel/reading/ad-review/index.vue | 30 +++++++++----------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index 7ad26027..45efb219 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/src/views/trials/trials-panel/reading/ad-review/index.vue
@@ -307,23 +307,21 @@
-
-
-
-
- {{ $t("trials:readingReport:button:skip") }}
-
-
- {{
- $t("common:button:save")
- }}
-
- {{
- $t("common:button:submit")
- }}
-
-
+
+
+
+ {{ $t("trials:readingReport:button:skip") }}
+
+
+ {{
+ $t("common:button:save")
+ }}
+
+ {{
+ $t("common:button:submit")
+ }}
+
Date: Mon, 30 Dec 2024 09:35:10 +0800
Subject: [PATCH 052/194] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=EF=BC=8C=E5=8C=B9=E9=85=8D=E7=AC=A6?=
=?UTF-8?q?=E6=9C=AA=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trials-panel/visit/crc-upload/index.vue | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index a0ed9df3..bf178718 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -742,7 +742,10 @@
-
+
@@ -1754,12 +1757,10 @@ export default {
this.selected.TrialId = this.subjectRowData.TrialId
this.selected.SubjectId = this.subjectRowData.SubjectId
this.isShow = true
- console.log(res)
})
}
},
handleView2(row) {
- console.log(row)
this.rowData = { ...row }
this.openType = 'look'
this.preview.visible = true
@@ -1914,7 +1915,6 @@ export default {
this.list = res.Result.CurrentPageData
this.total = res.Result.TotalCount
this.otherInfo = res.OtherInfo
- console.log(this.otherInfo)
})
.catch(() => {
this.loading = false
@@ -2053,9 +2053,16 @@ export default {
this.otherInfo.ClinicalInformationTransmissionEnum > 0 &&
this.rowData.IsBaseLine
) {
- const { ClinicalDataConfirmation } = const_.processSignature
- this.signCode = ClinicalDataConfirmation
- this.signVisible = true
+ getVisitClinicalDataName({ id: this.rowData.Id })
+ .then((res) => {
+ this.signReplaceText = res.Result.ClinicalDataName
+ const { ClinicalDataConfirmation } = const_.processSignature
+ this.signCode = ClinicalDataConfirmation
+ this.signVisible = true
+ })
+ .catch((err) => {
+ console.log(err)
+ })
} else {
this.submit()
}
From ca4f2c4a8e2a87a70cd00faf1313e7ae7af7117c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:15:50 +0800
Subject: [PATCH 053/194] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/login-log/detail.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/views/system/login-log/detail.vue b/src/views/system/login-log/detail.vue
index fedbb8ca..f8890f5b 100644
--- a/src/views/system/login-log/detail.vue
+++ b/src/views/system/login-log/detail.vue
@@ -49,6 +49,8 @@ export default {
title: this.$t('system:loginLog:dialog:title'),
width: '500px',
top: '10vh',
+ appendToBody: true,
+ bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
}
},
},
@@ -86,4 +88,9 @@ export default {
},
},
}
-
\ No newline at end of file
+
+
\ No newline at end of file
From 75f3b37c05226ded9c956e17bfce5c810e9d4b7f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:18:19 +0800
Subject: [PATCH 054/194] =?UTF-8?q?=E4=BB=B2=E8=A3=81=E8=A7=84=E5=88=99?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading-unit/components/ArbitrationRules.vue | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
index 75a91c56..8611acdd 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
@@ -72,12 +72,10 @@
"
:label="item.value"
v-if="
- (JudgyInfo.ArbitrationRule === 1 &&
- (item.value < 4 ||
- (item.value > 3 &&
- (QuestionList[index].Type === 'number' ||
- QuestionList[index].Type === 'calculation')))) ||
- (JudgyInfo.ArbitrationRule === 2 && item.value < 4)
+ item.value < 4 ||
+ (item.value > 3 &&
+ (QuestionList[index].Type === 'number' ||
+ QuestionList[index].Type === 'calculation'))
"
>
{{ item.label }}
From a78d848424a03cbf2ff7bd04988a89adfdc0e305 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:30:10 +0800
Subject: [PATCH 055/194] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/components/Navbar.vue | 123 +++++++++++++++++++++++++++----
1 file changed, 107 insertions(+), 16 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 49442e19..1800836a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -14,13 +14,13 @@
From 8ad77f1679bb2d3ce1a6726a9c4b1c690156c019 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 11:23:09 +0800
Subject: [PATCH 155/194] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/email-recompose/index.vue | 12 +-
src/views/error.vue | 7 +-
.../enrollment/components/Approval.vue | 104 +++++--
.../enrollment/components/Confirmation.vue | 11 +-
.../enrollment/components/Selection.vue | 11 +-
.../enrollment/components/Submission.vue | 11 +-
.../attachments/enrollment/index.vue | 276 +++++++++++-------
7 files changed, 276 insertions(+), 156 deletions(-)
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 29f809a9..49e12126 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -180,9 +180,9 @@ export default {
this.$i18n.locale = this.$route.query.lang
this.setLanguage(this.$route.query.lang)
this.$updateDictionary()
- if (!this.password.NewUserName) {
- this.$alert(this.$t('recompose:message:warning'))
- }
+ // if (!this.password.NewUserName) {
+ // this.$alert(this.$t('recompose:message:warning'))
+ // }
},
methods: {
...mapMutations({ setLanguage: 'lang/setLanguage' }),
@@ -194,8 +194,10 @@ export default {
} else {
this.$router.push(`/login`)
}
- this.$i18n.locale = 'zh'
- this.setLanguage('zh')
+ if (!this.$i18n.locale) {
+ this.$i18n.locale = 'zh'
+ this.setLanguage('zh')
+ }
this.$updateDictionary()
},
save() {
diff --git a/src/views/error.vue b/src/views/error.vue
index db3aa915..47389a41 100644
--- a/src/views/error.vue
+++ b/src/views/error.vue
@@ -2,7 +2,8 @@
- 
+
+ 
@@ -56,8 +57,10 @@ export default {
.pic-404 {
position: relative;
float: left;
- width: 400px;
+ width: 500px;
+ height: 300px;
overflow: hidden;
+ margin-right: 10px;
&__parent {
width: 100%;
}
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
index 5dd4dce1..88000983 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
@@ -1,14 +1,14 @@
-
+
- {{ scope.row.LastName }} / {{ scope.row.FirstName }}
+ {{ scope.row.LastName }} / {{ scope.row.FirstName }}
-
+ />
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
@@ -70,19 +83,34 @@
min-width="150"
/>
-
-
+ />
-
+ />
-
- {{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}
-
-
-
-
- {{
+ $t('trials:trials-list:form:indication:')
+ }}
+ {{ $fd('Indication', trialInfo.IndicationEnum)
+ }}{{
+ trialInfo.Indication ? '-' + trialInfo.Indication : ''
+ }}
- {{ trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ') }}
-
-
-
-
-
- {{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}
-
-
-
-
+
+
+
+ {{
+ trialInfo.DeclarationTypeEnumList.map((v) =>
+ $fd('DeclarationType', v)
+ ).join(', ')
+ }}
+
+
+
+
+
+ {{
+ trialInfo.CriterionList && trialInfo.CriterionList.length > 0
+ ? trialInfo.CriterionList.join(', ')
+ : ''
+ }}
+
+
+
-
- {{$fd('YesOrNoForInt', trialInfo.Expedited)}}
+
+ {{ $fd('YesOrNoForInt', trialInfo.Expedited) }}
-
+
{{ trialInfo.TotalReviewers }}
-
- {{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }}
-
-
+
+ {{
+ trialInfo.AttendedReviewerTypeEnumList.map((v) =>
+ $fd('AttendedReviewerType', v)
+ ).join(', ')
+ }}
+
@@ -60,7 +93,12 @@
-
+
@@ -127,18 +169,30 @@ export default {
trialInfo: null,
TrialId: '',
activeStatus: null,
- TrialMaxState: 0
+ TrialMaxState: 0,
}
},
mounted() {
this.TrialId = this.$route.query.trialId
this.initPage()
},
+ computed: {
+ isEN() {
+ return this.$i18n.locale !== 'zh'
+ },
+ },
methods: {
initPage() {
- getTrialInfoAndMaxTrialState(this.TrialId).then(res => {
+ getTrialInfoAndMaxTrialState(this.TrialId).then((res) => {
this.trialInfo = res.Result.TrialView
- var activeStatus = res.Result.TrialMaxState < 1 ? 0 : res.Result.TrialMaxState < 5 ? 1 : res.Result.TrialMaxState < 8 ? 2 : 3
+ var activeStatus =
+ res.Result.TrialMaxState < 1
+ ? 0
+ : res.Result.TrialMaxState < 5
+ ? 1
+ : res.Result.TrialMaxState < 8
+ ? 2
+ : 3
this.activeStatus = activeStatus
this.TrialMaxState = activeStatus
})
@@ -147,95 +201,93 @@ export default {
this.activeStatus = step
},
nextStep(stepName) {
- this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1;
- if(stepName==='confirmation'){
- this.activeStatus = 3;
+ this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1
+ if (stepName === 'confirmation') {
+ this.activeStatus = 3
}
this.TrialMaxState = this.activeStatus
this.$nextTick(
- function() {
+ function () {
this.$refs[stepName].getList()
}.bind(this)
)
- }
-
- }
+ },
+ },
}
From 70735f2c479817666acacca8c00d0677a4a48831 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 13:19:51 +0800
Subject: [PATCH 156/194] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/recompose/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index 99544b63..7f43ecbb 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -144,8 +144,10 @@ export default {
} else {
this.$router.push(`/login`)
}
- this.$i18n.locale = 'zh'
- this.setLanguage('zh')
+ if (!this.$i18n.locale) {
+ this.$i18n.locale = 'zh'
+ this.setLanguage('zh')
+ }
this.$updateDictionary()
},
save() {
From 13191c914e4d18aa9b68a144450719aaf11eecfb Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 20 Jan 2025 13:49:16 +0800
Subject: [PATCH 157/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=98=85=E7=89=87?=
=?UTF-8?q?=E6=A0=87=E5=87=86=E9=85=8D=E7=BD=AE=E9=A1=B5=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dictionary/template/components/AddCriterion.vue | 2 +-
src/views/dictionary/template/components/CriterionsTmp.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/dictionary/template/components/AddCriterion.vue b/src/views/dictionary/template/components/AddCriterion.vue
index 5d7f4d57..249cd998 100644
--- a/src/views/dictionary/template/components/AddCriterion.vue
+++ b/src/views/dictionary/template/components/AddCriterion.vue
@@ -50,7 +50,7 @@
-
+
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index 629d700b..e54ace34 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -141,8 +141,8 @@
sortable="custom"
/>
Date: Mon, 20 Jan 2025 14:05:36 +0800
Subject: [PATCH 158/194] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E5=9B=BD?=
=?UTF-8?q?=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 81003a5c..cbd8136e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -343,9 +343,9 @@ export default {
this.setLanguage('en')
this.$updateDictionary()
} else {
- // this.$i18n.locale = 'zh'
- // this.setLanguage('zh')
- // this.$updateDictionary()
+ this.$i18n.locale = 'zh'
+ this.setLanguage('zh')
+ this.$updateDictionary()
}
}
this.$refs.browserTip.open()
From 3441793bcb1cf683d8a4d041d6f7b66f86702802 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 20 Jan 2025 14:29:17 +0800
Subject: [PATCH 159/194] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/TrialsTab/index.vue | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index f49aafe6..981871c4 100644
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@@ -22,11 +22,14 @@
-
+
-
{{ $t('trials:trials:title:back') }}
-
+
+
From 73e0a13e91909313b73083817e6d7f1af2ff9cd8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 15:47:31 +0800
Subject: [PATCH 160/194] =?UTF-8?q?=E7=AE=80=E5=8E=86=E8=8B=B1=E6=96=87?=
=?UTF-8?q?=E5=A7=93=E5=90=8D=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../curriculumVitae/components/info/info.vue | 12 +++---------
src/views/reviewers/curriculumVitae/preview.vue | 5 +++--
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index 94f94864..68a6ef80 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -6,7 +6,7 @@
{{
- isEN ? DATA.FirstName + DATA.LastName : DATA.ChineseName
+ isEN ? DATA.LastName + ' / ' + DATA.FirstName : DATA.ChineseName
}}
{{ $fd('Sex', DATA.Sex) }}
@@ -269,16 +269,10 @@
:label="$t('curriculumVitae:info:form:City')"
v-if="isEN"
>
-
-
{{
isEN
- ? reviewerData.BasicInfoView.FirstName +
- reviewerData.BasicInfoView.LastName
+ ? reviewerData.BasicInfoView.LastName +
+ ' / ' +
+ reviewerData.BasicInfoView.FirstName
: reviewerData.BasicInfoView.ChineseName
}}
From 823ac2f085a6eb815ecd9c8c09cc5f0948474c7f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 15:58:19 +0800
Subject: [PATCH 161/194] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index cbd8136e..c31e6d48 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -328,6 +328,7 @@ export default {
},
},
mounted() {
+ let lang = zzSessionStorage.getItem('lang') || 'zh'
zzSessionStorage.clear()
this.loginType = this.$route.query.loginType
this.location = this.$route.query.location
@@ -343,8 +344,8 @@ export default {
this.setLanguage('en')
this.$updateDictionary()
} else {
- this.$i18n.locale = 'zh'
- this.setLanguage('zh')
+ this.$i18n.locale = lang
+ this.setLanguage(lang)
this.$updateDictionary()
}
}
@@ -388,8 +389,8 @@ export default {
.dispatch('user/login', this.loginForm)
.then((res) => {
if (res.BasicInfo.LoginState === 2) {
- this.$message.warning(this.$t('login:message:login4'))
- }
+ this.$message.warning(this.$t('login:message:login4'))
+ }
if (res.BasicInfo.IsFirstAdd) {
// 当前用户为首次登录,请先修改密码之后再次登录
this.$message.success(this.$t('login:message:login1'))
From 55ae6bac7e96eb28cbb9ea18ec912515d20beba2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 16:14:06 +0800
Subject: [PATCH 162/194] =?UTF-8?q?lili=E5=85=B3=E4=BA=8E=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c31e6d48..79431359 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -205,17 +205,21 @@
"
>
About
- 关于
-
- {{ $t('login:title:system_title_about') }}
+
关于
+
+
+
- {{ $t('login:title:system') }}
-
+
{{ $t('login:title:system') }}
+
V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
@@ -313,7 +317,8 @@ export default {
computed: {
...mapGetters(['asyncRoutes', 'routes', 'language']),
host() {
- return window.location.host
+ // return window.location.host
+ return 'elevateimaging.ai '
},
},
watch: {
From 6e1d07ee95cf97adbd8b22a1968963107c9974a2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 17:32:49 +0800
Subject: [PATCH 163/194] =?UTF-8?q?=E5=A4=9A=E9=A1=B5=E7=AD=BE=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E6=B8=85=E6=A5=9A=E7=BC=93=E5=AD=98uerId=E5=92=8Ciden?=
=?UTF-8?q?tityUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 79431359..21f33813 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -437,6 +437,8 @@ export default {
// // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
// this.$message.warning(this.$t('login:message:login4'))
// }
+ zzSessionStorage.removeItem('userId')
+ zzSessionStorage.removeItem('identityUserId')
this.changeRoleLogin()
})
.catch(() => {
From 102089c16fd639f85b061642bb4bfc0a6fc9b4e2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 09:23:40 +0800
Subject: [PATCH 164/194] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8BTab=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/TrialsTab/index.vue | 5 ++++-
src/views/trials/trials-layout/components/trialsNavbar.vue | 5 +++++
.../trials-panel/reading/read-task-allocation/index.vue | 7 ++++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index 981871c4..7ea17661 100644
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@@ -3,7 +3,7 @@
-
+
-
+
@@ -1013,6 +1013,11 @@ export default {
}
diff --git a/src/views/trials/trials-panel/setting/qc-question/index.vue b/src/views/trials/trials-panel/setting/qc-question/index.vue
index a0d8800e..65f82fef 100644
--- a/src/views/trials/trials-panel/setting/qc-question/index.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/index.vue
@@ -4,7 +4,7 @@
-
+
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
{{ $t('common:button:search') }}
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 157f44d3..37190fe6 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -8,14 +8,14 @@
:label="item.TrialReadingCriterionName"
:name="item.TrialReadingCriterionId"
>
-
+
{{ $t("trials:readingUnit:button:sync") }}
@@ -525,6 +525,9 @@ export default {
background: #e5ecef;
padding-left: 10px;
}
+ /deep/ .el-tabs--border-card>.el-tabs__content {
+ padding: 0px 15px;
+ }
/deep/ .el-collapse-item__content {
padding: 10px;
}
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index f7caecb0..5b1605f0 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -576,6 +576,11 @@ export default {
}
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index d66f6c34..170a0c5c 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -423,7 +423,7 @@ export default {
/* margin-bottom: 40px;*/
/*}*/
.is-error.my_new_pwd {
- margin-bottom: 40px;
+ margin-bottom: 45px;
}
.flexBox {
display: flex;
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index da7365e4..7fcb08e3 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -42,6 +42,7 @@
@@ -221,4 +222,7 @@ input {
background-color: transparent;
caret-color: #fff;
}
+::v-deep .is-error.my_new_pwd {
+ margin-bottom: 45px;
+}
diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue
index f16a0569..ce97b99e 100644
--- a/src/views/trials/trials-myinfo/password.vue
+++ b/src/views/trials/trials-myinfo/password.vue
@@ -27,6 +27,7 @@
\ No newline at end of file
diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue
index 17ccc97b..b79417d1 100644
--- a/src/views/user/myInfo.vue
+++ b/src/views/user/myInfo.vue
@@ -659,6 +659,6 @@ export default {
From ff0ddeea9a9853225709b45f5290546e24d449be Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 15:58:45 +0800
Subject: [PATCH 171/194] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading/medical-feedback/components/ChatForm.vue | 4 ++--
.../reading/mim-medical-audit/components/ChatForm.vue | 4 ++--
.../reading/mim-medical-audit/components/Conclusions.vue | 6 +++++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 5a8c2668..ccf2b913 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,8 +11,8 @@
({{ record.CreateTime }})
-
- {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index b2012239..58a8f22f 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,8 +11,8 @@
({{ record.CreateTime }})
-
- {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 899e1396..81c9d179 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -260,7 +260,11 @@ export default {
if (Object.keys(this.medicalReviewInfo).length > 0) {
for (const k in this.form) {
if (this.medicalReviewInfo.hasOwnProperty(k)) {
- this.form[k] = this.medicalReviewInfo[k];
+ if (k === 'IsHaveQuestion' && this.medicalReviewInfo.AuditState === 0) {
+ this.form[k] = null
+ } else {
+ this.form[k] = this.medicalReviewInfo[k]
+ }
}
}
this.fileList = [];
From efe3d937b4dbbe38db0aa49949970ac586096f67 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:16:23 +0800
Subject: [PATCH 172/194] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading/medical-feedback/components/ChatForm.vue | 7 +++----
.../reading/mim-medical-audit/components/ChatForm.vue | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index ccf2b913..3907976a 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,9 +11,8 @@
({{ record.CreateTime }})
-
- {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
- {{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
@@ -60,7 +59,7 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
-
+
{{ record.Content }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 58a8f22f..7e4f6b7b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,9 +11,8 @@
({{ record.CreateTime }})
-
- {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
- {{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
@@ -60,7 +59,7 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
-
+
{{ record.Content }}
From e0f42e815ebf71eee91366c02da36d3556ffe09b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:26:03 +0800
Subject: [PATCH 173/194] 1
---
.../medical-feedback/components/ChatForm.vue | 14 +++++++-------
.../mim-medical-audit/components/ChatForm.vue | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 3907976a..5abce1aa 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,12 +11,9 @@
({{ record.CreateTime }})
-
- {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
-
-
-
+
+ 111
{{ $t('trials:medicalFeedback:message:msg1') }}
@@ -59,11 +56,14 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
-
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+
{{ record.Content }}
-
+
{{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 7e4f6b7b..bb717a57 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,11 +11,8 @@
({{ record.CreateTime }})
-
- {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
-
-
-
+
+
{{ $t('trials:medicalFeedback:message:msg1') }}
@@ -59,11 +56,14 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
-
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+
{{ record.Content }}
-
+
{{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
From d04898dc28f2381ab3f8bb42cbec06631954d2a7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 16:38:16 +0800
Subject: [PATCH 174/194] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/user/components/UserInfo.vue | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 557113f6..6e1761c5 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -73,7 +73,8 @@
+
+
+
+
Date: Tue, 21 Jan 2025 16:38:52 +0800
Subject: [PATCH 175/194] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E8=A7=92=E8=89=B2=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E6=97=B6=E8=87=AA=E5=8A=A8=E7=99=BB?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 12 ++++++++++++
src/views/trials/trials-myinfo/account.vue | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 21f33813..7a353d14 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -510,6 +510,18 @@ export default {
this.loginByRole(this.$store.state.user.roles[0].Id)
return
}
+ if (
+ Array.isArray(this.$store.state.user.roles) &&
+ this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
+ .length ===
+ this.$store.state.user.roles.length - 1
+ ) {
+ let role = this.$store.state.user.roles.find(
+ (item) => !item.IsUserRoleDisabled
+ )
+ this.loginByRole(role.Id)
+ return
+ }
return (this.toggleRoleVisible = true)
},
cancel() {
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index feb9161b..35244193 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -119,7 +119,7 @@
v-for="item in roles"
:key="item.Id"
:label="item.Id"
- :disabled="item.isUserRoleDisabled"
+ :disabled="item.IsUserRoleDisabled"
style="margin-bottom: 10px"
>
{{ item.UserTypeShortName }}
@@ -210,6 +210,7 @@ export default {
},
computed: {
roles() {
+ console.log(this.$store.state.user.roles, 'this.$store.state.user.roles')
return this.$store.state.user.roles
},
hasRole() {
From e56440634ef5ae83c61738c6ee1e76f131ecc2b7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 16:47:19 +0800
Subject: [PATCH 176/194] 1
---
src/views/trials/trials-myinfo/account.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 35244193..3bbfe432 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -210,7 +210,6 @@ export default {
},
computed: {
roles() {
- console.log(this.$store.state.user.roles, 'this.$store.state.user.roles')
return this.$store.state.user.roles
},
hasRole() {
From 79caed3fd9d8dd8a06303316d282d26886d6a6b9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:49:02 +0800
Subject: [PATCH 177/194] 1
---
.../reading/medical-feedback/components/ChatForm.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 5abce1aa..8a9acda4 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -13,7 +13,6 @@
- 111
{{ $t('trials:medicalFeedback:message:msg1') }}
From e3f6f9107d62d5779a5f0d87bddf8ff7e107f485 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 17:12:33 +0800
Subject: [PATCH 178/194] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=8F=AF=E5=88=87?=
=?UTF-8?q?=E6=8D=A2=E9=80=89=E9=A1=B9=E4=B8=8D=E8=B6=B3=E6=97=B6=E4=B8=8D?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2=E6=8C=89?=
=?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-layout/components/trialsNavbar.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index c5c47cc9..004aa805 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -146,7 +146,11 @@ export default {
return this.$store.state.user.roles
},
hasRole() {
- return this.roles && this.roles.length > 1
+ return (
+ this.roles &&
+ this.roles.length > 1 &&
+ this.roles.filter((item) => !item.IsUserRoleDisabled).length > 1
+ )
},
},
watch: {
From b209c6566b509e294dcf1b6457e4dc544bd0dc85 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 22 Jan 2025 09:48:25 +0800
Subject: [PATCH 179/194] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E9=83=A8?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BC=B9=E6=A1=86=E6=8C=89=E9=92=AE=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../setting/personnel-manage/components/staffExternalForm.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d1fe8dbd..18dc25d1 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -24,6 +24,7 @@
@@ -491,6 +492,7 @@ export default {
.participant-container {
height: 100%;
.el-header {
+ padding-right: 5px;
.filter-container {
display: flex;
align-items: center;
From 6e66dd8bbe3e712fdb90f9c6e5b5d9b803acabbc Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 22 Jan 2025 09:48:28 +0800
Subject: [PATCH 180/194] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/configList.vue | 60 +++++++++++--------
1 file changed, 36 insertions(+), 24 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
index 933452c2..edf6b235 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -22,12 +22,15 @@
+ :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+
+ >
@@ -43,6 +46,7 @@
v-model="scope.row.CDISCCode"
size="mini"
:disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
+ v-show="!scope.row.IsGroup || !scope.row.HasChildren"
>
@@ -91,29 +95,7 @@ export default {
async submit() {
this.loading = true
try {
- let params= {
- questionList: [],
- tableQuestionList: []
- }
- params.questionList = this.exportInfo.QuestionList.map(i => {
- return {
- questionId: i.QuestionId,
- tableQuestionId: i.TableQuestionId,
- exportResult: i.ExportResult,
- CDISCCode: i.CDISCCode
- }
- })
- this.exportInfo.QuestionList.forEach(i => {
- let childlist = i.Children.map(k => {
- return {
- questionId: i.QuestionId,
- tableQuestionId: k.TableQuestionId,
- exportResult: k.ExportResult,
- CDISCCode: k.CDISCCode
- }
- })
- params.tableQuestionList = params.tableQuestionList.concat(childlist)
- })
+ let params = this.filterQuestions(this.exportInfo.QuestionList)
let res = await setTrialQuestionExportResult(params)
if (res.IsSuccess) {
this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -124,6 +106,36 @@ export default {
console.log(e)
}
},
+ filterQuestions(arr) {
+ let params= {
+ questionList: [],
+ tableQuestionList: []
+ }
+ for (let i of arr) {
+ if (!i.IsGroup && !i.IsTableQuestion) {
+ params.questionList.push({
+ questionId: i.QuestionId,
+ tableQuestionId: i.TableQuestionId,
+ exportResult: i.ExportResult,
+ CDISCCode: i.CDISCCode
+ })
+ }
+ if (i.TableQuestionId) {
+ params.tableQuestionList.push({
+ questionId: i.QuestionId,
+ tableQuestionId: i.TableQuestionId,
+ exportResult: i.ExportResult,
+ CDISCCode: i.CDISCCode
+ })
+ }
+ if (i.Children && i.Children.length > 0) {
+ const childResults = this.filterQuestions(i.Children)
+ params.questionList = params.questionList.concat(childResults.questionList)
+ params.tableQuestionList = params.tableQuestionList.concat(childResults.tableQuestionList)
+ }
+ }
+ return params;
+ },
// 获取状态
getCheckState(item, code) {
return item.row.ExportResult.indexOf(code) > -1
From 21c96300ad8d6a3f921bc9cf9741e5db341ea4ba Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 22 Jan 2025 10:21:32 +0800
Subject: [PATCH 181/194] 1
---
src/components/BaseForm/search-form.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue
index 101e399b..f1f99380 100644
--- a/src/components/BaseForm/search-form.vue
+++ b/src/components/BaseForm/search-form.vue
@@ -13,6 +13,7 @@
v-model="searchData[item.prop]"
:placeholder="item.placeholder"
size="mini"
+ clearable
:style="{ width: item.width }"
:readonly="item.readonly"
/>
@@ -22,6 +23,7 @@
v-model="searchData[item.prop]"
:placeholder="item.placeholder"
size="mini"
+ clearable
:style="{ width: item.width }"
@change="item.change && item.change(that, searchData[item.prop])"
>
@@ -37,6 +39,7 @@
v-model="searchData[item.prop]"
:placeholder="item.placeholder"
size="mini"
+ clearable
:style="{ width: item.width }"
@change="item.change && item.change(that, searchData[item.prop])"
>
@@ -96,6 +99,7 @@
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
:picker-options="item.pickerOption"
+ clearable
/>
Date: Wed, 22 Jan 2025 15:27:20 +0800
Subject: [PATCH 182/194] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/noticeMarquee.vue | 2 +
src/views/trials/trials-notice/index.vue | 100 ++++++++++++------
.../components/needSignSysDoc.vue | 4 +-
.../components/needSignedSysDoc.vue | 4 +-
4 files changed, 75 insertions(+), 35 deletions(-)
diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue
index 4b54f77b..336504f7 100644
--- a/src/views/trials/trials-layout/components/noticeMarquee.vue
+++ b/src/views/trials/trials-layout/components/noticeMarquee.vue
@@ -71,6 +71,8 @@ export default {
diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index ce8a7d16..1f97a933 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -59,7 +59,7 @@
/>
+
-
+
Select{{ $t('common:button:check') }}
- (must be in pdf format)
+ ({{ $t('trials:signature:label:mustBepdf') }})
-
+
Save{{ $t('common:button:save') }}
@@ -138,13 +144,25 @@ export default {
},
rules: {
FileTypeId: [
- { required: true, message: 'Please select', trigger: ['blur'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur'],
+ },
],
SignViewMinimumMinutes: [
- { required: true, message: 'Please specify', trigger: ['change'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['change'],
+ },
],
NeedConfirmedUserTypeIdList: [
- { required: true, message: 'Please select', trigger: ['blur'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur'],
+ },
],
},
fileList: [],
@@ -211,7 +229,7 @@ export default {
this.fileList = []
return true
} else {
- this.$alert('must be in pdf format')
+ this.$alert(this.$t('trials:signature:label:mustBepdf'))
return false
}
@@ -236,7 +254,7 @@ export default {
this.$refs.sysAttachmentFrom.validate((valid) => {
if (!valid) return
if (!this.form.Name) {
- this.$alert('Please select file.')
+ this.$alert(this.$t('trials:signature:message:selectFile'))
return
}
this.saveBtnLoading = true
@@ -245,7 +263,7 @@ export default {
this.saveBtnLoading = false
this.$emit('closeDialog')
this.$emit('getList')
- this.$message.success('Uploaded successfully')
+ this.$message.success(this.$t('common:message:updatedSuccessfully'))
})
.catch(() => {
this.saveBtnLoading = false
@@ -263,7 +281,7 @@ export default {
}
},
handleExceed(files, fileList) {
- this.$message.warning(`Upload is currently limited to 1 file`)
+ this.$message.warning(this.$t('upload:rule:maxFile1'))
},
checkFileSuffix(fileName) {
var typeArr = ['pdf']
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 29279a3c..f1b79f67 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -34,7 +34,7 @@
From b176ab0716d0971f929432fa9eb99a7f9a0eca11 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 23 Jan 2025 09:10:40 +0800
Subject: [PATCH 184/194] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=BA=8F=E5=88=97?=
=?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/reading.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index e53aaa8b..d201a2f5 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -882,11 +882,17 @@ const actions = {
// }
series.InstanceInfoList.forEach(instance => {
if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
- if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) {
+ if (study.IsCriticalSequence && instance.KeyFramesList.length > 0 && instance.KeyFramesList[0] !== null) {
instance.KeyFramesList.map(i => {
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
})
+ } else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
+ console.log(111)
+ for (let i = 0; i < instance.NumberOfFrames; i++) {
+ const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+ imageIds.push(imageId)
+ }
} else {
for (let i = 0; i < instance.NumberOfFrames; i++) {
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
From 9eb3f2f322a83d138a107d463b3d8eb1452c3475 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 23 Jan 2025 09:22:24 +0800
Subject: [PATCH 185/194] 1
---
.../attachment/components/SignatureTemplate/index.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index f1b79f67..3d052d91 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -69,6 +69,7 @@
:label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
show-overflow-tooltip
sortable="custom"
+ min-width="110"
/>
{{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
@@ -115,7 +117,7 @@
sortable="custom"
/>
-
+
{{ $t('common:button:preview') }}
From 53738c2da443bc9b8cb0798ea814a119ca4966a4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 23 Jan 2025 09:32:15 +0800
Subject: [PATCH 186/194] 1
---
src/store/modules/reading.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index d201a2f5..bf714331 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -882,13 +882,12 @@ const actions = {
// }
series.InstanceInfoList.forEach(instance => {
if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
- if (study.IsCriticalSequence && instance.KeyFramesList.length > 0 && instance.KeyFramesList[0] !== null) {
+ if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) {
instance.KeyFramesList.map(i => {
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
})
} else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
- console.log(111)
for (let i = 0; i < instance.NumberOfFrames; i++) {
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
From a2d06ba72f65cd9af8a827bb71e24df16dc918f5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 23 Jan 2025 10:21:51 +0800
Subject: [PATCH 187/194] =?UTF-8?q?=E5=A4=9A=E5=B8=A7=E5=85=B3=E9=94=AE?=
=?UTF-8?q?=E5=BA=8F=E5=88=97=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/reading.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index bf714331..e3a7eb1b 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -888,6 +888,7 @@ const actions = {
imageIds.push(imageId)
})
} else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
+ // 兼容保存标记数据未存NumberOfFrames的情况，按序列展示
for (let i = 0; i < instance.NumberOfFrames; i++) {
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
From c08d7011436f6ae6cfb3977abd9b4f31df49b6d7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 23 Jan 2025 14:13:01 +0800
Subject: [PATCH 188/194] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E5=BC=B9=E6=A1=86=E6=9C=AA=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/user/components/UserInfo.vue | 2 +-
src/views/system/user/components/roleList.vue | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 6e1761c5..64b8dd60 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -46,7 +46,7 @@
-->
-
+ {{ scope.row.SubjectCount }}
+
+ {{ scope.row.SubjectCount }}
+
+
+ {{ scope.row.VisitCount }}
+
+ {{ scope.row.VisitCount }}
+
+
{ return r.name === 'Trials' })
+ const trialsPanelRouter = trialsRouter.children.find(r => { return r.name === 'TrialsPanel' }).children
+ this.hasSubjectRoute = this.hasRoute('subject-list', trialsPanelRouter)
+ this.hasVisitRoute = this.hasRoute('crc-upload', trialsPanelRouter)
this.getList()
},
methods: {
@@ -273,6 +300,26 @@ export default {
this.searchData.PageIndex = 1
this.getList()
},
+ jumpToSubjectList(trialSiteId) {
+ this.$router.push({ path: `/trials/trials-panel/subject/subject-list?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&trialSiteId=${trialSiteId}` })
+ },
+ jumpToVisitList(trialSiteId) {
+ this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&trialSiteId=${trialSiteId}` })
+ },
+ hasRoute(name, routeList) {
+ for (let i = 0; i < routeList.length; i++) {
+ if (routeList[i].name === name) {
+ return true
+ }
+ if (routeList[i].children) {
+ const flag = this.hasRoute(name, routeList[i].children)
+ if (flag) {
+ return flag
+ }
+ }
+ }
+ return false
+ }
},
}
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index 8da20979..dce76874 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -291,6 +291,7 @@ import SubjectsForm from './components/SubjectsForm'
import SubjectStatusForm from './components/SubjectStatusForm'
import MessageTable from './components/MessageTable'
import moment from 'moment'
+import { changeURLStatic } from '@/utils/history.js'
const searchDataDefault = () => {
return {
Code: '',
@@ -339,6 +340,10 @@ export default {
this.hasCrcRoute = this.hasRoute('crc-upload', trialsPanelRouter)
this.hasQCRoute = this.hasRoute('qc-check', trialsPanelRouter)
this.trialId = this.$route.query.trialId
+ if (this.$route.query.trialSiteId) {
+ this.searchData.TrialSiteId = this.$route.query.trialSiteId
+ changeURLStatic('trialSiteId', '')
+ }
this.getSite()
this.getList()
},
@@ -441,7 +446,7 @@ export default {
// 关闭状态编辑框
closeStatusDialog() {
this.statusVisible = false
- },
+ },
handleTotalVisitCount(subjectCode) {
if (this.hasCrcRoute) {
this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&subjectCode=${subjectCode}` })
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index bf178718..725cefbb 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -1680,8 +1680,13 @@ export default {
this.getSite()
if (this.$route.query.subjectCode) {
this.searchData.SubjectInfo = this.$route.query.subjectCode
+ changeURLStatic('subjectCode', '')
+ }
+
+ if (this.$route.query.trialSiteId) {
+ this.searchData.TrialSiteId = this.$route.query.trialSiteId
+ changeURLStatic('trialSiteId', '')
}
- changeURLStatic('subjectCode', '')
this.TrialCode = this.$route.query.trialCode
this.getList()
this.getVisitPlanOptions()
From 99d099496e65329c10be5fab77bceb39c83f194a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 23 Jan 2025 18:41:10 +0800
Subject: [PATCH 190/194] 1
---
src/views/login/index.vue | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7a353d14..512faf72 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -6,14 +6,7 @@
- 
- 
- 
+
-
+
+
+
- {{
- $t("dictionary:browser:button:reset")
- }}
- {{
- $t("dictionary:browser:button:search")
- }}
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/Anonymization.vue b/src/views/dictionary/template/components/Anonymization.vue
index d202154b..817d65eb 100644
--- a/src/views/dictionary/template/components/Anonymization.vue
+++ b/src/views/dictionary/template/components/Anonymization.vue
@@ -16,8 +16,16 @@
- Reset
- Search
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/ClinicalDataConfig.vue b/src/views/dictionary/template/components/ClinicalDataConfig.vue
index 1fcdc3e3..9fda81a4 100644
--- a/src/views/dictionary/template/components/ClinicalDataConfig.vue
+++ b/src/views/dictionary/template/components/ClinicalDataConfig.vue
@@ -27,8 +27,16 @@
- 重置
- 查询
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index fba49f04..69ac43b1 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -8,9 +8,16 @@
- 重置
- 查询
-
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index e54ace34..2d5deae5 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -57,8 +57,16 @@
- 重置
- 查询
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/IncreaseFields.vue b/src/views/dictionary/template/components/IncreaseFields.vue
index c653fafb..badc3517 100644
--- a/src/views/dictionary/template/components/IncreaseFields.vue
+++ b/src/views/dictionary/template/components/IncreaseFields.vue
@@ -16,8 +16,16 @@
- Reset
- Search
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/MedicalAudit.vue b/src/views/dictionary/template/components/MedicalAudit.vue
index 543ae93a..6b5f5636 100644
--- a/src/views/dictionary/template/components/MedicalAudit.vue
+++ b/src/views/dictionary/template/components/MedicalAudit.vue
@@ -38,8 +38,16 @@
- 重置
- 查询
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/QcQuestions.vue b/src/views/dictionary/template/components/QcQuestions.vue
index 9e16395e..b6730d59 100644
--- a/src/views/dictionary/template/components/QcQuestions.vue
+++ b/src/views/dictionary/template/components/QcQuestions.vue
@@ -26,8 +26,16 @@
- Reset
- Search
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index d881977d..db56ca4d 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -123,8 +123,16 @@
- 查询
- 重置
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/sign/index.vue b/src/views/dictionary/template/sign/index.vue
index 7e84582b..0ced8f42 100644
--- a/src/views/dictionary/template/sign/index.vue
+++ b/src/views/dictionary/template/sign/index.vue
@@ -3,15 +3,23 @@
-
+
- Reset
- Search
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 9583a02f..2114e3e5 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -392,15 +392,17 @@ export default {
},
],
searchHandle: [
- {
- label: this.$t('common:button:reset'),
- type: 'primary',
- emitKey: 'reset',
- },
{
label: this.$t('common:button:search'),
type: 'primary',
emitKey: 'search',
+ icon: 'el-icon-search'
+ },
+ {
+ label: this.$t('common:button:reset'),
+ type: 'primary',
+ emitKey: 'reset',
+ icon: 'el-icon-refresh-left'
},
{
label: this.$t('common:button:new'),
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 8a9acda4..ec423c4b 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -30,7 +30,7 @@
style="margin:0 10px;"
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
>
-
+
{{ file.FileName }}
![]()
-
+
{{ file.FileName }}
![]()
Date: Fri, 24 Jan 2025 13:27:47 +0800
Subject: [PATCH 193/194] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AE=80?=
=?UTF-8?q?=E5=8E=86=E9=A2=84=E8=A7=88=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/reviewers/components/Agreements.vue | 6 +++---
.../reviewers/curriculumVitae/components/file/agreement.vue | 2 +-
.../curriculumVitae/components/file/certificate.vue | 2 +-
src/views/reviewers/curriculumVitae/preview.vue | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue
index c037b271..4b23887c 100644
--- a/src/views/reviewers/components/Agreements.vue
+++ b/src/views/reviewers/components/Agreements.vue
@@ -437,7 +437,7 @@ export default {
},
handlePreview3(row) {
return this.$preview({
- path: row.FilePath,
+ path: row.Path || row.FilePath,
type: 'pdf',
title: row.FileName,
})
@@ -447,7 +447,7 @@ export default {
},
handlePreview2(row, r2) {
return this.$preview({
- path: row.fullPath,
+ path: row.Path || row.fullPath,
type: 'pdf',
title: row.FileName,
})
@@ -537,7 +537,7 @@ export default {
handlePreview(row) {
console.log(row)
return this.$preview({
- path: row.FullPath,
+ path: row.Path || row.FullPath,
type: 'pdf',
title: row.FileName,
})
diff --git a/src/views/reviewers/curriculumVitae/components/file/agreement.vue b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
index 06d67587..7a3a8a1b 100644
--- a/src/views/reviewers/curriculumVitae/components/file/agreement.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
@@ -333,7 +333,7 @@ export default {
},
preview(row) {
this.$preview({
- path: row.FullPath,
+ path: row.Path || row.FullPath,
type: 'pdf',
title: row.FileName,
})
diff --git a/src/views/reviewers/curriculumVitae/components/file/certificate.vue b/src/views/reviewers/curriculumVitae/components/file/certificate.vue
index 752f7fa7..5826bdf0 100644
--- a/src/views/reviewers/curriculumVitae/components/file/certificate.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/certificate.vue
@@ -292,7 +292,7 @@ export default {
},
preview(row) {
this.$preview({
- path: row.FullPath,
+ path: row.Path || row.FullPath,
type: 'pdf',
title: row.FileName,
})
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 81934a8d..999cbbc4 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -1015,7 +1015,7 @@ export default {
}
},
preview(row) {
- let path = row.FullPath || row.FilePath
+ let path = row.Path || row.FullPath || row.FilePath
this.$preview({
path: path,
type: 'pdf',
From dba4466ac26890fcedfd8d20d8c20c9fd45e8850 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 24 Jan 2025 16:27:39 +0800
Subject: [PATCH 194/194] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 6 +++---
.../attachments/site-research/index.vue | 5 ++---
.../trial-config/components/processConfig.vue | 3 +++
.../visit/qc-check/components/qualityAssurance.vue | 14 +++++++++++++-
src/views/trials/trials-workbench/index.vue | 4 ++--
5 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index e7b9b781..769f0bed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -209,9 +209,9 @@ export default {
[],
this.arr.filter(
(v) =>
- ~v.Code.indexOf(this.key) ||
- ~v.Value.indexOf(this.key) ||
- ~v.ValueCN.indexOf(this.key)
+ ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
+ ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
+ ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
)
)
} else {
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 1b3cbb06..cd45126a 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -332,13 +332,12 @@
-->
{{ $t('trials:researchRecord:label:link') }}
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index beb797dd..b1fff910 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -771,6 +771,7 @@
@@ -778,6 +779,7 @@
@@ -785,6 +787,7 @@
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 274695a3..d1262449 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -121,7 +121,19 @@
:label="$t('trials:audit:table:bodyPart')"
>
- {{ getBodyPart(scope.row.BodyPartForEdit) }}
+
+
+
+ {{ getBodyPart(scope.row.BodyPartForEdit) }}
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 8e128252..4f803c9f 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -233,14 +233,14 @@
- {{ $t('trials:workbench:title:trialDocSigned') }}·{{ tabList.TrialSignedDocCount }}
+ {{ $t('trials:workbench:title:trialDocSigned') }}·{{ tabList.TrialSignedDocCount }}
- {{ $t('trials:workbench:title:sysDocSigned') }}·{{ tabList.SysSignedDocCount }}
+ {{ $t('trials:workbench:title:sysDocSigned') }}·{{ tabList.SysSignedDocCount }}
-
+
{{ $t('trials:audit:tab:dicoms') }}
-+ {{ $t('trials:audit:tab:dicoms') }} +
+
-
+
@@ -253,9 +254,10 @@ import TopLang from './topLang'
import Vcode from 'vue-puzzle-vcode'
import browserTip from '@/views/dictionary/template/browser/tip.vue'
import Img1 from '@/assets/pic-2.png'
+import toggleRole from '@/components/toggleRole'
export default {
name: 'Login',
- components: { TopLang, Vcode, browserTip },
+ components: { TopLang, Vcode, browserTip, toggleRole },
data() {
return {
NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
@@ -298,6 +300,7 @@ export default {
isShow: false,
showCode: false,
Img1,
+ toggleRoleVisible: false,
}
},
computed: {
@@ -416,31 +419,49 @@ export default {
// this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
this.$message.warning(this.$t('login:message:login4'))
}
- this.$store.dispatch('permission/generateRoutes').then((res) => {
- this.loading = false
- if (res && res.length > 0) {
- this.$store.dispatch('global/getNoticeList')
- this.$router.addRoutes(res)
- if (this.loginType === 'DevOps') {
- this.$router.replace({ path: res[0].path })
- return
- }
- if (this.hasPermi(['role:radmin'])) {
- this.$router.replace({ path: res[0].path })
- return
- }
- if (
- this.hasPermi(['role:air', 'role:rpm', 'role:rcrc', 'role:rir'])
- ) {
- this.$router.replace({ path: '/trials/trials-list' })
+ return (this.toggleRoleVisible = true)
+ })
+ .catch(() => {
+ this.showCode = true
+ this.loading = false
+ })
+ },
+ loginByRole(UserTypeId) {
+ this.$store
+ .dispatch('user/loginByRole', { UserTypeId })
+ .then((res) => {
+ if (res) {
+ this.$store.dispatch('permission/generateRoutes').then((res) => {
+ this.loading = false
+ if (res && res.length > 0) {
+ this.$store.dispatch('global/getNoticeList')
+ this.$router.addRoutes(res)
+ if (this.loginType === 'DevOps') {
+ this.$router.replace({ path: res[0].path })
+ return
+ }
+ if (this.hasPermi(['role:radmin'])) {
+ this.$router.replace({ path: res[0].path })
+ return
+ }
+ if (
+ this.hasPermi([
+ 'role:air',
+ 'role:rpm',
+ 'role:rcrc',
+ 'role:rir',
+ ])
+ ) {
+ this.$router.replace({ path: '/trials/trials-list' })
+ } else {
+ this.$router.replace({ path: '/trials' })
+ }
} else {
- this.$router.replace({ path: '/trials' })
+ // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+ this.$message.warning(this.$t('login:message:login2'))
}
- } else {
- // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
- this.$message.warning(this.$t('login:message:login2'))
- }
- })
+ })
+ }
})
.catch(() => {
this.showCode = true
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index afe0f3f5..29522388 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -225,7 +225,7 @@ export default {
// 保存权限配置
async savePermission(){
try{
- let validate = this.$refs.permissionForm.validate();
+ let validate =await this.$refs.permissionForm.validate();
if(!validate) return false;
this.assignLoadStatus = true;
let data = Object.assign({ Id: this.trialId },this.permission)
From 177510643da3f6b22d197c851b7b0ae39c879cfc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 23 Dec 2024 18:05:21 +0800
Subject: [PATCH 011/194] =?UTF-8?q?=E5=88=86=E8=A7=92=E8=89=B2=E7=99=BB?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/toggleRole/index.vue | 12 ++++++++----
src/store/getters.js | 1 +
src/store/modules/permission.js | 1 +
src/store/modules/user.js | 20 ++++++++++++++------
src/views/login/index.vue | 14 +++++++++++---
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/components/toggleRole/index.vue b/src/components/toggleRole/index.vue
index c928068a..b792865b 100644
--- a/src/components/toggleRole/index.vue
+++ b/src/components/toggleRole/index.vue
@@ -8,14 +8,15 @@
append-to-body
:title="$t('toggleRole:tip:title')"
center
+ top="30vh"
:show-close="false"
@close="cancel"
>
+
{{ $t('trials:audit:tab:nonDicoms') }}
-
+
Date: Wed, 18 Dec 2024 18:05:28 +0800
Subject: [PATCH 002/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../template/components/CriterionQuestionForm.vue | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 8cb54177..1d9010aa 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -890,6 +890,7 @@ export default {
mounted() {
this.initForm()
this.getCalculateQuestions('number')
+
},
methods: {
typeValueChange(v) {
@@ -905,6 +906,14 @@ export default {
}
})
},
+ getBasicConfigSelect() {
+ getCriterionDictionaryList({
+ CriterionId: this.criterionId,
+ SystemCriterionId: this.criterionId
+ }).then(res => {
+ this.dicList = res.Result
+ })
+ },
getCalculateQuestions(type) {
getSystemCalculateQuestions({
systemCriterionId: this.criterionId,
@@ -944,6 +953,7 @@ export default {
await this.getParentQuestions()
await this.getLesionTypeDictionary()
await this.getLesionType()
+ await this.getBasicConfigSelect()
if (Object.keys(this.data).length > 0) {
for (const k in this.form) {
if (this.data.hasOwnProperty(k)) {
From 97caeae753594f330ad9b52b5542915a6f4a2e9e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 19 Dec 2024 11:02:34 +0800
Subject: [PATCH 003/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/CriterionQuestionForm.vue | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 1d9010aa..25bad6b7 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -446,6 +446,7 @@
/>
+
+
+
+
+
Date: Thu, 19 Dec 2024 11:45:21 +0800
Subject: [PATCH 004/194] =?UTF-8?q?=E5=88=97=E8=A1=A8label=E5=90=8D?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dictionary/attachment/components/CommonTemplate/index.vue | 2 +-
.../dictionary/attachment/components/EmailTemplate/index.vue | 2 +-
.../attachment/components/SignatureTemplate/index.vue | 2 +-
.../dictionary/attachment/components/UploadTemplate/index.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/dictionary/attachment/components/CommonTemplate/index.vue b/src/views/dictionary/attachment/components/CommonTemplate/index.vue
index 8e9e6fe1..fbe06690 100644
--- a/src/views/dictionary/attachment/components/CommonTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/CommonTemplate/index.vue
@@ -98,7 +98,7 @@
+
@@ -8,7 +8,7 @@
-
-
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
- {{ $fd('TrainingStatus', !scope.row.IsDeleted) }}
- {{ $fd('TrainingStatus', !scope.row.IsDeleted) }}
+ {{
+ $fd('TrainingStatus', !scope.row.IsDeleted)
+ }}
+ {{
+ $fd('TrainingStatus', !scope.row.IsDeleted)
+ }}
@@ -137,7 +151,11 @@
min-width="100"
>
- {{ scope.row.NeedConfirmedUserTypes?scope.row.NeedConfirmedUserTypes.join(', '):'' }}
+ {{
+ scope.row.NeedConfirmedUserTypes
+ ? scope.row.NeedConfirmedUserTypes.join(', ')
+ : ''
+ }}
@@ -148,14 +166,21 @@
min-width="300"
/> -->
-
-
-
@@ -215,16 +250,25 @@
append-to-body
custom-class="base-dialog-wrapper"
>
-
-
-
-
+
+
@@ -20,10 +31,16 @@
-
+
-
+
@@ -45,10 +62,22 @@
-
-
-
-
- {{ isEN ? item.HospitalName : item.HospitalNameCN }}
-
-
-
+ @change="handleChange"
+ >
+
+
+
-
-
{
RankOther: '',
RankOtherCN: '',
HospitalId: '',
+ HospitalName: null,
+ HospitalNameCN: null,
WorkPartTime: null,
WorkPartTimeEn: null,
UniversityAffiliated: null,
@@ -616,11 +632,18 @@ export default {
trigger: 'blur',
},
],
- HospitalId: [
+ HospitalName: [
{
required: true,
- message: this.$t('common:ruleMessage:select'),
- trigger: 'blur',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
+ },
+ ],
+ HospitalNameCN: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
},
],
UniversityAffiliated: [
@@ -648,16 +671,72 @@ export default {
loading: false,
dictionaryList: {},
otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+ hospitalSelectList: [],
}
},
computed: {
...mapGetters(['hospitalList']),
},
+ watch: {
+ hospitalList: {
+ handler() {
+ if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+ return false
+ this.hospitalSelectList = []
+ this.hospitalList.forEach((item) => {
+ if (this.isEN) {
+ this.hospitalSelectList.push({
+ value: item.HospitalName,
+ ...item,
+ })
+ } else {
+ this.hospitalSelectList.push({
+ value: item.HospitalNameCN,
+ ...item,
+ })
+ }
+ })
+ },
+ deep: true,
+ },
+ },
mounted() {
this.getDicData()
store.dispatch('global/getHospital')
},
methods: {
+ handleChange(v) {
+ if (v) return
+ this.form.UniversityAffiliated = null
+ this.form.City = null
+ this.form.UniversityAffiliatedCN = null
+ this.form.CityCN = null
+ },
+ querySearch(queryString, cb) {
+ var hospitalList = this.hospitalSelectList
+ var results = queryString
+ ? hospitalList.filter(this.createFilter(queryString))
+ : hospitalList
+ // 调用 callback 返回建议列表的数据
+ cb(results)
+ },
+ createFilter(queryString) {
+ return (hospitalList) => {
+ if (this.isEN) {
+ return (
+ hospitalList.HospitalName.toLowerCase().indexOf(
+ queryString.toLowerCase()
+ ) >= 0
+ )
+ } else {
+ return (
+ hospitalList.HospitalNameCN.toLowerCase().indexOf(
+ queryString.toLowerCase()
+ ) >= 0
+ )
+ }
+ }
+ },
openEdit() {
this.form = defaultForm()
Object.keys(this.form).forEach((key) => {
@@ -666,8 +745,6 @@ export default {
}
})
this.model_cfg.visible = true
- console.log(this.form)
- console.log(this.DATA)
},
handleCancle() {
this.form = defaultForm()
@@ -680,8 +757,13 @@ export default {
if (this.reviewerId) {
this.form.Id = this.reviewerId
}
+ let data = Object.assign({}, this.form)
+ if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+ data.HospitalName = data.HospitalId
+ data.HospitalId = null
+ }
this.loading = true
- let res = await addOrUpdateDoctorBasicInfoAndEmployment(this.form)
+ let res = await addOrUpdateDoctorBasicInfoAndEmployment(data)
this.loading = false
if (res.IsSuccess) {
this.$emit('update:reviewerId', res.Result.Id)
@@ -701,13 +783,18 @@ export default {
})
.catch(() => {})
},
- handleHospitalChange(value) {
- const item = this.hospitalList.filter((item) => item.Id === value)
- if (item.length) {
- this.form.UniversityAffiliated = item[0].UniversityAffiliated
- this.form.City = item[0].City
- this.form.UniversityAffiliatedCN = item[0].UniversityAffiliatedCN
- this.form.CityCN = item[0].CityCN
+ handleSelect(value) {
+ const item = value
+ if (item) {
+ this.form.UniversityAffiliated = item.UniversityAffiliated
+ this.form.City = item.City
+ this.form.UniversityAffiliatedCN = item.UniversityAffiliatedCN
+ this.form.CityCN = item.CityCN
+ } else {
+ this.form.UniversityAffiliated = null
+ this.form.City = null
+ this.form.UniversityAffiliatedCN = null
+ this.form.CityCN = null
}
},
},
From 5866535fb509de619e5e4eca416b8a6696ad3501 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 23 Dec 2024 13:34:46 +0800
Subject: [PATCH 007/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/CriterionQuestionForm.vue | 33 ++++++++++++----
.../template/components/TableQsForm.vue | 38 ++++++++++++++-----
2 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 25bad6b7..74f8191a 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -877,6 +877,7 @@ export default {
btnLoading: false,
parentOptions: [],
parentTriggerValOptions: [],
+ reParentTriggerValOptions: [],
groupOptions: [],
isParentExistGroup: false,
lesionTypes: [],
@@ -1001,8 +1002,15 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
+
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1020,8 +1028,13 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.reParentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1212,15 +1225,21 @@ export default {
}
form.ParentTriggerValue = ''
},
- relevanceQuestionChange(val, form) {
+ async relevanceQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex((item) => {
return item.QuestionId === val
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.reParentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
var options = []
this.parentOptions[index].TypeValue.split('|').forEach(
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index cde88917..69e50bc4 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -710,7 +710,13 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -726,8 +732,12 @@ export default {
})
if (i !== -1) {
if (this.parentOptions[i].QuestionGenre === 3) {
- console.log(this.$d[this.parentOptions[i].DictionaryCode])
- this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+ // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+ let dicCode = this.parentOptions[i].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[i].TypeValue.split('|').forEach((item, index) => {
@@ -805,14 +815,20 @@ export default {
form.RelevanceValue = ''
}
},
- parentQuestionChange(val, form) {
+ async parentQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex(item => {
return item.QuestionId === val
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -824,16 +840,20 @@ export default {
}
form.ParentTriggerValue = ''
},
- relevanceQuestionChange(val, form) {
+ async relevanceQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex(item => {
return item.QuestionId === val
})
- console.log(this.$d[this.parentOptions[index].DictionaryCode], this.parentOptions[index].QuestionGenre)
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- console.log(this.$d[this.parentOptions[index].DictionaryCode])
- this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
From d9091fbb79add9078332c4e97b7edad19a55ea98 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 23 Dec 2024 13:59:35 +0800
Subject: [PATCH 008/194] =?UTF-8?q?SPM/CPM=E5=A2=9E=E5=8A=A0=20=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=AE=A1=E6=89=B9=E4=B8=8E=E5=90=A6=E7=9A=84=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/trials.js | 8 ++
.../components/staffExternalForm.vue | 101 +++++++++++++++++-
2 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/src/api/trials.js b/src/api/trials.js
index 26fd4bb2..d3df4757 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3914,4 +3914,12 @@ export function getVisitClinicalDataName(data) {
method: 'post',
data
})
+}
+// 修改外部人员权限配置
+export function configTrialSPMInfo(data) {
+ return request({
+ url: `/TrialConfig/configTrialSPMInfo`,
+ method: 'post',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d6071671..afe0f3f5 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -19,8 +19,12 @@
{{ $t('common:button:reset') }}
+
+
+ {{ $t('trials:staff:button:permissionConfiguration') }}
+
-
+
{{ $t('trials:staff:button:sendEmail') }}
@@ -113,12 +117,52 @@
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ {{ item.label }}
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+ {{ $t('common:button:cancel') }}
+
+
+ {{ $t('common:button:save') }}
+
+
+
+
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a2cf9be9..5b57f3fc 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,5 @@
import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
-import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user'
+import { login, loginOut, getUserMenuTree, getUserPermissions, getUserLoginRoleList, loginSelectUserRole } from '@/api/user'
import { resetRouter } from '@/router'
import md5 from 'js-md5'
@@ -16,13 +16,17 @@ const getDefaultState = () => {
TotalNeedSignSystemDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
TotalNeedSignTrialDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
TrialStatusStr: null,
- isTestUser: false
+ isTestUser: false,
+ roles: []
}
}
const state = getDefaultState()
const mutations = {
+ SET_ROLES: (state, roles) => {
+ state.roles = roles
+ },
RESET_STATE: (state) => {
Object.assign(state, getDefaultState())
},
@@ -78,6 +82,9 @@ const mutations = {
}
const actions = {
+ setRoles({ commit }, roles) {
+ commit('SET_ROLES', roles)
+ },
changeUserName({ commit }, userName) {
commit('SET_USERNAME', userName)
},
@@ -91,7 +98,7 @@ const actions = {
if (UserId) {
data.UserId = UserId;
}
- login(data).then(async response => {
+ getUserLoginRoleList(data).then(async response => {
if (response.IsSuccess) {
zzSessionStorage.removeItem('lastWorkbench')
zzSessionStorage.setItem('my_username', username.trim())
@@ -99,6 +106,7 @@ const actions = {
zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail)
localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
const data = response.Result
+ commit('SET_ROLES', data.BasicInfo.AccountList)
if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
try {
zzSessionStorage.setItem('userId', data.BasicInfo.Id)
@@ -127,12 +135,12 @@ const actions = {
zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
zzSessionStorage.setItem('userId', user.id)
zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
- var permissions = await getUserPermissions()
- var menuTree = await getUserMenuTree()
- commit('SET_TREE', menuTree.Result)
- commit('SET_PERMISSIONS', permissions.Result)
- zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
- zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+ // var permissions = await getUserPermissions()
+ // var menuTree = await getUserMenuTree()
+ // commit('SET_TREE', menuTree.Result)
+ // commit('SET_PERMISSIONS', permissions.Result)
+ // zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+ // zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
} catch (e) {
console.log(e)
}
@@ -146,6 +154,39 @@ const actions = {
})
})
},
+ loginByRole({ commit }, userInfo) {
+ const { UserTypeId } = userInfo
+ let params = {
+ UserTypeId
+ }
+ return new Promise((resolve, reject) => {
+
+ loginSelectUserRole(params).then(async response => {
+ if (response.IsSuccess) {
+ const data = response.Result
+
+ try {
+ commit('SET_TOKEN', data)
+ setToken(data)
+ var permissions = await getUserPermissions()
+ var menuTree = await getUserMenuTree()
+ commit('SET_TREE', menuTree.Result)
+ commit('SET_PERMISSIONS', permissions.Result)
+ zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
+ zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+ } catch (e) {
+ console.log(e)
+ }
+ resolve(response.Result)
+
+ } else {
+ reject(response.ErrorMessage)
+ }
+ }).catch(() => {
+ reject()
+ })
+ })
+ },
setTree({ commit }, tree) {
commit('SET_TREE', tree)
},
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2286bd3a..a069c363 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -243,6 +243,7 @@
-
-
-
+
+
@@ -20,10 +31,16 @@
-
+
-
+
@@ -45,10 +62,22 @@
-
-
-
-
- {{ isEN ? item.HospitalName : item.HospitalNameCN }}
-
-
-
+ @change="handleChange"
+ >
+
+
+
-
-
{
RankOther: '',
RankOtherCN: '',
HospitalId: '',
+ HospitalName: null,
+ HospitalNameCN: null,
WorkPartTime: null,
WorkPartTimeEn: null,
UniversityAffiliated: null,
@@ -616,11 +632,18 @@ export default {
trigger: 'blur',
},
],
- HospitalId: [
+ HospitalName: [
{
required: true,
- message: this.$t('common:ruleMessage:select'),
- trigger: 'blur',
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
+ },
+ ],
+ HospitalNameCN: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['blur', 'change'],
},
],
UniversityAffiliated: [
@@ -648,16 +671,72 @@ export default {
loading: false,
dictionaryList: {},
otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+ hospitalSelectList: [],
}
},
computed: {
...mapGetters(['hospitalList']),
},
+ watch: {
+ hospitalList: {
+ handler() {
+ if (!Array.isArray(this.hospitalList) || this.hospitalList.length <= 0)
+ return false
+ this.hospitalSelectList = []
+ this.hospitalList.forEach((item) => {
+ if (this.isEN) {
+ this.hospitalSelectList.push({
+ value: item.HospitalName,
+ ...item,
+ })
+ } else {
+ this.hospitalSelectList.push({
+ value: item.HospitalNameCN,
+ ...item,
+ })
+ }
+ })
+ },
+ deep: true,
+ },
+ },
mounted() {
this.getDicData()
store.dispatch('global/getHospital')
},
methods: {
+ handleChange(v) {
+ if (v) return
+ this.form.UniversityAffiliated = null
+ this.form.City = null
+ this.form.UniversityAffiliatedCN = null
+ this.form.CityCN = null
+ },
+ querySearch(queryString, cb) {
+ var hospitalList = this.hospitalSelectList
+ var results = queryString
+ ? hospitalList.filter(this.createFilter(queryString))
+ : hospitalList
+ // 调用 callback 返回建议列表的数据
+ cb(results)
+ },
+ createFilter(queryString) {
+ return (hospitalList) => {
+ if (this.isEN) {
+ return (
+ hospitalList.HospitalName.toLowerCase().indexOf(
+ queryString.toLowerCase()
+ ) >= 0
+ )
+ } else {
+ return (
+ hospitalList.HospitalNameCN.toLowerCase().indexOf(
+ queryString.toLowerCase()
+ ) >= 0
+ )
+ }
+ }
+ },
openEdit() {
this.form = defaultForm()
Object.keys(this.form).forEach((key) => {
@@ -666,8 +745,6 @@ export default {
}
})
this.model_cfg.visible = true
- console.log(this.form)
- console.log(this.DATA)
},
handleCancle() {
this.form = defaultForm()
@@ -680,8 +757,13 @@ export default {
if (this.reviewerId) {
this.form.Id = this.reviewerId
}
+ let data = Object.assign({}, this.form)
+ if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+ data.HospitalName = data.HospitalId
+ data.HospitalId = null
+ }
this.loading = true
- let res = await addOrUpdateDoctorBasicInfoAndEmployment(this.form)
+ let res = await addOrUpdateDoctorBasicInfoAndEmployment(data)
this.loading = false
if (res.IsSuccess) {
this.$emit('update:reviewerId', res.Result.Id)
@@ -701,13 +783,18 @@ export default {
})
.catch(() => {})
},
- handleHospitalChange(value) {
- const item = this.hospitalList.filter((item) => item.Id === value)
- if (item.length) {
- this.form.UniversityAffiliated = item[0].UniversityAffiliated
- this.form.City = item[0].City
- this.form.UniversityAffiliatedCN = item[0].UniversityAffiliatedCN
- this.form.CityCN = item[0].CityCN
+ handleSelect(value) {
+ const item = value
+ if (item) {
+ this.form.UniversityAffiliated = item.UniversityAffiliated
+ this.form.City = item.City
+ this.form.UniversityAffiliatedCN = item.UniversityAffiliatedCN
+ this.form.CityCN = item.CityCN
+ } else {
+ this.form.UniversityAffiliated = null
+ this.form.City = null
+ this.form.UniversityAffiliatedCN = null
+ this.form.CityCN = null
}
},
},
From 5866535fb509de619e5e4eca416b8a6696ad3501 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 23 Dec 2024 13:34:46 +0800
Subject: [PATCH 007/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/CriterionQuestionForm.vue | 33 ++++++++++++----
.../template/components/TableQsForm.vue | 38 ++++++++++++++-----
2 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 25bad6b7..74f8191a 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -877,6 +877,7 @@ export default {
btnLoading: false,
parentOptions: [],
parentTriggerValOptions: [],
+ reParentTriggerValOptions: [],
groupOptions: [],
isParentExistGroup: false,
lesionTypes: [],
@@ -1001,8 +1002,15 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
+
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1020,8 +1028,13 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.reParentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach(
@@ -1212,15 +1225,21 @@ export default {
}
form.ParentTriggerValue = ''
},
- relevanceQuestionChange(val, form) {
+ async relevanceQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex((item) => {
return item.QuestionId === val
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.reParentTriggerValOptions =
- this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions =
+ // this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,DictionaryCode: dicCode})
+
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
var options = []
this.parentOptions[index].TypeValue.split('|').forEach(
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index cde88917..69e50bc4 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -710,7 +710,13 @@ export default {
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -726,8 +732,12 @@ export default {
})
if (i !== -1) {
if (this.parentOptions[i].QuestionGenre === 3) {
- console.log(this.$d[this.parentOptions[i].DictionaryCode])
- this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+ // this.reParentTriggerValOptions = this.$d[this.parentOptions[i].DictionaryCode]
+ let dicCode = this.parentOptions[i].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[i].TypeValue.split('|').forEach((item, index) => {
@@ -805,14 +815,20 @@ export default {
form.RelevanceValue = ''
}
},
- parentQuestionChange(val, form) {
+ async parentQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex(item => {
return item.QuestionId === val
})
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.parentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
@@ -824,16 +840,20 @@ export default {
}
form.ParentTriggerValue = ''
},
- relevanceQuestionChange(val, form) {
+ async relevanceQuestionChange(val, form) {
if (val) {
var index = this.parentOptions.findIndex(item => {
return item.QuestionId === val
})
- console.log(this.$d[this.parentOptions[index].DictionaryCode], this.parentOptions[index].QuestionGenre)
if (index !== -1) {
if (this.parentOptions[index].QuestionGenre === 3) {
- console.log(this.$d[this.parentOptions[index].DictionaryCode])
- this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ // this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+ let dicCode = this.parentOptions[index].DictionaryCode
+ let res = await getCriterionDictionary({ReadingCriterionId: this.criterionId, DictionaryCode: dicCode})
+
+ this.reParentTriggerValOptions = res.Result[dicCode].map(i=>{
+ return {id: i.Id, label: this.$i18n.locale === 'zh' ? i.ValueCN : i.Value, value: i.Code}
+ })
} else {
const options = []
this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
From d9091fbb79add9078332c4e97b7edad19a55ea98 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 23 Dec 2024 13:59:35 +0800
Subject: [PATCH 008/194] =?UTF-8?q?SPM/CPM=E5=A2=9E=E5=8A=A0=20=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=AE=A1=E6=89=B9=E4=B8=8E=E5=90=A6=E7=9A=84=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/trials.js | 8 ++
.../components/staffExternalForm.vue | 101 +++++++++++++++++-
2 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/src/api/trials.js b/src/api/trials.js
index 26fd4bb2..d3df4757 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3914,4 +3914,12 @@ export function getVisitClinicalDataName(data) {
method: 'post',
data
})
+}
+// 修改外部人员权限配置
+export function configTrialSPMInfo(data) {
+ return request({
+ url: `/TrialConfig/configTrialSPMInfo`,
+ method: 'post',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d6071671..afe0f3f5 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -19,8 +19,12 @@
{{ $t('common:button:reset') }}
+
+
+ {{ $t('trials:staff:button:permissionConfiguration') }}
+
-
+
{{ $t('trials:staff:button:sendEmail') }}
@@ -113,12 +117,52 @@
+
-
From 862c6d64ccc4e4d186d2b6dbe38c7cf7fd596641 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 23 Dec 2024 13:13:44 +0800
Subject: [PATCH 006/194] =?UTF-8?q?=E7=AE=80=E5=8E=86=E5=8C=BB=E9=99=A2?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../institutions/components/HospitalForm.vue | 137 ++++++++----
.../components/EducationTraining.vue | 102 +++++++--
src/views/reviewers/components/Employment.vue | 197 +++++++++++++++---
.../components/info/continuingTraining.vue | 94 +++++++--
.../curriculumVitae/components/info/info.vue | 155 +++++++++++---
5 files changed, 550 insertions(+), 135 deletions(-)
diff --git a/src/views/dictionary/institutions/components/HospitalForm.vue b/src/views/dictionary/institutions/components/HospitalForm.vue
index 504d4c89..70d647af 100644
--- a/src/views/dictionary/institutions/components/HospitalForm.vue
+++ b/src/views/dictionary/institutions/components/HospitalForm.vue
@@ -9,8 +9,19 @@
>
@@ -25,7 +25,7 @@
-
+
Male
Female
@@ -37,13 +37,24 @@
-
-
+
-
+
-
+
-
+
Internal
External
-
+
@@ -78,19 +100,24 @@
type="primary"
size="small"
:disabled="isDisabled"
- style="margin:10px 15px"
+ style="margin: 10px 15px"
@click="handleSave"
- >Save
+ >Save
-
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e14181dc..f37debd8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -244,6 +244,7 @@
+
-
+
-
+
-
+
+
+ {{ $t('common:button:confirm') }}
+
+
+
Affiliation
{{ $t('system:userlist:title:Information') }}
-
+
+
+ {{ $t('common:button:confirm') }}
+
+
+
+ {{ $t('common:button:cancel') }}
+
+
+
-
-
+
-
-
- {{ item.label }}
+
+
+ {{ item.label }}
-
+
-
+
-
-
+
{{ $t('common:button:cancel') }}
-
+
{{ $t('common:button:save') }}
+
+
+
+
+
+
+ {{ $fd('IsEnable', !scope.row.IsDeleted) }}
+
+
+
+
+
+ {{ scope.row.UpdateTime }}
+
+
+
+
+
+
+ {{ scope.row.UpdateTime }}
+
+
+
+
+
+
+ {{ $fd('IsEnable', false) }}
+
+
+ {{ $fd('IsEnable', true) }}
+
+
+
+
+
+
From 7ed4dd7e24f104e31f56894910b6f590a94d7acc Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 14:51:36 +0800
Subject: [PATCH 018/194] 1
---
src/views/system/user/components/UserInfo.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 6c21913b..1f8de2ec 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -281,7 +281,7 @@ export default {
this.user.Roles.push(item.UserTypeId)
}
this.user.UserRoleList.push({
- UserTypeEnum: item.UserType,
+ UserTypeEnum: item.UserTypeEnum,
UserTypeId: item.UserTypeId,
IsUserRoleDisabled: item.IsUserRoleDisabled,
UserTypeShortName: item.UserTypeShortName,
From 9d3ba7eb578163d6c82154b0848f636b8f7c8234 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 15:55:36 +0800
Subject: [PATCH 019/194] 1
---
.../trials-layout/components/trialsNavbar.vue | 1 -
.../personnel-manage/components/site.vue | 2 +-
.../components/staffExternalForm.vue | 2 +-
.../personnel-manage/components/staffForm.vue | 158 ++++++++++++------
4 files changed, 106 insertions(+), 57 deletions(-)
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index 48b0f80d..e8404a87 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -154,7 +154,6 @@ export default {
},
created() {
// this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
- console.log(this.$route.path, 'this.$route.path')
this.changeRoute(this.$route)
},
methods: {
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index fed20e1a..8a7224b0 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -412,7 +412,7 @@
>
+
{{ $t('trials:staff:table:name') }}:
-
+
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
{{ $t('common:button:add') }}
@@ -101,17 +139,25 @@
sortable="custom"
min-width="100"
/>
-
-
-
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue
new file mode 100644
index 00000000..b306cb62
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionList.vue
@@ -0,0 +1,616 @@
+
+
+
\ No newline at end of file
From 8225eacb7e65b9abde3209d49d53b398dfb821e9 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 25 Dec 2024 17:50:15 +0800
Subject: [PATCH 023/194] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=8D=A2=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/admin.js | 7 +++++++
src/views/trials/trials-myinfo/mine.vue | 4 ++--
.../setting/personnel-manage/components/dicomAEList.vue | 5 -----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/api/admin.js b/src/api/admin.js
index bee0c20f..3f8c1073 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -44,6 +44,13 @@ export function updateUser(param) {
data: param
})
}
+export function updateUserBasicInfo(param) {
+ return request({
+ url: `/user/updateUserBasicInfo`,
+ method: 'put',
+ data: param
+ })
+}
export function getUser(params) {
return request({
diff --git a/src/views/trials/trials-myinfo/mine.vue b/src/views/trials/trials-myinfo/mine.vue
index 455623f5..1745969e 100644
--- a/src/views/trials/trials-myinfo/mine.vue
+++ b/src/views/trials/trials-myinfo/mine.vue
@@ -82,7 +82,7 @@
+
+
+
+
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 2e7c5019..4f9b4432 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -373,13 +373,13 @@ export default {
})
},
async beforeLeave() {
- if (this.questionFormChangeState && this.CriterionType !== 2) {
- var msg = this.$t('trials:readingReport:message:msg5')
- var isgo = await this.myConfirm(msg)
- if (!isgo) {
- return Promise.resolve(true)
- }
- }
+ // if (this.questionFormChangeState && this.CriterionType !== 2) {
+ // var msg = this.$t('trials:readingReport:message:msg5')
+ // var isgo = await this.myConfirm(msg)
+ // if (!isgo) {
+ // return Promise.resolve(true)
+ // }
+ // }
var list = null
DicomEvent.$emit('getAllUnSaveLesions', val => {
list = val
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js
new file mode 100644
index 00000000..92caea2c
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js
@@ -0,0 +1,404 @@
+import * as cornerstoneTools from 'cornerstone-tools'
+const external = cornerstoneTools.external
+// State
+const getToolState = cornerstoneTools.getToolState
+const textStyle = cornerstoneTools.textStyle
+const toolColors = cornerstoneTools.toolColors
+const toolStyle = cornerstoneTools.toolStyle
+// Drawing
+const getNewContext = cornerstoneTools.import('drawing/getNewContext')
+const draw = cornerstoneTools.import('drawing/draw')
+const drawHandles = cornerstoneTools.import('drawing/drawHandles')
+const drawTextBox = cornerstoneTools.import('drawing/drawTextBox')
+// Utilities
+const getRGBPixels = cornerstoneTools.import('util/getRGBPixels')
+const calculateSUV = cornerstoneTools.import('util/calculateSUV')
+// import { probeCursor } from '../cursors/index.js';
+// import { getLogger } from '../../util/logger.js';
+const throttle = cornerstoneTools.import('util/throttle')
+const getModule = cornerstoneTools.getModule
+const getPixelSpacing = cornerstoneTools.import('util/getPixelSpacing')
+// import numbersWithCommas from './../../util/numbersWithCommas.js';
+const numbersWithCommas = cornerstoneTools.import('util/numbersWithCommas')
+// const logger = getLogger('tools:annotation:ProbeTool');
+import calculateEllipseStatistics from './calculateEllipseStatistics'
+import getCircleCoords from './getCircleCoords'
+/**
+ * @public
+ * @class ProbeTool
+ * @memberof Tools.Annotation
+ * @classdesc Tool which provides a probe of the image data at the
+ * desired position.
+ * @extends Tools.Base.BaseAnnotationTool
+ */
+export default class ProbeTool extends cornerstoneTools.ProbeTool {
+ constructor(props = {}) {
+ const defaultProps = {
+ name: 'Probe',
+ supportedInteractionTypes: ['Mouse', 'Touch'],
+ // svgCursor: probeCursor,
+ configuration: {
+ drawHandles: true,
+ renderDashed: false,
+ handleRadius: 0,
+ fixedRadius: 0,
+ hideHandlesIfMoving: false,
+ digits: 1,
+ showRadius: false,
+ },
+ };
+
+ super(props, defaultProps);
+
+ this.throttledUpdateCachedStats = throttle(this.updateCachedStats, 110);
+ }
+
+ createNewMeasurement(eventData) {
+ const goodEventData =
+ eventData && eventData.currentPoints && eventData.currentPoints.image;
+
+ if (!goodEventData) {
+ logger.error(
+ `required eventData not supplied to tool ${this.name}'s createNewMeasurement`
+ );
+
+ return;
+ }
+
+ return {
+ visible: true,
+ active: true,
+ color: undefined,
+ invalidated: true,
+ handles: {
+ // start: {
+ // x: eventData.currentPoints.image.x,
+ // y: eventData.currentPoints.image.y,
+ // highlight: true,
+ // active: false,
+ // },
+ end: {
+ x: eventData.currentPoints.image.x,
+ y: eventData.currentPoints.image.y,
+ highlight: true,
+ active: true,
+ radius: 0
+ },
+ },
+ };
+ }
+
+ /**
+ *
+ *
+ * @param {*} element
+ * @param {*} data
+ * @param {*} coords
+ * @returns {Boolean}
+ */
+ pointNearTool(element, data, coords) {
+ const hasEndHandle = data && data.handles && data.handles.end;
+ const validParameters = hasEndHandle;
+
+ if (!validParameters) {
+ logger.warn(
+ `invalid parameters supplied to tool ${this.name}'s pointNearTool`
+ );
+ }
+
+ if (!validParameters || data.visible === false) {
+ return false;
+ }
+
+ const probeCoords = external.cornerstone.pixelToCanvas(
+ element,
+ data.handles.end
+ );
+
+ return external.cornerstoneMath.point.distance(probeCoords, coords) < 5;
+ }
+ // pointNearTool(element, data, coords) {
+ // const hasEndHandle = data && data.handles && data.handles.end;
+ // const validParameters = hasEndHandle;
+
+ // if (!validParameters) {
+ // logger.warn(
+ // `invalid parameters supplied to tool ${this.name}'s pointNearTool`
+ // );
+ // }
+
+ // if (!validParameters || data.visible === false) {
+ // return false;
+ // }
+ // // data.handles.end.x = data.handles.end.x + 10
+ // let endCoords = {
+ // x: data.handles.end.x + 50,
+ // y: data.handles.end.y,
+ // highlight: data.handles.end.highlight,
+ // active: data.handles.end.active,
+ // }
+ // const probeCoords = external.cornerstone.pixelToCanvas(
+ // element,
+ // endCoords
+ // );
+
+ // return external.cornerstoneMath.point.distance(probeCoords, coords) < 5;
+ // }
+
+ // updateCachedStats(image, element, data) {
+ // const x = Math.round(data.handles.end.x);
+ // const y = Math.round(data.handles.end.y);
+
+ // const stats = {};
+
+ // if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+ // stats.x = x;
+ // stats.y = y;
+
+ // if (image.color) {
+ // stats.storedPixels = getRGBPixels(element, x, y, 1, 1);
+ // } else {
+ // stats.storedPixels = external.cornerstone.getStoredPixels(
+ // element,
+ // x,
+ // y,
+ // 1,
+ // 1
+ // );
+ // stats.sp = stats.storedPixels[0];
+ // stats.mo = stats.sp * image.slope + image.intercept;
+ // stats.suv = calculateSUV(image, stats.sp);
+ // }
+ // }
+
+ // data.cachedStats = stats;
+ // data.invalidated = false;
+ // }
+ updateCachedStats(image, element, data) {
+ const seriesModule =
+ external.cornerstone.metaData.get('generalSeriesModule', image.imageId) ||
+ {};
+ const modality = seriesModule.modality;
+ const pixelSpacing = getPixelSpacing(image);
+ const { fixedRadius, digits } = this.configuration;
+ const stats = _calculateStats(
+ image,
+ element,
+ data.handles,
+ modality,
+ pixelSpacing,
+ fixedRadius,
+ digits
+ );
+
+ data.cachedStats = stats;
+ data.invalidated = false;
+ }
+
+ renderToolData(evt) {
+ const eventData = evt.detail;
+ const { fixedRadius, renderDashed } = this.configuration;
+ const toolData = getToolState(evt.currentTarget, this.name);
+
+ if (!toolData) {
+ return;
+ }
+
+ // We have tool data for this element - iterate over each one and draw it
+ const context = getNewContext(eventData.canvasContext.canvas);
+ const { image, element } = eventData;
+ const fontHeight = textStyle.getFontSize();
+ const lineDash = getModule('globalConfiguration').configuration.lineDash;
+ const pixelSpacing = getPixelSpacing(image);
+ // Meta
+ const seriesModule =
+ external.cornerstone.metaData.get('generalSeriesModule', image.imageId) ||
+ {};
+
+ // Pixel Spacing
+ const modality = seriesModule.modality;
+ const hasPixelSpacing = pixelSpacing && pixelSpacing.rowPixelSpacing && pixelSpacing.colPixelSpacing;
+ for (let i = 0; i < toolData.data.length; i++) {
+ const data = toolData.data[i];
+ if (data.visible === false) {
+ continue;
+ }
+
+ draw(context, context => {
+ const color = toolColors.getColorIfActive(data);
+
+ if (this.configuration.drawHandles) {
+ // Draw the handles
+ let radius = getCanvasRadius(data.handles, fixedRadius, element, pixelSpacing)
+ data.handles.end.radius = radius
+ const handleOptions = { handleRadius: radius, color };
+
+ if (renderDashed) {
+ handleOptions.lineDash = lineDash;
+ }
+ drawHandles(context, eventData, data.handles, handleOptions);
+ }
+
+ // Update textbox stats
+ if (data.invalidated === true) {
+ if (data.cachedStats) {
+ this.throttledUpdateCachedStats(image, element, data);
+ } else {
+ this.updateCachedStats(image, element, data);
+ }
+ }
+
+ // let text, str;
+ let textLines = []
+ const { x, y, area, mean, radius } = data.cachedStats;
+
+ if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+ // text = `${x}, ${y}`;
+ if (data.remark) {
+ textLines.push(`${data.remark}`)
+ }
+ if (!image.color) {
+ // Draw text
+ let unit = _getUnit(modality, this.configuration.showHounsfieldUnits);
+
+ // textLines.push(_formatArea(area, hasPixelSpacing));
+ if (mean) {
+ // str += `mean: ${parseFloat(mean.toFixed(3))}`;
+ textLines.push(`Mean: ${mean} ${unit}`)
+ }
+ // if (radius) {
+ // str += `radius: ${parseFloat(radius.toFixed(3))}`;
+ // textLines.push(`radius: ${parseFloat(radius.toFixed(3))}`)
+ // }
+ }
+ let r = getPixelRadius(fixedRadius, pixelSpacing)
+ // Coords for text
+ const coords = {
+ // Translate the x/y away from the cursor
+ x: data.handles.end.x + r,
+ y: data.handles.end.y - r,
+ };
+ const textCoords = external.cornerstone.pixelToCanvas(
+ eventData.element,
+ coords
+ );
+ drawTextBox(
+ context,
+ textLines,
+ textCoords.x,
+ textCoords.y ,
+ color
+ );
+ // drawTextBox(context, '', textCoords.x, textCoords.y, color);
+ }
+ });
+ }
+ }
+}
+function _getUnit(modality, showHounsfieldUnits) {
+ return modality === 'CT' && showHounsfieldUnits !== false ? 'HU' : '';
+}
+function _formatArea(area, hasPixelSpacing) {
+ const suffix = hasPixelSpacing
+ ? ` mm${String.fromCharCode(178)}`
+ : ` px${String.fromCharCode(178)}`;
+
+ return `Area: ${numbersWithCommas(area.toFixed(2))}${suffix}`;
+}
+function getCanvasRadius(handles, fixedRadius, element, pixelSpacing) {
+ let startCoords = {
+ x: handles.end.x,
+ y: handles.end.y
+ }
+ const handleCanvasStartCoords = external.cornerstone.pixelToCanvas(
+ element,
+ startCoords
+ );
+ let r = getPixelRadius(fixedRadius, pixelSpacing)
+ let endCoords = {
+ x: handles.end.x + r,
+ y: handles.end.y
+ }
+ const handleCanvasEndCoords = external.cornerstone.pixelToCanvas(
+ element,
+ endCoords
+ );
+ return Math.abs(handleCanvasEndCoords.x - handleCanvasStartCoords.x)
+}
+function getPixelRadius(r, pixelSpacing) {
+ return r / ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)
+}
+function _calculateStats(image, element, handles, modality, pixelSpacing, fixedRadius, digits) {
+ // Retrieve the bounds of the ellipse in image coordinates
+ let startCoords = {
+ x: handles.end.x,
+ y: handles.end.y
+ }
+ let r = getPixelRadius(fixedRadius, pixelSpacing)
+ let endCoords = {
+ x: handles.end.x + r,
+ y: handles.end.y
+ }
+ const circleCoordinates = getCircleCoords(startCoords, endCoords);
+
+ // Retrieve the array of pixels that the ellipse bounds cover
+ const pixels = external.cornerstone.getPixels(
+ element,
+ circleCoordinates.left,
+ circleCoordinates.top,
+ circleCoordinates.width,
+ circleCoordinates.height
+ );
+
+ // Calculate the mean & standard deviation from the pixels and the ellipse details.
+ const ellipseMeanStdDev = calculateEllipseStatistics(
+ pixels,
+ circleCoordinates
+ );
+
+ let meanStdDevSUV;
+
+ if (modality === 'PT') {
+ meanStdDevSUV = {
+ mean: calculateSUV(image, ellipseMeanStdDev.mean, true) || 0,
+ stdDev: calculateSUV(image, ellipseMeanStdDev.stdDev, true) || 0,
+ };
+ }
+
+ const radius =
+ (circleCoordinates.width *
+ ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)) /
+ 2;
+ const perimeter = 2 * Math.PI * radius;
+ const area =
+ Math.PI *
+ ((circleCoordinates.width *
+ ((pixelSpacing && pixelSpacing.colPixelSpacing) || 1)) /
+ 2) *
+ ((circleCoordinates.height *
+ ((pixelSpacing && pixelSpacing.rowPixelSpacing) || 1)) /
+ 2);
+ const x = Math.round(handles.end.x);
+ const y = Math.round(handles.end.y);
+
+ const stats = {};
+
+ if (x >= 0 && y >= 0 && x < image.columns && y < image.rows) {
+ stats.x = x;
+ stats.y = y;
+ }
+ return {
+ area: area || 0,
+ radius: radius || 0,
+ perimeter: perimeter || 0,
+ mean: ellipseMeanStdDev.mean.toFixed(digits) || 0,
+ stdDev: ellipseMeanStdDev.stdDev.toFixed(digits) || 0,
+ min: ellipseMeanStdDev.min.toFixed(digits) || 0,
+ max: ellipseMeanStdDev.max.toFixed(digits) || 0,
+ meanStdDevSUV,
+ x: stats.x,
+ y: stats.y
+ };
+}
+
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js
new file mode 100644
index 00000000..867437f5
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/calculateEllipseStatistics.js
@@ -0,0 +1,67 @@
+import pointInEllipse from './pointInEllipse.js';
+
+/**
+ * Calculates the statistics of an elliptical region of interest.
+ *
+ * @private
+ * @function calculateEllipseStatistics
+ *
+ * @param {number[]} sp - Array of the image data's pixel values.
+ * @param {Object} ellipse - { top, left, height, width } - An object describing the ellipse.
+ * @returns {Object} { count, mean, variance, stdDev, min, max }
+ */
+export default function(sp, ellipse) {
+ let sum = 0;
+ let sumSquared = 0;
+ let count = 0;
+ let index = 0;
+ let min = null;
+ let max = null;
+
+ for (let y = ellipse.top; y < ellipse.top + ellipse.height; y++) {
+ for (let x = ellipse.left; x < ellipse.left + ellipse.width; x++) {
+ const point = {
+ x,
+ y,
+ };
+
+ if (pointInEllipse(ellipse, point)) {
+ if (min === null) {
+ min = sp[index];
+ max = sp[index];
+ }
+
+ sum += sp[index];
+ sumSquared += sp[index] * sp[index];
+ min = Math.min(min, sp[index]);
+ max = Math.max(max, sp[index]);
+ count++;
+ }
+
+ index++;
+ }
+ }
+
+ if (count === 0) {
+ return {
+ count,
+ mean: 0.0,
+ variance: 0.0,
+ stdDev: 0.0,
+ min: 0.0,
+ max: 0.0,
+ };
+ }
+
+ const mean = sum / count;
+ const variance = sumSquared / count - mean * mean;
+
+ return {
+ count,
+ mean,
+ variance,
+ stdDev: Math.sqrt(variance),
+ min,
+ max,
+ };
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js
new file mode 100644
index 00000000..ddc90942
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/getCircleCoords.js
@@ -0,0 +1,21 @@
+import * as cornerstoneTools from 'cornerstone-tools'
+const external = cornerstoneTools.external
+
+/**
+ * Retrieve the bounds of the circle in image coordinates
+ *
+ * @param {*} startHandle
+ * @param {*} endHandle
+ * @returns {{ left: number, top: number, width: number, height: number }}
+ */
+export default function getCircleCoords(startHandle, endHandle) {
+ const { distance } = external.cornerstoneMath.point
+ const radius = distance(startHandle, endHandle)
+
+ return {
+ left: Math.floor(Math.min(startHandle.x - radius, endHandle.x)),
+ top: Math.floor(Math.min(startHandle.y - radius, endHandle.y)),
+ width: radius * 2,
+ height: radius * 2
+ }
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js
new file mode 100644
index 00000000..e7a09e2e
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Probe/pointInEllipse.js
@@ -0,0 +1,39 @@
+/**
+ * Returns true if a point is within an ellipse
+ * @export @public @method
+ * @name pointInEllipse
+ *
+ * @param {Object} ellipse Object defining the ellipse.
+ * @param {Object} location The location of the point.
+ * @returns {boolean} True if the point is within the ellipse.
+ */
+export default function(ellipse, location) {
+ const xRadius = ellipse.width / 2;
+ const yRadius = ellipse.height / 2;
+
+ if (xRadius <= 0.0 || yRadius <= 0.0) {
+ return false;
+ }
+
+ const center = {
+ x: ellipse.left + xRadius,
+ y: ellipse.top + yRadius,
+ };
+
+ /* This is a more general form of the circle equation
+ *
+ * X^2/a^2 + Y^2/b^2 <= 1
+ */
+
+ const normalized = {
+ x: location.x - center.x,
+ y: location.y - center.y,
+ };
+
+ const inEllipse =
+ (normalized.x * normalized.x) / (xRadius * xRadius) +
+ (normalized.y * normalized.y) / (yRadius * yRadius) <=
+ 1.0;
+
+ return inEllipse;
+}
From 7882c9b631efc11a60fbd8f824a3dd85e57d941b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 26 Dec 2024 11:02:58 +0800
Subject: [PATCH 025/194] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/email-recompose/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index ba74eceb..21c1ce7b 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -29,9 +29,9 @@
+
+
+
+
+
+ + {{ subjectCode }} + {{ taskBlindName }} +
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ language==='en'?qs.GroupEnName:qs.GroupName }} +
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.QuestionName }}
+
+
+ 分段
+ 是否可测量
+ 平均值
+
+
+
+
+
+ {{ getLesionName(item.TableQuestions.Questions, q) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{{ $t('common:button:confirm') }}
+
+
+ {{ $t('common:button:cancel') }}
+
{{ $t('trials:externalStaff:table:name') }}:
@@ -12,23 +12,54 @@
{{ $t('trials:externalStaff:table:phone') }}:
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
{{ $t('trials:staff:button:permissionConfiguration') }}
-
+
{{ $t('trials:staff:button:sendEmail') }}
-
+
{{ $t('trials:staff:button:addExternalStaff') }}
@@ -57,7 +88,9 @@
sortable="custom"
min-width="100"
>
- {{ scope.row.LastName + ' / ' + scope.row.FirstName }}
+ {{
+ scope.row.LastName + ' / ' + scope.row.FirstName
+ }}
-
-
- {{ $t("trials:readingReport:button:skip") }}
-
-
- {{
- $t("common:button:save")
- }}
-
- {{
- $t("common:button:submit")
- }}
-
-
+
+
+ {{ $t("trials:readingReport:button:skip") }}
+
+
+ {{
+ $t("common:button:save")
+ }}
+
+ {{
+ $t("common:button:submit")
+ }}
+
+
@@ -1754,12 +1757,10 @@ export default {
this.selected.TrialId = this.subjectRowData.TrialId
this.selected.SubjectId = this.subjectRowData.SubjectId
this.isShow = true
- console.log(res)
})
}
},
handleView2(row) {
- console.log(row)
this.rowData = { ...row }
this.openType = 'look'
this.preview.visible = true
@@ -1914,7 +1915,6 @@ export default {
this.list = res.Result.CurrentPageData
this.total = res.Result.TotalCount
this.otherInfo = res.OtherInfo
- console.log(this.otherInfo)
})
.catch(() => {
this.loading = false
@@ -2053,9 +2053,16 @@ export default {
this.otherInfo.ClinicalInformationTransmissionEnum > 0 &&
this.rowData.IsBaseLine
) {
- const { ClinicalDataConfirmation } = const_.processSignature
- this.signCode = ClinicalDataConfirmation
- this.signVisible = true
+ getVisitClinicalDataName({ id: this.rowData.Id })
+ .then((res) => {
+ this.signReplaceText = res.Result.ClinicalDataName
+ const { ClinicalDataConfirmation } = const_.processSignature
+ this.signCode = ClinicalDataConfirmation
+ this.signVisible = true
+ })
+ .catch((err) => {
+ console.log(err)
+ })
} else {
this.submit()
}
From ca4f2c4a8e2a87a70cd00faf1313e7ae7af7117c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:15:50 +0800
Subject: [PATCH 053/194] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/login-log/detail.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/views/system/login-log/detail.vue b/src/views/system/login-log/detail.vue
index fedbb8ca..f8890f5b 100644
--- a/src/views/system/login-log/detail.vue
+++ b/src/views/system/login-log/detail.vue
@@ -49,6 +49,8 @@ export default {
title: this.$t('system:loginLog:dialog:title'),
width: '500px',
top: '10vh',
+ appendToBody: true,
+ bodyStyle: `min-height: 100px; max-height: 650px;overflow-y: auto;padding: 10px;border: 1px solid #e0e0e0;`,
}
},
},
@@ -86,4 +88,9 @@ export default {
},
},
}
-
\ No newline at end of file
+
+
\ No newline at end of file
From 75f3b37c05226ded9c956e17bfce5c810e9d4b7f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:18:19 +0800
Subject: [PATCH 054/194] =?UTF-8?q?=E4=BB=B2=E8=A3=81=E8=A7=84=E5=88=99?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading-unit/components/ArbitrationRules.vue | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
index 75a91c56..8611acdd 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
@@ -72,12 +72,10 @@
"
:label="item.value"
v-if="
- (JudgyInfo.ArbitrationRule === 1 &&
- (item.value < 4 ||
- (item.value > 3 &&
- (QuestionList[index].Type === 'number' ||
- QuestionList[index].Type === 'calculation')))) ||
- (JudgyInfo.ArbitrationRule === 2 && item.value < 4)
+ item.value < 4 ||
+ (item.value > 3 &&
+ (QuestionList[index].Type === 'number' ||
+ QuestionList[index].Type === 'calculation'))
"
>
{{ item.label }}
From a78d848424a03cbf2ff7bd04988a89adfdc0e305 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 30 Dec 2024 13:30:10 +0800
Subject: [PATCH 055/194] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/components/Navbar.vue | 123 +++++++++++++++++++++++++++----
1 file changed, 107 insertions(+), 16 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 49442e19..1800836a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -14,13 +14,13 @@
From 8ad77f1679bb2d3ce1a6726a9c4b1c690156c019 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 11:23:09 +0800
Subject: [PATCH 155/194] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/email-recompose/index.vue | 12 +-
src/views/error.vue | 7 +-
.../enrollment/components/Approval.vue | 104 +++++--
.../enrollment/components/Confirmation.vue | 11 +-
.../enrollment/components/Selection.vue | 11 +-
.../enrollment/components/Submission.vue | 11 +-
.../attachments/enrollment/index.vue | 276 +++++++++++-------
7 files changed, 276 insertions(+), 156 deletions(-)
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 29f809a9..49e12126 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -180,9 +180,9 @@ export default {
this.$i18n.locale = this.$route.query.lang
this.setLanguage(this.$route.query.lang)
this.$updateDictionary()
- if (!this.password.NewUserName) {
- this.$alert(this.$t('recompose:message:warning'))
- }
+ // if (!this.password.NewUserName) {
+ // this.$alert(this.$t('recompose:message:warning'))
+ // }
},
methods: {
...mapMutations({ setLanguage: 'lang/setLanguage' }),
@@ -194,8 +194,10 @@ export default {
} else {
this.$router.push(`/login`)
}
- this.$i18n.locale = 'zh'
- this.setLanguage('zh')
+ if (!this.$i18n.locale) {
+ this.$i18n.locale = 'zh'
+ this.setLanguage('zh')
+ }
this.$updateDictionary()
},
save() {
diff --git a/src/views/error.vue b/src/views/error.vue
index db3aa915..47389a41 100644
--- a/src/views/error.vue
+++ b/src/views/error.vue
@@ -2,7 +2,8 @@
-
+
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index 629d700b..e54ace34 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -141,8 +141,8 @@
sortable="custom"
/>
Date: Mon, 20 Jan 2025 14:05:36 +0800
Subject: [PATCH 158/194] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E5=9B=BD?=
=?UTF-8?q?=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 81003a5c..cbd8136e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -343,9 +343,9 @@ export default {
this.setLanguage('en')
this.$updateDictionary()
} else {
- // this.$i18n.locale = 'zh'
- // this.setLanguage('zh')
- // this.$updateDictionary()
+ this.$i18n.locale = 'zh'
+ this.setLanguage('zh')
+ this.$updateDictionary()
}
}
this.$refs.browserTip.open()
From 3441793bcb1cf683d8a4d041d6f7b66f86702802 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 20 Jan 2025 14:29:17 +0800
Subject: [PATCH 159/194] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/TrialsTab/index.vue | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index f49aafe6..981871c4 100644
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@@ -22,11 +22,14 @@
-
From 73e0a13e91909313b73083817e6d7f1af2ff9cd8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 15:47:31 +0800
Subject: [PATCH 160/194] =?UTF-8?q?=E7=AE=80=E5=8E=86=E8=8B=B1=E6=96=87?=
=?UTF-8?q?=E5=A7=93=E5=90=8D=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../curriculumVitae/components/info/info.vue | 12 +++---------
src/views/reviewers/curriculumVitae/preview.vue | 5 +++--
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index 94f94864..68a6ef80 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -6,7 +6,7 @@
-
+
+
-
+
+
@@ -56,8 +57,10 @@ export default {
.pic-404 {
position: relative;
float: left;
- width: 400px;
+ width: 500px;
+ height: 300px;
overflow: hidden;
+ margin-right: 10px;
&__parent {
width: 100%;
}
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
index 5dd4dce1..88000983 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
@@ -1,14 +1,14 @@
+
- {{ scope.row.LastName }} / {{ scope.row.FirstName }}
+ {{ scope.row.LastName }} / {{ scope.row.FirstName }}
-
+ />
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
@@ -70,19 +83,34 @@
min-width="150"
/>
-
-
+ />
-
+ />
+
-
- {{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}
-
-
-
-
- {{
+ $t('trials:trials-list:form:indication:')
+ }}
+ {{ $fd('Indication', trialInfo.IndicationEnum)
+ }}{{
+ trialInfo.Indication ? '-' + trialInfo.Indication : ''
+ }}
- {{ trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ') }}
-
-
-
-
-
- {{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}
-
-
-
-
+
+
+ {{
+ trialInfo.DeclarationTypeEnumList.map((v) =>
+ $fd('DeclarationType', v)
+ ).join(', ')
+ }}
+
+
+
+
+
+ {{
+ trialInfo.CriterionList && trialInfo.CriterionList.length > 0
+ ? trialInfo.CriterionList.join(', ')
+ : ''
+ }}
+
+
+
-
- {{$fd('YesOrNoForInt', trialInfo.Expedited)}}
+
+ {{ $fd('YesOrNoForInt', trialInfo.Expedited) }}
-
+
{{ trialInfo.TotalReviewers }}
-
- {{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }}
-
-
+
+ {{
+ trialInfo.AttendedReviewerTypeEnumList.map((v) =>
+ $fd('AttendedReviewerType', v)
+ ).join(', ')
+ }}
+
@@ -60,7 +93,12 @@
-
+
@@ -127,18 +169,30 @@ export default {
trialInfo: null,
TrialId: '',
activeStatus: null,
- TrialMaxState: 0
+ TrialMaxState: 0,
}
},
mounted() {
this.TrialId = this.$route.query.trialId
this.initPage()
},
+ computed: {
+ isEN() {
+ return this.$i18n.locale !== 'zh'
+ },
+ },
methods: {
initPage() {
- getTrialInfoAndMaxTrialState(this.TrialId).then(res => {
+ getTrialInfoAndMaxTrialState(this.TrialId).then((res) => {
this.trialInfo = res.Result.TrialView
- var activeStatus = res.Result.TrialMaxState < 1 ? 0 : res.Result.TrialMaxState < 5 ? 1 : res.Result.TrialMaxState < 8 ? 2 : 3
+ var activeStatus =
+ res.Result.TrialMaxState < 1
+ ? 0
+ : res.Result.TrialMaxState < 5
+ ? 1
+ : res.Result.TrialMaxState < 8
+ ? 2
+ : 3
this.activeStatus = activeStatus
this.TrialMaxState = activeStatus
})
@@ -147,95 +201,93 @@ export default {
this.activeStatus = step
},
nextStep(stepName) {
- this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1;
- if(stepName==='confirmation'){
- this.activeStatus = 3;
+ this.activeStatus = this.activeStatus === 3 ? 3 : this.activeStatus + 1
+ if (stepName === 'confirmation') {
+ this.activeStatus = 3
}
this.TrialMaxState = this.activeStatus
this.$nextTick(
- function() {
+ function () {
this.$refs[stepName].getList()
}.bind(this)
)
- }
-
- }
+ },
+ },
}
From 70735f2c479817666acacca8c00d0677a4a48831 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 13:19:51 +0800
Subject: [PATCH 156/194] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/recompose/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index 99544b63..7f43ecbb 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -144,8 +144,10 @@ export default {
} else {
this.$router.push(`/login`)
}
- this.$i18n.locale = 'zh'
- this.setLanguage('zh')
+ if (!this.$i18n.locale) {
+ this.$i18n.locale = 'zh'
+ this.setLanguage('zh')
+ }
this.$updateDictionary()
},
save() {
From 13191c914e4d18aa9b68a144450719aaf11eecfb Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 20 Jan 2025 13:49:16 +0800
Subject: [PATCH 157/194] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=98=85=E7=89=87?=
=?UTF-8?q?=E6=A0=87=E5=87=86=E9=85=8D=E7=BD=AE=E9=A1=B5=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dictionary/template/components/AddCriterion.vue | 2 +-
src/views/dictionary/template/components/CriterionsTmp.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/dictionary/template/components/AddCriterion.vue b/src/views/dictionary/template/components/AddCriterion.vue
index 5d7f4d57..249cd998 100644
--- a/src/views/dictionary/template/components/AddCriterion.vue
+++ b/src/views/dictionary/template/components/AddCriterion.vue
@@ -50,7 +50,7 @@
+
-
{{ $t('trials:trials:title:back') }}
-
+
+
{{
- isEN ? DATA.FirstName + DATA.LastName : DATA.ChineseName
+ isEN ? DATA.LastName + ' / ' + DATA.FirstName : DATA.ChineseName
}}
{{ $fd('Sex', DATA.Sex) }}
@@ -269,16 +269,10 @@
:label="$t('curriculumVitae:info:form:City')"
v-if="isEN"
>
-
-
{{
isEN
- ? reviewerData.BasicInfoView.FirstName +
- reviewerData.BasicInfoView.LastName
+ ? reviewerData.BasicInfoView.LastName +
+ ' / ' +
+ reviewerData.BasicInfoView.FirstName
: reviewerData.BasicInfoView.ChineseName
}}
From 823ac2f085a6eb815ecd9c8c09cc5f0948474c7f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 15:58:19 +0800
Subject: [PATCH 161/194] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index cbd8136e..c31e6d48 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -328,6 +328,7 @@ export default {
},
},
mounted() {
+ let lang = zzSessionStorage.getItem('lang') || 'zh'
zzSessionStorage.clear()
this.loginType = this.$route.query.loginType
this.location = this.$route.query.location
@@ -343,8 +344,8 @@ export default {
this.setLanguage('en')
this.$updateDictionary()
} else {
- this.$i18n.locale = 'zh'
- this.setLanguage('zh')
+ this.$i18n.locale = lang
+ this.setLanguage(lang)
this.$updateDictionary()
}
}
@@ -388,8 +389,8 @@ export default {
.dispatch('user/login', this.loginForm)
.then((res) => {
if (res.BasicInfo.LoginState === 2) {
- this.$message.warning(this.$t('login:message:login4'))
- }
+ this.$message.warning(this.$t('login:message:login4'))
+ }
if (res.BasicInfo.IsFirstAdd) {
// 当前用户为首次登录,请先修改密码之后再次登录
this.$message.success(this.$t('login:message:login1'))
From 55ae6bac7e96eb28cbb9ea18ec912515d20beba2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 20 Jan 2025 16:14:06 +0800
Subject: [PATCH 162/194] =?UTF-8?q?lili=E5=85=B3=E4=BA=8E=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c31e6d48..79431359 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -205,17 +205,21 @@
"
>
-
+
-
+
About
-关于
-- {{ $t('login:title:system_title_about') }} +
关于
+
+
+
{{ $t('login:title:system') }}
-+
{{ $t('login:title:system') }}
+V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
@@ -313,7 +317,8 @@ export default { computed: { ...mapGetters(['asyncRoutes', 'routes', 'language']), host() { - return window.location.host + // return window.location.host + return 'elevateimaging.ai ' }, }, watch: { From 6e1d07ee95cf97adbd8b22a1968963107c9974a2 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 20 Jan 2025 17:32:49 +0800 Subject: [PATCH 163/194] =?UTF-8?q?=E5=A4=9A=E9=A1=B5=E7=AD=BE=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=B8=85=E6=A5=9A=E7=BC=93=E5=AD=98uerId=E5=92=8Ciden?= =?UTF-8?q?tityUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 79431359..21f33813 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -437,6 +437,8 @@ export default { // // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning')) // this.$message.warning(this.$t('login:message:login4')) // } + zzSessionStorage.removeItem('userId') + zzSessionStorage.removeItem('identityUserId') this.changeRoleLogin() }) .catch(() => { From 102089c16fd639f85b061642bb4bfc0a6fc9b4e2 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 21 Jan 2025 09:23:40 +0800 Subject: [PATCH 164/194] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8BTab=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TrialsTab/index.vue | 5 ++++- src/views/trials/trials-layout/components/trialsNavbar.vue | 5 +++++ .../trials-panel/reading/read-task-allocation/index.vue | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue index 981871c4..7ea17661 100644 --- a/src/components/TrialsTab/index.vue +++ b/src/components/TrialsTab/index.vue @@ -3,7 +3,7 @@
@@ -1013,6 +1013,11 @@ export default {
}
diff --git a/src/views/trials/trials-panel/setting/qc-question/index.vue b/src/views/trials/trials-panel/setting/qc-question/index.vue
index a0d8800e..65f82fef 100644
--- a/src/views/trials/trials-panel/setting/qc-question/index.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/index.vue
@@ -4,7 +4,7 @@
-
+
@@ -26,22 +26,22 @@
-
+
-
+
-
+
-
+
{{ $t('common:button:search') }}
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 157f44d3..37190fe6 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -8,14 +8,14 @@
:label="item.TrialReadingCriterionName"
:name="item.TrialReadingCriterionId"
>
-
+
{{ $t("trials:readingUnit:button:sync") }}
@@ -525,6 +525,9 @@ export default {
background: #e5ecef;
padding-left: 10px;
}
+ /deep/ .el-tabs--border-card>.el-tabs__content {
+ padding: 0px 15px;
+ }
/deep/ .el-collapse-item__content {
padding: 10px;
}
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index f7caecb0..5b1605f0 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -576,6 +576,11 @@ export default {
}
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index d66f6c34..170a0c5c 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -423,7 +423,7 @@ export default {
/* margin-bottom: 40px;*/
/*}*/
.is-error.my_new_pwd {
- margin-bottom: 40px;
+ margin-bottom: 45px;
}
.flexBox {
display: flex;
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index da7365e4..7fcb08e3 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -42,6 +42,7 @@
@@ -221,4 +222,7 @@ input {
background-color: transparent;
caret-color: #fff;
}
+::v-deep .is-error.my_new_pwd {
+ margin-bottom: 45px;
+}
diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue
index f16a0569..ce97b99e 100644
--- a/src/views/trials/trials-myinfo/password.vue
+++ b/src/views/trials/trials-myinfo/password.vue
@@ -27,6 +27,7 @@
\ No newline at end of file
diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue
index 17ccc97b..b79417d1 100644
--- a/src/views/user/myInfo.vue
+++ b/src/views/user/myInfo.vue
@@ -659,6 +659,6 @@ export default {
From ff0ddeea9a9853225709b45f5290546e24d449be Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 15:58:45 +0800
Subject: [PATCH 171/194] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading/medical-feedback/components/ChatForm.vue | 4 ++--
.../reading/mim-medical-audit/components/ChatForm.vue | 4 ++--
.../reading/mim-medical-audit/components/Conclusions.vue | 6 +++++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 5a8c2668..ccf2b913 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,8 +11,8 @@
({{ record.CreateTime }})
-
-
{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index b2012239..58a8f22f 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,8 +11,8 @@
({{ record.CreateTime }})
-
-
{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 899e1396..81c9d179 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -260,7 +260,11 @@ export default {
if (Object.keys(this.medicalReviewInfo).length > 0) {
for (const k in this.form) {
if (this.medicalReviewInfo.hasOwnProperty(k)) {
- this.form[k] = this.medicalReviewInfo[k];
+ if (k === 'IsHaveQuestion' && this.medicalReviewInfo.AuditState === 0) {
+ this.form[k] = null
+ } else {
+ this.form[k] = this.medicalReviewInfo[k]
+ }
}
}
this.fileList = [];
From efe3d937b4dbbe38db0aa49949970ac586096f67 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:16:23 +0800
Subject: [PATCH 172/194] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading/medical-feedback/components/ChatForm.vue | 7 +++----
.../reading/mim-medical-audit/components/ChatForm.vue | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index ccf2b913..3907976a 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,9 +11,8 @@
({{ record.CreateTime }})
-
-
-
+
{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
- {{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
@@ -60,7 +59,7 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
{{ record.Content }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 58a8f22f..7e4f6b7b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,9 +11,8 @@
({{ record.CreateTime }})
-
-
-
+
{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
- {{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
@@ -60,7 +59,7 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
{{ record.Content }}
From e0f42e815ebf71eee91366c02da36d3556ffe09b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:26:03 +0800
Subject: [PATCH 173/194] 1
---
.../medical-feedback/components/ChatForm.vue | 14 +++++++-------
.../mim-medical-audit/components/ChatForm.vue | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 3907976a..5abce1aa 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,12 +11,9 @@
({{ record.CreateTime }})
-
-
{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
-
-
-
+
+ 111
{{ $t('trials:medicalFeedback:message:msg1') }}
-
+
+ -
@@ -59,11 +56,14 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+
{{ record.Content }}
-
+
{{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 7e4f6b7b..bb717a57 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,11 +11,8 @@
({{ record.CreateTime }})
-
-
+
+
+
+
Date: Tue, 21 Jan 2025 16:38:52 +0800
Subject: [PATCH 175/194] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E8=A7=92=E8=89=B2=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E6=97=B6=E8=87=AA=E5=8A=A8=E7=99=BB?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 12 ++++++++++++
src/views/trials/trials-myinfo/account.vue | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 21f33813..7a353d14 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -510,6 +510,18 @@ export default {
this.loginByRole(this.$store.state.user.roles[0].Id)
return
}
+ if (
+ Array.isArray(this.$store.state.user.roles) &&
+ this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
+ .length ===
+ this.$store.state.user.roles.length - 1
+ ) {
+ let role = this.$store.state.user.roles.find(
+ (item) => !item.IsUserRoleDisabled
+ )
+ this.loginByRole(role.Id)
+ return
+ }
return (this.toggleRoleVisible = true)
},
cancel() {
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index feb9161b..35244193 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -119,7 +119,7 @@
v-for="item in roles"
:key="item.Id"
:label="item.Id"
- :disabled="item.isUserRoleDisabled"
+ :disabled="item.IsUserRoleDisabled"
style="margin-bottom: 10px"
>
{{ item.UserTypeShortName }}
@@ -210,6 +210,7 @@ export default {
},
computed: {
roles() {
+ console.log(this.$store.state.user.roles, 'this.$store.state.user.roles')
return this.$store.state.user.roles
},
hasRole() {
From e56440634ef5ae83c61738c6ee1e76f131ecc2b7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 16:47:19 +0800
Subject: [PATCH 176/194] 1
---
src/views/trials/trials-myinfo/account.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 35244193..3bbfe432 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -210,7 +210,6 @@ export default {
},
computed: {
roles() {
- console.log(this.$store.state.user.roles, 'this.$store.state.user.roles')
return this.$store.state.user.roles
},
hasRole() {
From 79caed3fd9d8dd8a06303316d282d26886d6a6b9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 21 Jan 2025 16:49:02 +0800
Subject: [PATCH 177/194] 1
---
.../reading/medical-feedback/components/ChatForm.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 5abce1aa..8a9acda4 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -13,7 +13,6 @@
{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
-
-
-
+
+
{{ $t('trials:medicalFeedback:message:msg1') }}
@@ -59,11 +56,14 @@
{{ $t('trials:medicalFeedback:message:msg4') }}
-
+
+ {{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}
+
+
{{ record.Content }}
-
+
{{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
From d04898dc28f2381ab3f8bb42cbec06631954d2a7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 16:38:16 +0800
Subject: [PATCH 174/194] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/user/components/UserInfo.vue | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 557113f6..6e1761c5 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -73,7 +73,8 @@
- 111
{{ $t('trials:medicalFeedback:message:msg1') }}
-
From e3f6f9107d62d5779a5f0d87bddf8ff7e107f485 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 21 Jan 2025 17:12:33 +0800
Subject: [PATCH 178/194] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=8F=AF=E5=88=87?=
=?UTF-8?q?=E6=8D=A2=E9=80=89=E9=A1=B9=E4=B8=8D=E8=B6=B3=E6=97=B6=E4=B8=8D?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2=E6=8C=89?=
=?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-layout/components/trialsNavbar.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index c5c47cc9..004aa805 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -146,7 +146,11 @@ export default {
return this.$store.state.user.roles
},
hasRole() {
- return this.roles && this.roles.length > 1
+ return (
+ this.roles &&
+ this.roles.length > 1 &&
+ this.roles.filter((item) => !item.IsUserRoleDisabled).length > 1
+ )
},
},
watch: {
From b209c6566b509e294dcf1b6457e4dc544bd0dc85 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 22 Jan 2025 09:48:25 +0800
Subject: [PATCH 179/194] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E9=83=A8?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BC=B9=E6=A1=86=E6=8C=89=E9=92=AE=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../setting/personnel-manage/components/staffExternalForm.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index d1fe8dbd..18dc25d1 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -24,6 +24,7 @@
-
+
-
+
Select{{ $t('common:button:check') }}
- (must be in pdf format)
+ ({{ $t('trials:signature:label:mustBepdf') }})
-
+
Save{{ $t('common:button:save') }}
@@ -138,13 +144,25 @@ export default {
},
rules: {
FileTypeId: [
- { required: true, message: 'Please select', trigger: ['blur'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur'],
+ },
],
SignViewMinimumMinutes: [
- { required: true, message: 'Please specify', trigger: ['change'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['change'],
+ },
],
NeedConfirmedUserTypeIdList: [
- { required: true, message: 'Please select', trigger: ['blur'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur'],
+ },
],
},
fileList: [],
@@ -211,7 +229,7 @@ export default {
this.fileList = []
return true
} else {
- this.$alert('must be in pdf format')
+ this.$alert(this.$t('trials:signature:label:mustBepdf'))
return false
}
@@ -236,7 +254,7 @@ export default {
this.$refs.sysAttachmentFrom.validate((valid) => {
if (!valid) return
if (!this.form.Name) {
- this.$alert('Please select file.')
+ this.$alert(this.$t('trials:signature:message:selectFile'))
return
}
this.saveBtnLoading = true
@@ -245,7 +263,7 @@ export default {
this.saveBtnLoading = false
this.$emit('closeDialog')
this.$emit('getList')
- this.$message.success('Uploaded successfully')
+ this.$message.success(this.$t('common:message:updatedSuccessfully'))
})
.catch(() => {
this.saveBtnLoading = false
@@ -263,7 +281,7 @@ export default {
}
},
handleExceed(files, fileList) {
- this.$message.warning(`Upload is currently limited to 1 file`)
+ this.$message.warning(this.$t('upload:rule:maxFile1'))
},
checkFileSuffix(fileName) {
var typeArr = ['pdf']
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 29279a3c..f1b79f67 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -34,7 +34,7 @@
-
-
-
+
-
-
+
-
+
+
+
+
+
+
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index e54ace34..2d5deae5 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -57,8 +57,16 @@
- 重置
- 查询
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/IncreaseFields.vue b/src/views/dictionary/template/components/IncreaseFields.vue
index c653fafb..badc3517 100644
--- a/src/views/dictionary/template/components/IncreaseFields.vue
+++ b/src/views/dictionary/template/components/IncreaseFields.vue
@@ -16,8 +16,16 @@
- Reset
- Search
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/MedicalAudit.vue b/src/views/dictionary/template/components/MedicalAudit.vue
index 543ae93a..6b5f5636 100644
--- a/src/views/dictionary/template/components/MedicalAudit.vue
+++ b/src/views/dictionary/template/components/MedicalAudit.vue
@@ -38,8 +38,16 @@
- 重置
- 查询
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/components/QcQuestions.vue b/src/views/dictionary/template/components/QcQuestions.vue
index 9e16395e..b6730d59 100644
--- a/src/views/dictionary/template/components/QcQuestions.vue
+++ b/src/views/dictionary/template/components/QcQuestions.vue
@@ -26,8 +26,16 @@
- Reset
- Search
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index d881977d..db56ca4d 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -123,8 +123,16 @@
- 查询
- 重置
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/dictionary/template/sign/index.vue b/src/views/dictionary/template/sign/index.vue
index 7e84582b..0ced8f42 100644
--- a/src/views/dictionary/template/sign/index.vue
+++ b/src/views/dictionary/template/sign/index.vue
@@ -3,15 +3,23 @@
-
+
- Reset
- Search
+
+ {{ $t('common:button:search') }}
+
+
+ {{ $t('common:button:reset') }}
+
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 9583a02f..2114e3e5 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -392,15 +392,17 @@ export default {
},
],
searchHandle: [
- {
- label: this.$t('common:button:reset'),
- type: 'primary',
- emitKey: 'reset',
- },
{
label: this.$t('common:button:search'),
type: 'primary',
emitKey: 'search',
+ icon: 'el-icon-search'
+ },
+ {
+ label: this.$t('common:button:reset'),
+ type: 'primary',
+ emitKey: 'reset',
+ icon: 'el-icon-refresh-left'
},
{
label: this.$t('common:button:new'),
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 8a9acda4..ec423c4b 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -30,7 +30,7 @@
style="margin:0 10px;"
:images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
>
-
+
{{ file.FileName }}
![]()
-
+
{{ file.FileName }}
![]()
Date: Fri, 24 Jan 2025 13:27:47 +0800
Subject: [PATCH 193/194] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AE=80?=
=?UTF-8?q?=E5=8E=86=E9=A2=84=E8=A7=88=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/reviewers/components/Agreements.vue | 6 +++---
.../reviewers/curriculumVitae/components/file/agreement.vue | 2 +-
.../curriculumVitae/components/file/certificate.vue | 2 +-
src/views/reviewers/curriculumVitae/preview.vue | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue
index c037b271..4b23887c 100644
--- a/src/views/reviewers/components/Agreements.vue
+++ b/src/views/reviewers/components/Agreements.vue
@@ -437,7 +437,7 @@ export default {
},
handlePreview3(row) {
return this.$preview({
- path: row.FilePath,
+ path: row.Path || row.FilePath,
type: 'pdf',
title: row.FileName,
})
@@ -447,7 +447,7 @@ export default {
},
handlePreview2(row, r2) {
return this.$preview({
- path: row.fullPath,
+ path: row.Path || row.fullPath,
type: 'pdf',
title: row.FileName,
})
@@ -537,7 +537,7 @@ export default {
handlePreview(row) {
console.log(row)
return this.$preview({
- path: row.FullPath,
+ path: row.Path || row.FullPath,
type: 'pdf',
title: row.FileName,
})
diff --git a/src/views/reviewers/curriculumVitae/components/file/agreement.vue b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
index 06d67587..7a3a8a1b 100644
--- a/src/views/reviewers/curriculumVitae/components/file/agreement.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/agreement.vue
@@ -333,7 +333,7 @@ export default {
},
preview(row) {
this.$preview({
- path: row.FullPath,
+ path: row.Path || row.FullPath,
type: 'pdf',
title: row.FileName,
})
diff --git a/src/views/reviewers/curriculumVitae/components/file/certificate.vue b/src/views/reviewers/curriculumVitae/components/file/certificate.vue
index 752f7fa7..5826bdf0 100644
--- a/src/views/reviewers/curriculumVitae/components/file/certificate.vue
+++ b/src/views/reviewers/curriculumVitae/components/file/certificate.vue
@@ -292,7 +292,7 @@ export default {
},
preview(row) {
this.$preview({
- path: row.FullPath,
+ path: row.Path || row.FullPath,
type: 'pdf',
title: row.FileName,
})
diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 81934a8d..999cbbc4 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -1015,7 +1015,7 @@ export default {
}
},
preview(row) {
- let path = row.FullPath || row.FilePath
+ let path = row.Path || row.FullPath || row.FilePath
this.$preview({
path: path,
type: 'pdf',
From dba4466ac26890fcedfd8d20d8c20c9fd45e8850 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 24 Jan 2025 16:27:39 +0800
Subject: [PATCH 194/194] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 6 +++---
.../attachments/site-research/index.vue | 5 ++---
.../trial-config/components/processConfig.vue | 3 +++
.../visit/qc-check/components/qualityAssurance.vue | 14 +++++++++++++-
src/views/trials/trials-workbench/index.vue | 4 ++--
5 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index e7b9b781..769f0bed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -209,9 +209,9 @@ export default {
[],
this.arr.filter(
(v) =>
- ~v.Code.indexOf(this.key) ||
- ~v.Value.indexOf(this.key) ||
- ~v.ValueCN.indexOf(this.key)
+ ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
+ ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
+ ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
)
)
} else {
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 1b3cbb06..cd45126a 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -332,13 +332,12 @@
-->
{{ $t('trials:researchRecord:label:link') }}
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index beb797dd..b1fff910 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -771,6 +771,7 @@
@@ -778,6 +779,7 @@
@@ -785,6 +787,7 @@
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 274695a3..d1262449 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -121,7 +121,19 @@
:label="$t('trials:audit:table:bodyPart')"
>
- {{ getBodyPart(scope.row.BodyPartForEdit) }}
+
+
+
+ {{ getBodyPart(scope.row.BodyPartForEdit) }}
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 8e128252..4f803c9f 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -233,14 +233,14 @@
- {{ $t('trials:workbench:title:trialDocSigned') }}·{{ tabList.TrialSignedDocCount }}
+ {{ $t('trials:workbench:title:trialDocSigned') }}·{{ tabList.TrialSignedDocCount }}
- {{ $t('trials:workbench:title:sysDocSigned') }}·{{ tabList.SysSignedDocCount }}
+ {{ $t('trials:workbench:title:sysDocSigned') }}·{{ tabList.SysSignedDocCount }}