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

# Conflicts:
#	src/views/system/stationItem/index.vue

src/views/system/stationItem/index.vue

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