diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue index 303307d6..378bec3a 100644 --- a/src/components/BaseForm/search-form.vue +++ b/src/components/BaseForm/search-form.vue @@ -120,9 +120,9 @@ v-if="item.type === 'Daterange'" v-model="searchData[item.prop]" type="datetimerange" - range-separator="至" - start-placeholder="开始时间" - end-placeholder="结束时间" + :range-separator="$t('baseForm:daterange:rangeSeparator')" + :start-placeholder="$t('baseForm:daterange:startPlaceholder')" + :end-placeholder="$t('baseForm:daterange:startendPlaceholder')" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" :style="{ width: item.width }" diff --git a/src/main.js b/src/main.js index 348580b8..6e73d496 100644 --- a/src/main.js +++ b/src/main.js @@ -451,22 +451,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) diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue index 1bea7bdd..056fd35e 100644 --- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue +++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue @@ -1,5 +1,5 @@