Browse Source

Merge branch 'vue_statistics_branch' of http://git.shengws.com/csx/Vue_New into vue_statistics_branch

csx 4 years ago
parent
commit
2c16534dac
2 changed files with 27 additions and 20 deletions
  1. 1 1
      src/xt_pages/qcd/patientControlAnalysis.vue
  2. 26 19
      src/xt_pages/user/patients.vue

+ 1 - 1
src/xt_pages/qcd/patientControlAnalysis.vue View File

592
        getCartogramlist(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
592
        getCartogramlist(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
593
            if(response.data.state == 1){
593
            if(response.data.state == 1){
594
               var cartogramlist =  response.data.data.cartogramlist
594
               var cartogramlist =  response.data.data.cartogramlist
595
-              console.log("cartogramlist",cartogramlist)
595
+              // console.log("cartogramlist",cartogramlist)
596
               var totaltwo =  response.data.data.total
596
               var totaltwo =  response.data.data.total
597
                var cart = []
597
                var cart = []
598
                for(let i=0;i<cartogramlist.length;i++){
598
                for(let i=0;i<cartogramlist.length;i++){

+ 26 - 19
src/xt_pages/user/patients.vue View File

476
           ref="lapsetoForm"
476
           ref="lapsetoForm"
477
           label-width="140px"
477
           label-width="140px"
478
         >
478
         >
479
-          <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
479
+          <!-- <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
480
             <el-radio-group v-model="lapsetoForm.lapseto_type">
480
             <el-radio-group v-model="lapsetoForm.lapseto_type">
481
               <el-radio
481
               <el-radio
482
                 v-for="item in lapsetoOptions"
482
                 v-for="item in lapsetoOptions"
487
               </el-radio
487
               </el-radio
488
               >
488
               >
489
             </el-radio-group>
489
             </el-radio-group>
490
+          </el-form-item> -->
491
+          <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
492
+              <el-radio v-model="lapsetoForm.lapseto_type">{{lapeseto}}</el-radio>
490
           </el-form-item>
493
           </el-form-item>
491
           <el-form-item label="转归时间 :" prop="lapseto_time" required>
494
           <el-form-item label="转归时间 :" prop="lapseto_time" required>
492
             <el-date-picker
495
             <el-date-picker
692
         phone: '',
695
         phone: '',
693
         healthcareno: '',
696
         healthcareno: '',
694
         startTime: '',
697
         startTime: '',
695
-        export_date: []
698
+        export_date: [],
699
+        lapeseto:"",
696
       }
700
       }
697
     },
701
     },
698
     created() {
702
     created() {
760
 
764
 
761
       },
765
       },
762
       handleSuccess({ results, header }) {
766
       handleSuccess({ results, header }) {
763
-        console.log(results)
764
-        console.log(header)
765
-
766
         if (header != undefined && header.length > 0) {
767
         if (header != undefined && header.length > 0) {
767
           var isHasName = header.includes('*姓名')
768
           var isHasName = header.includes('*姓名')
768
           var isHasGender = header.includes('*性别')
769
           var isHasGender = header.includes('*性别')
949
                       obj['diagnose'] = results[i][key]
950
                       obj['diagnose'] = results[i][key]
950
                     }
951
                     }
951
                   }
952
                   }
952
-                  console.log(obj)
953
+                  // console.log(obj)
953
 
954
 
954
                   if (results[i]['透析号'] === undefined) {
955
                   if (results[i]['透析号'] === undefined) {
955
                     obj['dialysis_no'] = ''
956
                     obj['dialysis_no'] = ''
959
                     }
960
                     }
960
                   }
961
                   }
961
 
962
 
962
-                  console.log(obj)
963
+                  // console.log(obj)
963
 
964
 
964
                   if (results[i]['干体重(kg)'] === undefined) {
965
                   if (results[i]['干体重(kg)'] === undefined) {
965
                     obj['dry_weight'] = ''
966
                     obj['dry_weight'] = ''
969
                     }
970
                     }
970
                   }
971
                   }
971
 
972
 
972
-                  console.log(obj)
973
+                  // console.log(obj)
973
 
974
 
974
                   if (results[i]['身高(cm)'] === undefined) {
975
                   if (results[i]['身高(cm)'] === undefined) {
975
                     obj['height'] = ''
976
                     obj['height'] = ''
979
                     }
980
                     }
980
                   }
981
                   }
