Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen
This commit is contained in:
		
						commit
						339d418b63
					
				| 
						 | 
					@ -192,12 +192,12 @@
 | 
				
			||||||
                      </td>
 | 
					                      </td>
 | 
				
			||||||
                      <td  class="table-label"><span >慢性病</span></td>
 | 
					                      <td  class="table-label"><span >慢性病</span></td>
 | 
				
			||||||
                      <td  class="table-content">
 | 
					                      <td  class="table-content">
 | 
				
			||||||
                        <el-select v-model="form.chronicList" placeholder="请选择慢性病" style="width: 100%" multiple clearable collapse-tags>
 | 
					                        <el-select v-model="form.chronicList" placeholder="请选择慢性病"  multiple style="width: 100%" clearable collapse-tags>
 | 
				
			||||||
                          <el-option v-for="item in this.chronicOptions"
 | 
					                            <el-option v-for="item in chronicOptions"
 | 
				
			||||||
                              :key="item.chronicId"
 | 
					                                :key="item.chronicId"
 | 
				
			||||||
                              :label="item.chronicName"
 | 
					                                :label="item.chronicName"
 | 
				
			||||||
                              :value="item.chronicId"
 | 
					                                :value="item.chronicId"
 | 
				
			||||||
                          ></el-option>
 | 
					                            ></el-option>
 | 
				
			||||||
                        </el-select>
 | 
					                        </el-select>
 | 
				
			||||||
                      </td>
 | 
					                      </td>
 | 
				
			||||||
                    </tr>
 | 
					                    </tr>
 | 
				
			||||||
| 
						 | 
					@ -455,8 +455,9 @@ export default {
 | 
				
			||||||
            this.queryParams = {
 | 
					            this.queryParams = {
 | 
				
			||||||
                pageNum: 1,
 | 
					                pageNum: 1,
 | 
				
			||||||
                pageSize: 10,
 | 
					                pageSize: 10,
 | 
				
			||||||
                articleTitle: undefined,//标题
 | 
					                articleTitle: "",//标题
 | 
				
			||||||
                chronicList:[],  //慢性病
 | 
					                chronicList:[],  //慢性病
 | 
				
			||||||
 | 
					                placeIdList:[], //位置
 | 
				
			||||||
                doctorAdvice:[],
 | 
					                doctorAdvice:[],
 | 
				
			||||||
                articleType:null //类型
 | 
					                articleType:null //类型
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
| 
						 | 
					@ -470,6 +471,7 @@ export default {
 | 
				
			||||||
                "pageNum":this.queryParams.pageNum,
 | 
					                "pageNum":this.queryParams.pageNum,
 | 
				
			||||||
                "pageSize":this.queryParams.pageSize,
 | 
					                "pageSize":this.queryParams.pageSize,
 | 
				
			||||||
                "articleTitle":this.queryParams.articleTitle,
 | 
					                "articleTitle":this.queryParams.articleTitle,
 | 
				
			||||||
 | 
					                "deptIds":this.queryParams.deptIdList.join(",")||"",
 | 
				
			||||||
                "doctorAdvices":this.queryParams.doctorAdvice.join(",")||"",
 | 
					                "doctorAdvices":this.queryParams.doctorAdvice.join(",")||"",
 | 
				
			||||||
                "chronicIds":this.queryParams.chronicList.join(",")||""
 | 
					                "chronicIds":this.queryParams.chronicList.join(",")||""
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
| 
						 | 
					@ -478,6 +480,7 @@ export default {
 | 
				
			||||||
            // }else{
 | 
					            // }else{
 | 
				
			||||||
            //     this.queryParams.chronicIds = ""
 | 
					            //     this.queryParams.chronicIds = ""
 | 
				
			||||||
            // }
 | 
					            // }
 | 
				
			||||||
 | 
					            console.log("param",param);
 | 
				
			||||||
            getHealthInfoPageApi(param).then(response => {
 | 
					            getHealthInfoPageApi(param).then(response => {
 | 
				
			||||||
                this.tableListData = response.rows;
 | 
					                this.tableListData = response.rows;
 | 
				
			||||||
                console.log("this.tableListData",this.tableListData);
 | 
					                console.log("this.tableListData",this.tableListData);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue