Merge remote-tracking branch 'origin/jihan_0203_护理站管理端功能开发' into jihan_0203_护理站管理端功能开发

# Conflicts:
#	src/views/system/stationItem/index.vue
This commit is contained in:
曹辉 2023-02-21 16:46:59 +08:00
commit 1c93de85bb

View File

@ -151,7 +151,6 @@
<el-form-item label="所属护理站" required> <el-form-item label="所属护理站" required>
<template> <template>
<el-button <el-button
type
@click="nurseStationshow = true" @click="nurseStationshow = true"
style=" style="
width: 208px; width: 208px;
@ -165,7 +164,6 @@
" "
>{{ form.nurseStationItem.nurseStationName }}</el-button> >{{ form.nurseStationItem.nurseStationName }}</el-button>
<el-button <el-button
type
@click="nurseStationshow = true" @click="nurseStationshow = true"
v-else v-else
style=" style="
@ -179,11 +177,9 @@
>{{ form.nurseStationItem.nurseStationName }}</el-button> >{{ form.nurseStationItem.nurseStationName }}</el-button>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="护理项目分类" required> <el-form-item label="护理项目分类" required>
<template> <template>
<el-button <el-button
type
style=" style="
width: 208px; width: 208px;
text-align: left; text-align: left;
@ -197,7 +193,6 @@
v-if="form.nurseStationItem.classifyName == '请选择护理项目分类'" v-if="form.nurseStationItem.classifyName == '请选择护理项目分类'"
>{{ form.nurseStationItem.classifyName }}</el-button> >{{ form.nurseStationItem.classifyName }}</el-button>
<el-button <el-button
type
style=" style="
width: 208px; width: 208px;
text-align: left; text-align: left;