XMLWAN 3 лет назад
Родитель
Сommit
991d3e7180

+ 2 - 1
src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue Просмотреть файл

469
          this.DialysisData[i].index = i+1
469
          this.DialysisData[i].index = i+1
470
          this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
470
          this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
471
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
471
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
472
+         this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
472
        }
473
        }
473
        import('@/vendor/Export2Excel').then(excel => {
474
        import('@/vendor/Export2Excel').then(excel => {
474
         const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
475
         const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
475
-        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_dialysis']
476
+        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_count']
476
         
477
         
477
         const data = this.formatJson(filterVal, this.DialysisData)
478
         const data = this.formatJson(filterVal, this.DialysisData)
478
        
479
        

+ 1 - 1
src/xt_pages/stock/drugs/inventoryPrint.vue Просмотреть файл

103
         var name = ""
103
         var name = ""
104
         for(let i=0;i<this.manufacturerList.length;i++){
104
         for(let i=0;i<this.manufacturerList.length;i++){
105
           if(id == this.manufacturerList[i].id){
105
           if(id == this.manufacturerList[i].id){
106
-             name = this.manufacturerList[i].name
106
+             name = this.manufacturerList[i].manufacturer_name
107
           }
107
           }
108
           return name
108
           return name
109
         }
109
         }

+ 1 - 0
src/xt_pages/user/patients.vue Просмотреть файл

1336
         return new Date(time).getTime() / 1000
1336
         return new Date(time).getTime() / 1000
1337
       },
1337
       },
1338
       search() {
1338
       search() {
1339
+        this.listQuery.limit = 700
1339
         this.listQuery.keywords = this.searchKey
1340
         this.listQuery.keywords = this.searchKey
1340
         this.getList()
1341
         this.getList()
1341
       },
1342
       },