工作台待办任务换行

uat_us
熊飞 2024-03-08 14:30:33 +08:00
parent d5e41679c4
commit 2ed3dd1376
6 changed files with 27 additions and 9 deletions

View File

@ -64,7 +64,7 @@
<span style="margin-right: 20px"> <span style="margin-right: 20px">
{{$t('trials:enrolledReviews:message:EQC')}} {{$t('trials:enrolledReviews:message:EQC')}}
</span> </span>
<el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'" @click="addCol(1, $t('trials:enrolledReviews:message:EQC'))">Upload</el-button> <el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'" @click="addCol(1, $t('trials:enrolledReviews:message:EQC'))">{{$t('common:button:upload')}}</el-button>
</div> </div>
<el-table :data="ackSowList" size="small" v-if="!$route.query.ReviewStatus"> <el-table :data="ackSowList" size="small" v-if="!$route.query.ReviewStatus">
<el-table-column type="index" width="40" /> <el-table-column type="index" width="40" />

View File

@ -5,7 +5,7 @@
ref="NoticeForm" ref="NoticeForm"
:model="form" :model="form"
:rules="rules" :rules="rules"
label-width="120px" label-width="180px"
size="small" size="small"
> >
<el-form-item :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum"> <el-form-item :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">

View File

@ -105,11 +105,29 @@ export default {
} }
}, },
methods: { methods: {
updateQueryParam(param, newValue,wurl) {
// URL
let url = wurl || window.location.href;
//
let regex = new RegExp('([?&])' + param + '=.*?(&|$)');
let separator = url.indexOf('?') !== -1 ? '&' : '?';
//
if (regex.test(url)) {
return url.replace(regex, '$1' + param + '=' + newValue + '$2');
} else {
return url + separator + param + '=' + newValue;
}
},
handleSave() { handleSave() {
this.$refs.userForm.validate(valid => { this.$refs.userForm.validate(valid => {
if (valid) { if (valid) {
this.isDisabled = true this.isDisabled = true
const selectedUserType = this.userTypeOptions.filter(item => item.Id === this.user.UserTypeId) const selectedUserType = this.userTypeOptions.filter(item => item.Id === this.user.UserTypeId)
let newUrl = this.updateQueryParam('userName', this.user.UserName)
newUrl = this.updateQueryParam('email', this.user.EMail, newUrl)
window.history.pushState({ path: newUrl }, '', newUrl)
if (selectedUserType.length > 0) { if (selectedUserType.length > 0) {
this.user.UserTypeEnum = selectedUserType[0].UserTypeEnum this.user.UserTypeEnum = selectedUserType[0].UserTypeEnum
} }

View File

@ -37,13 +37,13 @@
{{ scope.row.RoleNameList.map(role => role.RoleName).join(',') }} {{ scope.row.RoleNameList.map(role => role.RoleName).join(',') }}
</template> </template>
<template slot="isZhiZhunSlot" slot-scope="{scope}"> <template slot="isZhiZhunSlot" slot-scope="{scope}">
{{scope.row.IsZhiZhun ? 'Internal' : 'External'}} {{scope.row.IsZhiZhun ? $t('system:userlist:table:InternalOrExternal:Internal') : $t('system:userlist:table:InternalOrExternal:External')}}
</template> </template>
<template slot="isTestUserSlot" slot-scope="{scope}"> <template slot="isTestUserSlot" slot-scope="{scope}">
{{scope.row.IsTestUser ? 'Yes' : 'No'}} {{scope.row.IsTestUser ? $t('system:userlist:table:IsTestUser:Yes') : $t('system:userlist:table:IsTestUser:No')}}
</template> </template>
<template slot="statusSlot" slot-scope="{scope}"> <template slot="statusSlot" slot-scope="{scope}">
{{ scope.row.Status?'Enable':'Disable' }} {{ scope.row.Status? $t('system:userlist:table:Status:Enable') : $t('system:userlist:table:Status:Disable') }}
</template> </template>
</base-table> </base-table>
</box-content> </box-content>

View File

@ -8,7 +8,7 @@
<div v-if="trialInfo" class="trial-wrapper"> <div v-if="trialInfo" class="trial-wrapper">
<div class="div-row"> <div class="div-row">
<div class="div-col"> <div class="div-col">
<label class="el-label">{{ $t('trials:trials-list:form:indication') }}</label> <label class="el-label">{{ $t('trials:trials-list:form:indication:') }}</label>
<span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span> <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
</div> </div>
<div class="div-col"> <div class="div-col">
@ -38,7 +38,7 @@
<span>{{ trialInfo.TotalReviewers }}</span> <span>{{ trialInfo.TotalReviewers }}</span>
</div> </div>
<div class="div-col"> <div class="div-col">
<label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}</label> <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
<span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span> <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
<!-- <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>--> <!-- <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
</div> </div>

View File

@ -8,7 +8,7 @@
<div v-if="trialInfo" class="trial-wrapper"> <div v-if="trialInfo" class="trial-wrapper">
<div class="div-row"> <div class="div-row">
<div class="div-col"> <div class="div-col">
<label class="el-label">{{ $t('trials:trials-list:form:indication') }}</label> <label class="el-label">{{ $t('trials:trials-list:form:indication:') }}</label>
<span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span> <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
</div> </div>
<div class="div-col"> <div class="div-col">
@ -38,7 +38,7 @@
<span>{{ trialInfo.TotalReviewers }}</span> <span>{{ trialInfo.TotalReviewers }}</span>
</div> </div>
<div class="div-col"> <div class="div-col">
<label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}</label> <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
<span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span> <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
<!-- <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>--> <!-- <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
</div> </div>