Browse Source

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

yq1 1 month ago
parent
commit
6b5c7e3f56

+ 1 - 1
build/cdn.json View File

1
 {
1
 {
2
-  "version": "2999.999.13713"
2
+  "version": "2999.999.13718"
3
 }
3
 }

+ 2 - 0
src/pages/main/beforeDialysis/components/allSummary.vue View File

161
       })
161
       })
162
     },
162
     },
163
     getMobileList (val) {
163
     getMobileList (val) {
164
+      this.page = 1
165
+      this.limit = 500
164
       const params = {
166
       const params = {
165
         start_time: this.selected_date_str,
167
         start_time: this.selected_date_str,
166
         scheduleType: this.schedual_type_selected,
168
         scheduleType: this.schedual_type_selected,

+ 5 - 1
src/pages/main/beforeDialysis/components/dialysisParameters.vue View File

189
       tableHeight: '',
189
       tableHeight: '',
190
       tableData: [],
190
       tableData: [],
191
       search_input: '',
191
       search_input: '',
192
-      limit: 10,
192
+      limit: 500,
193
       page: 1,
193
       page: 1,
194
       prescriptionList: [],
194
       prescriptionList: [],
195
       dialysisBefor: [],
195
       dialysisBefor: [],
222
     },
222
     },
223
     // 获取透析参数统计表
223
     // 获取透析参数统计表
224
     getlist (val) {
224
     getlist (val) {
225
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhh",val)
226
+      this.limit = 500
227
+      this.page =1
225
       const params = {
228
       const params = {
226
         start_time: this.selected_date_str,
229
         start_time: this.selected_date_str,
227
         keyword: this.search_input,
230
         keyword: this.search_input,
231
         page: this.page,
234
         page: this.page,
232
         keyword: val || ''
235
         keyword: val || ''
233
       }
236
       }
237
+      console.log("params==================",params)
234
       getMobileDialysisParameters(params).then(response => {
238
       getMobileDialysisParameters(params).then(response => {
235
         if (response.data.state == 1) {
239
         if (response.data.state == 1) {
236
           var schedule =  response.data.data.schedule
240
           var schedule =  response.data.data.schedule

+ 2 - 1
src/pages/main/today/TodayTab.vue View File

1678
           if(this.$store.getters.user.template_info.org_id == 10721){
1678
           if(this.$store.getters.user.template_info.org_id == 10721){
1679
             this.is_project_open = 2
1679
             this.is_project_open = 2
1680
           }
1680
           }
1681
-
1681
+             
1682
           if (this.project != null && this.is_project_open == 1) {
1682
           if (this.project != null && this.is_project_open == 1) {
1683
             this.project.map(item => {
1683
             this.project.map(item => {
1684
               let obj = {
1684
               let obj = {
1701
               }
1701
               }
1702
               let advice = []
1702
               let advice = []
1703
               advice.push(obj)
1703
               advice.push(obj)
1704
+              console.log("avice==================================",advice)
1704
               let advices = {
1705
               let advices = {
1705
                 advices: advice,
1706
                 advices: advice,
1706
                 group_no: 0
1707
                 group_no: 0