Merge branch 'huli0422' into test

src/components/cdssManage/nursing/nursing.vue

@@ -15,10 +15,10 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="医院护理类型：">
+          <el-form-item label="医院护理名称：">
             <el-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
           </el-form-item>
-          <el-form-item label="标准护理类型：">
+          <el-form-item label="标准护理名称：">
             <el-input size="mini" v-model="filter.uniqueName" placeholder="请输入" clearable></el-input>
           </el-form-item>
           <el-form-item class="dododo">
@@ -335,7 +335,7 @@ export default {
 
     // 导出数据
     exportData() {
-      this.$alert('确定要导出全部输血关联数据吗？', '', {
+      this.$alert('确定要导出全部护理关联数据吗？', '', {
         confirmButtonText: '确定',
         // cancelButtonText: '取消',
         // cancelButtonClass: 'leftbtn',