Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/healthManager/healthRecord/index.vue

@@ -25,7 +25,7 @@
           <li>
             <el-input
               placeholder="请输入用户名"
-              v-model="userName"
+              v-model="name"
             >
             </el-input>
           </li>
@@ -91,7 +91,7 @@ export default {
   data () {
     return {
       total: 0,
-      userName: '',
+      name: '',
       mobile: '',
       postData: { // 表格搜索条件
         caseid: '',
@@ -134,7 +134,7 @@ export default {
       return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
     },
     getList () { // 获取列表
-      this.getHealthList({ ...this.postData, caseid: this.CaseId, phone: this.mobile, customerName: this.userName }).then((res) => {
+      this.getHealthList({ ...this.postData, caseid: this.CaseId, phone: this.mobile, name: this.name }).then((res) => {
         this.currentList = this.list.list
         this.postData.page = this.list.page
         this.total = this.list.pagenum