diff --git a/src/App.vue b/src/App.vue index f51f67e0..8899a42a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,6 +3,7 @@
0" />
@@ -91,12 +92,12 @@ import { getFrontInternationalizationList, } from "@/api/dictionary/dictionary"; import { getTrialExtralConfig } from "@/api/trials"; -import feedBack from '@/views/trials/trials-layout/components/feedBack' +import feedBack from "@/views/trials/trials-layout/components/feedBack"; import Vue from "vue"; import i18n from "./lang"; export default { name: "App", - components: {feedBack}, + components: { feedBack }, data() { return { drawer: false, diff --git a/src/api/export.js b/src/api/export.js index 5ff69d85..74317182 100644 --- a/src/api/export.js +++ b/src/api/export.js @@ -160,3 +160,30 @@ export function getSubjectProgress_Export(param) { data: param }) } +// 导出项目列表 +export function getTrialList_Export(data) { + return requestDownload({ + url: `/ExcelExport/getTrialList_Export`, + responseType: 'blob', + method: 'post', + data + }) +} +// 导出培训记录 +export function pMTrainingRecordList_Export(data) { + return requestDownload({ + url: `/ExcelExport/pMTrainingRecordList_Export`, + responseType: 'blob', + method: 'post', + data + }) +} +// 导出影像指控 +export function qCVisitList_Export(data) { + return requestDownload({ + url: `/ExcelExport/qCVisitList_Export`, + responseType: 'blob', + method: 'post', + data + }) +} 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/login/index.vue b/src/views/login/index.vue index c573fa4c..471a0e5c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -18,15 +18,11 @@
- - + +
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue index 5769d106..7b98223b 100644 --- a/src/views/system/user/components/UserInfo.vue +++ b/src/views/system/user/components/UserInfo.vue @@ -25,12 +25,12 @@ - + diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index d32b1550..86fba86b 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -100,15 +100,15 @@ export default { sortable: 'custom', showOverflowTooltip: true }, - { - prop: 'Sex', - label: this.$t('system:userlist:table:Gender'), - hidden: true, - slot: 'genderSlot', - minWidth: 100, - sortable: 'custom', - showOverflowTooltip: true - }, + // { + // prop: 'Sex', + // label: this.$t('system:userlist:table:Gender'), + // hidden: true, + // slot: 'genderSlot', + // minWidth: 100, + // sortable: 'custom', + // showOverflowTooltip: true + // }, { prop: 'Phone', label: this.$t('system:userlist:table:Phone'), diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue index 879191ce..ea114ee7 100644 --- a/src/views/trials/trials-list/index.vue +++ b/src/views/trials/trials-list/index.vue @@ -5,17 +5,13 @@ - + @@ -23,7 +19,7 @@ @@ -32,11 +28,11 @@ - + - - + @@ -70,26 +72,29 @@ - {{ $t('common:button:search') }} + {{ $t("common:button:search") }} - - {{ $t('common:button:reset') }} + + {{ $t("common:button:reset") }} - {{ $t('common:button:export') }} + {{ $t("common:button:export") }} - - + - {{ $t('common:button:new') }} + {{ $t("common:button:new") }} - -
+ +
@@ -122,7 +123,7 @@ @@ -130,7 +131,7 @@ @@ -152,11 +153,11 @@ - + @@ -216,7 +222,7 @@ v-model="searchData.ModalityIds" multiple placeholder="Modality" - style="width:100%;" + style="width: 100%" clearable > @@ -606,7 +649,11 @@ append-to-body custom-class="base-dialog-wrapper" > - + @@ -619,7 +666,11 @@ custom-class="base-dialog-wrapper" append-to-body > - + - + diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue index 6039250c..2f4be8d8 100644 --- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue +++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue @@ -5,10 +5,7 @@ - + - + - + {{ item.RealName }} - + {{ item.UserName }} @@ -43,7 +52,7 @@ v-model="searchData.UserTypeId" clearable filterable - style="width:120px;" + style="width: 120px" > - - + + - - + + - {{ $t('common:button:search') }} + {{ $t("common:button:search") }} - - {{ $t('common:button:reset') }} + + {{ $t("common:button:reset") }} + + + + {{ $t("common:button:export") }} @@ -84,7 +124,7 @@ @@ -127,8 +171,12 @@ sortable="custom" > @@ -147,8 +195,12 @@ sortable="custom" > @@ -193,7 +245,13 @@ - + @@ -205,32 +263,45 @@ append-to-body custom-class="base-dialog-wrapper" > -
- +
+
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 @@