XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'uat' into uat_us

uat_us
DESKTOP-6C3NK6N\WXS 2024-08-09 13:11:36 +08:00
parent ef891857c4 08710d78d1
commit 267ee60fc2
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main.js
View File

@ -440,22 +440,22 @@ async function VueInit() {
done()
}, 500)
}
if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
done();
Vue.prototype.$MFA({
status: "lock",
UserId: my_userid,
EMail: res.Result,
username: my_username,
callBack: () => {
closeLock(_vm)
},
})
})
} else {
closeLock(_vm)
}
// if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) {
// sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
// done();
// Vue.prototype.$MFA({
// status: "lock",
// UserId: my_userid,
// EMail: res.Result,
// username: my_username,
// callBack: () => {
// closeLock(_vm)
// },
// })
// })
// } else {
closeLock(_vm)
// }
} else {
// console.log(111)

24
src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
View File

@ -272,20 +272,22 @@
</el-select>
</template>
<template slot="dialog-footer">
<el-button
<div style="margin-top:30px;">
<el-button
:disabled="readingCategory_model.btnLoading"
type="primary"
@click="readingCategory_model.visible = false"
>
{{ $t('common:button:cancel') }}
</el-button>
<el-button
type="primary"
:loading="readingCategory_model.btnLoading"
@click="handleUpdateReadingCategory"
>
{{ $t('common:button:save') }}
</el-button>
>
{{ $t('common:button:cancel') }}
</el-button>
<el-button
type="primary"
:loading="readingCategory_model.btnLoading"
@click="handleUpdateReadingCategory"
>
{{ $t('common:button:save') }}
</el-button>
</div>
</template>
</base-model>
<!-- 修改医生状态 -->

6
src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
View File

@ -16,10 +16,12 @@
<el-input
v-model="form.ClinicalDataSetEnName"
:disabled="data.IsFromSystemData === true"
@input="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
@blur="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
/>
</el-form-item>
<!-- 临床数据名称 -->
<el-form-item
<!-- <el-form-item
:label="$t('trials:processCfg:title:clinicalDataName')+ '（CN）'"
prop="ClinicalDataSetName"
>
@ -27,7 +29,7 @@
v-model="form.ClinicalDataSetName"
:disabled="data.IsFromSystemData === true"
/>
</el-form-item>
</el-form-item> -->
<!-- 上传人 -->
<el-form-item
:label="$t('trials:processCfg:title:uploader')"