部分问题修复
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2025-08-21 14:13:42 +08:00
parent 70b27f7545
commit 45ec78e824
4 changed files with 28 additions and 70 deletions

View File

@ -108,15 +108,15 @@
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system:hospital:group:State')" prop="isEnable"> <el-form-item :label="$t('system:hospital:group:State')" prop="IsEnable">
<el-switch v-model="from.isEnable" :active-value="false" :inactive-value="true" /> <el-switch v-model="from.IsEnable" :active-value="true" :inactive-value="false" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleCancel" size="small">{{ $t('common:button:cancel') }}</el-button> <el-button @click="handleCancel" size="small">{{ $t('common:button:cancel') }}</el-button>
<el-button type="primary" size="small" @click="handleSave" :loading="loading">{{ <el-button type="primary" size="small" @click="handleSave" :loading="loading">{{
$t('common:button:save') $t('common:button:save')
}}</el-button> }}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -155,7 +155,7 @@ export default {
ContactName: null, ContactName: null,
ContactPhone: null, ContactPhone: null,
Name: null, Name: null,
isEnable: true, IsEnable: true,
IdentityUserIdList: [] IdentityUserIdList: []
}, },
rules: { rules: {

View File

@ -60,12 +60,12 @@
min-width="120"> min-width="120">
</el-table-column> </el-table-column>
<!--课题组--> <!--课题组-->
<el-table-column prop="ViewHospitalGroupList" :label="$t('trials:inspection:table:ViewHospitalGroupList')" <el-table-column prop="HospitalGroupList" :label="$t('trials:inspection:table:ViewHospitalGroupList')"
show-overflow-tooltip min-width="100"> show-overflow-tooltip min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.ViewHospitalGroupList && scope.row.ViewHospitalGroupList.length > 0 ? scope.row.HospitalGroupList && scope.row.HospitalGroupList.length > 0 ?
scope.row.ViewHospitalGroupList.map(item => item.Name).join(', ') : ''}}</span> scope.row.HospitalGroupList.map(item => item.Name).join(', ') : ''}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!--序列数量--> <!--序列数量-->
@ -104,7 +104,7 @@
</el-form-item> </el-form-item>
<!-- 用户类型 --> <!-- 用户类型 -->
<el-form-item :label="$t('trials:externalStaff:table:hospitalGroupIdList')" prop="hospitalGroupIdList"> <el-form-item :label="$t('trials:externalStaff:table:hospitalGroupIdList')" prop="hospitalGroupIdList">
<el-select v-model="form.hospitalGroupIdList" style="width: 100%" multiple clearable> <el-select v-model="form.HospitalGroupIdList" style="width: 100%" multiple clearable>
<el-option v-for="item of hospitalGroupList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item of hospitalGroupList" :key="item.Id" :label="item.Name" :value="item.Id">
<!-- <span>{{ item.UserType }}</span> --> <!-- <span>{{ item.UserType }}</span> -->
</el-option> </el-option>
@ -197,12 +197,12 @@ export default {
} }
}, },
openGroup() { openGroup() {
this.form.hospitalGroupIdList = [] this.form.HospitalGroupIdList = []
this.getHospitalGroupList() this.getHospitalGroupList()
this.group_model.visible = true this.group_model.visible = true
}, },
handleCancelGroup() { handleCancelGroup() {
this.form.hospitalGroupIdList = [] this.form.HospitalGroupIdList = []
this.group_model.visible = false this.group_model.visible = false
}, },
async handleSaveGroup() { async handleSaveGroup() {

View File

@ -119,12 +119,12 @@
</template> </template>
</el-table-column> </el-table-column>
<!--课题组--> <!--课题组-->
<el-table-column prop="StudyHospitalGroupList" :label="$t('trials:trials-myinfo:form:StudyHospitalGroupList')" <el-table-column prop="ViewHospitalGroupList" :label="$t('trials:trials-myinfo:form:StudyHospitalGroupList')"
show-overflow-tooltip min-width="100"> show-overflow-tooltip min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.StudyHospitalGroupList && scope.row.StudyHospitalGroupList.length > 0 ? scope.row.ViewHospitalGroupList && scope.row.ViewHospitalGroupList.length > 0 ?
scope.row.StudyHospitalGroupList.map(item => item.Name).join(', '):'' }}</span> scope.row.ViewHospitalGroupList.join(', ') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- 检查数 --> <!-- 检查数 -->

