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

Merge branch 'uat'
continuous-integration/drone/push Build is passing Details 

# Conflicts:
#	src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
uat_us
DESKTOP-6C3NK6N\WXS 2024-08-12 14:54:02 +08:00
parent 743a704204 0189f6e989
commit ab0c3d41de
5 changed files with 77 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/BaseForm/search-form.vue
View File

@ -120,9 +120,9 @@
v-if="item.type === 'Daterange'" v-if="item.type === 'Daterange'"
v-model="searchData[item.prop]" v-model="searchData[item.prop]"
type="datetimerange" type="datetimerange"
range-separator="至" :range-separator="$t('baseForm:daterange:rangeSeparator')"
start-placeholder="开始时间" :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
end-placeholder="结束时间" :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
:style="{ width: item.width }" :style="{ width: item.width }"

32
src/main.js
View File

@ -451,22 +451,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) // closeLock(_vm)
}, // },
}) // })
}) // })
} else { // } else {
closeLock(_vm) closeLock(_vm)
} // }
} else { } else {
// console.log(111) // console.log(111)

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

@ -1,5 +1,5 @@
<template> <template>
<BaseContainer> <BaseContainer class="enroll-list">
<!-- <template slot="search-container"> <!-- <template slot="search-container">
<el-button <el-button
v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:enroll']" v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:enroll']"
@ -96,16 +96,15 @@
<el-table-column <el-table-column
:label="$t('trials:enrolledReviews:table:readingType')" :label="$t('trials:enrolledReviews:table:readingType')"
width="300" width="300"
show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId"> <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId" style="margin:5px 5px 5px 0;">
<el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag> <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
<!-- <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>--> <!-- <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
<el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag> <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
<el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag> <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
</span> </span>
<el-button <el-button
v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']" v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
type="text" type="text"
@click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)" @click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)"
@ -249,7 +248,7 @@
</template> </template>
</base-model> </base-model>
<!-- 修改 readingCategory --> <!-- 修改 readingCategory -->
<base-model :config="readingCategory_model"> <base-model :config="readingCategory_model" class="readingCategory_model">
<template slot="dialog-body"> <template slot="dialog-body">
<!-- Reading Type --> <!-- Reading Type -->
<label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label> <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
@ -259,7 +258,7 @@
allow-create allow-create
multiple multiple
default-first-option default-first-option
style="width: 70%" style="width: 50%;"
> >
<template v-for="item of $d.ReadingCategory"> <template v-for="item of $d.ReadingCategory">
<el-option v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" /> <el-option v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" />
@ -273,20 +272,22 @@
</el-select> </el-select>
</template> </template>
<template slot="dialog-footer"> <template slot="dialog-footer">
<el-button <div style="margin-top:30px;">
<el-button
:disabled="readingCategory_model.btnLoading" :disabled="readingCategory_model.btnLoading"
type="primary" type="primary"
@click="readingCategory_model.visible = false" @click="readingCategory_model.visible = false"
> >
{{ $t('common:button:cancel') }} {{ $t('common:button:cancel') }}
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:loading="readingCategory_model.btnLoading" :loading="readingCategory_model.btnLoading"
@click="handleUpdateReadingCategory" @click="handleUpdateReadingCategory"
> >
{{ $t('common:button:save') }} {{ $t('common:button:save') }}
</el-button> </el-button>
</div>
</template> </template>
</base-model> </base-model>
<!-- 修改医生状态 --> <!-- 修改医生状态 -->
@ -432,7 +433,7 @@ export default {
visible: false, visible: false,
title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'), title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
showClose: true, showClose: true,
width: '500px', width: '600px',
btnLoading: false btnLoading: false
}, },
reviewerStatus_model: { reviewerStatus_model: {
@ -833,10 +834,11 @@ export default {
<style lang="scss"> <style lang="scss">
.enroll-list { .enroll-list {
height: 100%; height: 100%;
.filter-box { .readingCategory_model{
display: flex; .base-modal-body{
align-items: center; min-height: 150px;
padding: 5px 0px; padding-bottom: 30px !important;
}
} }
} }
</style> </style>

31
src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
View File

@ -168,9 +168,20 @@
<el-input v-model="form.TrialSiteCode" /> <el-input v-model="form.TrialSiteCode" />
</el-form-item> </el-form-item>
<!-- 中心名称 --> <!-- 中心名称 -->
<el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteName"> <el-form-item
<el-autocomplete clearable class="inline-input" style="width: 100%" v-model="form.TrialSiteName" :label="$t('trials:sitesList:table:siteName')"
:fetch-suggestions="querySearch" @select="handleSelect" placeholder=""></el-autocomplete> prop="TrialSiteName"
>
<el-autocomplete
clearable
class="inline-input"
style="width: 100%"
v-model="form.TrialSiteName"
:fetch-suggestions="querySearch"
@select="handleSelect"
placeholder=""
@change="handleChange"
></el-autocomplete>
</el-form-item> </el-form-item>
<!-- 中心别称 --> <!-- 中心别称 -->
<el-form-item :label="$t('trials:sitesList:table:siteAliasName')" prop="TrialSiteAliasName"> <el-form-item :label="$t('trials:sitesList:table:siteAliasName')" prop="TrialSiteAliasName">
@ -417,9 +428,13 @@ export default {
this.form.TrialSiteName = item.SiteName; this.form.TrialSiteName = item.SiteName;
this.form.TrialSiteAliasName = item.AliasName this.form.TrialSiteAliasName = item.AliasName
? item.AliasName ? item.AliasName
: this.form.TrialSiteAliasName; : item.SiteName;
this.form.SiteId = item.SiteId; this.form.SiteId = item.SiteId;
}, },
handleChange(v) {
if (v) return
this.form.TrialSiteAliasName = ''
},
querySearch(queryString, cb) { querySearch(queryString, cb) {
var TrialSiteSelectList = this.TrialSiteSelectList; var TrialSiteSelectList = this.TrialSiteSelectList;
var results = queryString var results = queryString
@ -446,8 +461,14 @@ export default {
let res = await getTrialSiteSelectList(); let res = await getTrialSiteSelectList();
if (res.IsSuccess) { if (res.IsSuccess) {
this.TrialSiteSelectList = res.Result.map((item) => { this.TrialSiteSelectList = res.Result.map((item) => {
let v = ''
if (this.$i18n.locale === 'zh' && item.AliasName) {
v = `（${item.AliasName}）`
} else if (this.$i18n.locale === 'en' && item.AliasName) {
v = `( ${item.AliasName} )`
}
return { return {
value: item.SiteName + " " + item.AliasName, value: `${item.SiteName} ${v}`,
...item, ...item,
}; };
}); });

4
src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
View File

@ -1311,7 +1311,9 @@ export default {
// ",", // ",",
// " | " // " | "
// ); // );
this.form.BodyPartTypeList = this.form.BodyPartTypes.split("|"); let BodyPartTypes = res.BodyPartTypes;
this.form.BodyPartTypes = "";
this.form.BodyPartTypeList = BodyPartTypes.split("|");
let r = await this.getTrialBodyPartList(); let r = await this.getTrialBodyPartList();
if (r) { if (r) {
var bodyPartTypes = this.form.BodyPartTypeList.map((i) => { var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {