Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13713"
+  "version": "2999.999.13718"
 }

src/pages/main/beforeDialysis/components/allSummary.vue

@@ -161,6 +161,8 @@ export default {
       })
     },
     getMobileList (val) {
+      this.page = 1
+      this.limit = 500
       const params = {
         start_time: this.selected_date_str,
         scheduleType: this.schedual_type_selected,

src/pages/main/beforeDialysis/components/dialysisParameters.vue

@@ -189,7 +189,7 @@ export default {
       tableHeight: '',
       tableData: [],
       search_input: '',
-      limit: 10,
+      limit: 500,
       page: 1,
       prescriptionList: [],
       dialysisBefor: [],
@@ -222,6 +222,9 @@ export default {
     },
     // 获取透析参数统计表
     getlist (val) {
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhh",val)
+      this.limit = 500
+      this.page =1
       const params = {
         start_time: this.selected_date_str,
         keyword: this.search_input,
@@ -231,6 +234,7 @@ export default {
         page: this.page,
         keyword: val || ''
       }
+      console.log("params==================",params)
       getMobileDialysisParameters(params).then(response => {
         if (response.data.state == 1) {
           var schedule =  response.data.data.schedule

src/pages/main/today/TodayTab.vue

@@ -1678,7 +1678,7 @@ export default {
           if(this.$store.getters.user.template_info.org_id == 10721){
             this.is_project_open = 2
           }
-
+             
           if (this.project != null && this.is_project_open == 1) {
             this.project.map(item => {
               let obj = {
@@ -1701,6 +1701,7 @@ export default {
               }
               let advice = []
               advice.push(obj)
+              console.log("avice==================================",advice)
               let advices = {
                 advices: advice,
                 group_no: 0