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

30
src/main.js
View File

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

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

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

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

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