View File

@ -5,77 +5,35 @@
<!-- 用户基本信息 --> <!-- 用户基本信息 -->
{{ $t("trials:trials-myinfo:title:basicInfo") }} {{ $t("trials:trials-myinfo:title:basicInfo") }}
</div> </div>
<el-form <el-form ref="userForm" label-position="right" :model="user" :rules="userFormRules" label-width="120px">
ref="userForm"
label-position="right"
:model="user"
:rules="userFormRules"
label-width="120px"
>
<el-form-item v-if="user.Code" label="ID: " prop="Code"> <el-form-item v-if="user.Code" label="ID: " prop="Code">
<el-input v-model="user.Code" disabled /> <el-input v-model="user.Code" disabled />
</el-form-item> </el-form-item>
<!-- --> <!-- -->
<el-form-item <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:surname')"
:disabled="user.UserTypeEnum === 8" prop="LastName">
:label="$t('trials:trials-myinfo:form:surname')" <el-input v-model="user.LastName" :placeholder="$t('trials:trials-myinfo:form:surname')" />
prop="LastName"
>
<el-input
v-model="user.LastName"
:placeholder="$t('trials:trials-myinfo:form:surname')"
/>
</el-form-item> </el-form-item>
<!-- --> <!-- -->
<el-form-item <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:givenname')"
:disabled="user.UserTypeEnum === 8" prop="FirstName">
:label="$t('trials:trials-myinfo:form:givenname')" <el-input v-model="user.FirstName" :placeholder="$t('trials:trials-myinfo:form:givenname')" />
prop="FirstName"
>
<el-input
v-model="user.FirstName"
:placeholder="$t('trials:trials-myinfo:form:givenname')"
/>
</el-form-item> </el-form-item>
<!-- 单位$t('trials:trials-myinfo:form:organization') --> <!-- 单位$t('trials:trials-myinfo:form:organization'):disabled="user.IsZhiZhun" -->
<el-form-item <el-form-item :label="$t('trials:trials-myinfo:form:organization')" prop="OrganizationName">
:label="$t('trials:trials-myinfo:form:organization')" <el-input v-model="user.OrganizationName" placeholder="" />
prop="OrganizationName"
>
<el-input
:disabled="user.IsZhiZhun"
v-model="user.OrganizationName"
placeholder=""
/>
</el-form-item> </el-form-item>
<!-- 部门 --> <!-- 部门 -->
<el-form-item <el-form-item :label="$t('trials:trials-myinfo:form:department')" prop="DepartmentName">
:label="$t('trials:trials-myinfo:form:department')" <el-input v-model="user.DepartmentName" :placeholder="$t('trials:trials-myinfo:form:organization')" />
prop="DepartmentName"
>
<el-input
v-model="user.DepartmentName"
:placeholder="$t('trials:trials-myinfo:form:organization')"
/>
</el-form-item> </el-form-item>
<!-- 职位 --> <!-- 职位 -->
<el-form-item <el-form-item :label="$t('trials:trials-myinfo:form:position')" prop="PositionName">
:label="$t('trials:trials-myinfo:form:position')" <el-input v-model="user.PositionName" :placeholder="$t('trials:trials-myinfo:form:position')" />
prop="PositionName"
>
<el-input
v-model="user.PositionName"
:placeholder="$t('trials:trials-myinfo:form:position')"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 保存 --> <!-- 保存 -->
<el-button <el-button class="trial-info-btn" type="primary" size="small" @click="handleSave">
class="trial-info-btn"
type="primary"
size="small"
@click="handleSave"
>
{{ $t("trials:trials-myinfo:button:save") }} {{ $t("trials:trials-myinfo:button:save") }}
</el-button> </el-button>
</div> </div>