981
 
982
 
982
-                  console.log(obj)
983
+                  // console.log(obj)
983
 
984
 
984
                   if (results[i]['家庭住址'] === undefined) {
985
                   if (results[i]['家庭住址'] === undefined) {
985
                     obj['home_address'] = ''
986
                     obj['home_address'] = ''
998
               for (let i = 0; i < this.export_date.length; i++) {
999
               for (let i = 0; i < this.export_date.length; i++) {
999
                 if (this.export_date[i].dialysis_no == '') {
1000
                 if (this.export_date[i].dialysis_no == '') {
1000
                   let new_dialysis_no = this.max_dialysis_no + index
1001
                   let new_dialysis_no = this.max_dialysis_no + index
1001
-                  console.log(new_dialysis_no)
1002
+                  // console.log(new_dialysis_no)
1002
                   index++
1003
                   index++
1003
                   let no = new_dialysis_no.toString()
1004
                   let no = new_dialysis_no.toString()
1004
-                  console.log(no)
1005
+                  // console.log(no)
1005
                   let rep = 3 - no.length
1006
                   let rep = 3 - no.length
1006
-                  console.log(rep)
1007
+                  // console.log(rep)
1007
                   let tempNo = ""
1008
                   let tempNo = ""
1008
                   if (rep == 1){
1009
                   if (rep == 1){
1009
                     tempNo = "0"
1010
                     tempNo = "0"
1014
                   }
1015
                   }
1015
 
1016
 
1016
 
1017
 
1017
-                  console.log(tempNo)
1018
+                  // console.log(tempNo)
1018
                   if (rep > 0) {
1019
                   if (rep > 0) {
1019
                     no = tempNo + no
1020
                     no = tempNo + no
1020
                   }
1021
                   }
1023
               }
1024
               }
1024
 
1025
 
1025
 
1026
 
1026
-              console.log(this.export_date)
1027
+              // console.log(this.export_date)
1027
 
1028
 
1028
               var tempExportDate = this.export_date
1029
               var tempExportDate = this.export_date
1029
               var tempExportDateOne = this.export_date
1030
               var tempExportDateOne = this.export_date
1131
         )
1132
         )
1132
       },
1133
       },
1133
       OpenSetLapseto(row, index) {
1134
       OpenSetLapseto(row, index) {
1135
+        if(row.lapseto == 1){
1136
+          this.lapeseto = "转出"
1137
+        }
1138
+        if(row.lapseto == 2){
1139
+          this.lapeseto = "留治"
1140
+        }
1134
         this.patient = row
1141
         this.patient = row
1135
         this.currentIndex = index
1142
         this.currentIndex = index
1136
         this.lapsetoForm.lapseto_time = ''
1143
         this.lapsetoForm.lapseto_time = ''
1154
         this.bindWechatDialog = true
1161
         this.bindWechatDialog = true
1155
       },
1162
       },
1156
       handleCheckAllChange(val) {
1163
       handleCheckAllChange(val) {
1157
-        console.log(val)
1158
-        console.log(this.checkAll)
1159
-        console.log(this.isIndeterminate)
1164
+        // console.log(val)
1165
+        // console.log(this.checkAll)
1166
+        // console.log(this.isIndeterminate)
1160
       },
1167
       },
1161
       handleSelectionChange(val) {
1168
       handleSelectionChange(val) {
1162
         this.multipleSelection = val
1169
         this.multipleSelection = val
1239
             return false
1246
             return false
1240
           } else {
1247
           } else {
1241
             this.tableData = response.data.data.patients
1248
             this.tableData = response.data.data.patients
1242
-             console.log('病人是', this.tableData)
1249
+            //  console.log('病人是', this.tableData)
1243
             this.pageTotal = this.tableData.length
1250
             this.pageTotal = this.tableData.length
1244
             this.total = response.data.data.total
1251
             this.total = response.data.data.total
1245
           }
1252
           }
1256
             return false
1263
             return false
1257
           } else {
1264
           } else {
1258
             var patient = response.data.data.patient
1265
             var patient = response.data.data.patient
1259
-            console.log('二维码病人信息', patient)
1266
+            // console.log('二维码病人信息', patient)
1260
             this.id = patient.id
1267
             this.id = patient.id
1261
             this.name = patient.name
1268
             this.name = patient.name
1262
             this.gender = patient.gender
1269
             this.gender = patient.gender