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

src/xt_pages/qcd/patientControlAnalysis.vue

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

src/xt_pages/user/patients.vue

@@ -476,7 +476,7 @@
           ref="lapsetoForm"
           label-width="140px"
         >
-          <el-form-item label="治疗状态（转归）:" prop="lapseto_type" required>
+          <!-- <el-form-item label="治疗状态（转归）:" prop="lapseto_type" required>
             <el-radio-group v-model="lapsetoForm.lapseto_type">
               <el-radio
                 v-for="item in lapsetoOptions"
@@ -487,6 +487,9 @@
               </el-radio
               >
             </el-radio-group>
+          </el-form-item> -->
+          <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
+              <el-radio v-model="lapsetoForm.lapseto_type">{{lapeseto}}</el-radio>
           </el-form-item>
           <el-form-item label="转归时间 :" prop="lapseto_time" required>
             <el-date-picker
@@ -692,7 +695,8 @@
         phone: '',
         healthcareno: '',
         startTime: '',
-        export_date: []
+        export_date: [],
+        lapeseto:"",
       }
     },
     created() {
@@ -760,9 +764,6 @@
 
       },
       handleSuccess({ results, header }) {
-        console.log(results)
-        console.log(header)
-
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')
@@ -949,7 +950,7 @@
                       obj['diagnose'] = results[i][key]
                     }
                   }
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['透析号'] === undefined) {
                     obj['dialysis_no'] = ''
@@ -959,7 +960,7 @@
                     }
                   }
 
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['干体重(kg)'] === undefined) {
                     obj['dry_weight'] = ''
@@ -969,7 +970,7 @@
                     }
                   }
 
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['身高(cm)'] === undefined) {
                     obj['height'] = ''
@@ -979,7 +980,7 @@
                     }
                   }
 
-                  console.log(obj)
+                  // console.log(obj)
 
                   if (results[i]['家庭住址'] === undefined) {
                     obj['home_address'] = ''
@@ -998,12 +999,12 @@
               for (let i = 0; i < this.export_date.length; i++) {
                 if (this.export_date[i].dialysis_no == '') {
                   let new_dialysis_no = this.max_dialysis_no + index
-                  console.log(new_dialysis_no)
+                  // console.log(new_dialysis_no)
                   index++
                   let no = new_dialysis_no.toString()
-                  console.log(no)
+                  // console.log(no)
                   let rep = 3 - no.length
-                  console.log(rep)
+                  // console.log(rep)
                   let tempNo = ""
                   if (rep == 1){
                     tempNo = "0"
@@ -1014,7 +1015,7 @@
                   }
 
 
-                  console.log(tempNo)
+                  // console.log(tempNo)
                   if (rep > 0) {
                     no = tempNo + no
                   }
@@ -1023,7 +1024,7 @@
               }
 
 
-              console.log(this.export_date)
+              // console.log(this.export_date)
 
               var tempExportDate = this.export_date
               var tempExportDateOne = this.export_date
@@ -1131,6 +1132,12 @@
         )
       },
       OpenSetLapseto(row, index) {
+        if(row.lapseto == 1){
+          this.lapeseto = "转出"
+        }
+        if(row.lapseto == 2){
+          this.lapeseto = "留治"
+        }
         this.patient = row
         this.currentIndex = index
         this.lapsetoForm.lapseto_time = ''
@@ -1154,9 +1161,9 @@
         this.bindWechatDialog = true
       },
       handleCheckAllChange(val) {
-        console.log(val)
-        console.log(this.checkAll)
-        console.log(this.isIndeterminate)
+        // console.log(val)
+        // console.log(this.checkAll)
+        // console.log(this.isIndeterminate)
       },
       handleSelectionChange(val) {
         this.multipleSelection = val
@@ -1239,7 +1246,7 @@
             return false
           } else {
             this.tableData = response.data.data.patients
-             console.log('病人是', this.tableData)
+            //  console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           }
@@ -1256,7 +1263,7 @@
             return false
           } else {
             var patient = response.data.data.patient
-            console.log('二维码病人信息', patient)
+            // console.log('二维码病人信息', patient)
             this.id = patient.id
             this.name = patient.name
             this.gender = patient.gender