Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

config/prod.env.js

@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.kuyicloud.com"'
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

src/pages/main/Print.vue

@@ -643,7 +643,7 @@
                         <label for="PredialysisEvaluation_catheter_bend_6" class="radio-lebel-box">
                                                         <span class="radio-inner">
                                                             <span class="radio-fang"
-                                                                  :class="{'is-checked-radio':predialysis.catheter_bend == 2?true:false}"></span>
+                                                                  :class="{'is-checked-radio':predialysis.catheter_bend!=1?true:false}"></span>
                                                             <input vt-model="predialysis.catheter_bend"
                                                                    id="PredialysisEvaluation_catheter_bend_6"
                                                                    name="catheter_bend" type="radio" class="radio-no"
@@ -1172,7 +1172,7 @@
                       <label for="afterdialysis_puncture_point_oozing_blood_2" class="radio-lebel-box">
                                                     <span class="radio-inner">
                                                         <span class="radio-fang"
-                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_oozing_blood == 2?true:false}"></span>
+                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_oozing_blood!=1?true:false}"></span>
                                                         <input vt-model="afterdialysis.puncture_point_oozing_blood"
                                                                id="afterdialysis_puncture_point_oozing_blood_2"
                                                                name="afterdialysis_puncture_point_oozing_blood"
@@ -1199,7 +1199,7 @@
                       <label for="afterdialysis_puncture_point_haematoma_2" class="radio-lebel-box">
                                                     <span class="radio-inner">
                                                         <span class="radio-fang"
-                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_haematoma == 2?true:false}"></span>
+                                                              :class="{'is-checked-radio':afterdialysis.puncture_point_haematoma!=1?true:false}"></span>
                                                         <input vt-model="afterdialysis.puncture_point_haematoma"
                                                                id="afterdialysis_puncture_point_haematoma_2"
                                                                name="afterdialysis_puncture_point_haematoma"
@@ -1931,78 +1931,6 @@
             } else {
               this.patientInfo.first_dialysis_date = "";
             }
-        }
-      },
-      getTime (value, temp) {
-        if (value != undefined) {
-          return uParseTime(value, temp)
-        }
-        return ''
-      },
-      getXuserName (id) {
-        if (id <= 0) {
-          return ''
-        }
-        var name = ''
-        if (this.users == null || typeof this.users.length == 'undefined') {
-          return name
-        }
-        var leng = this.users.length
-        if (leng == 0) {
-          return name
-        }
-        for (let index = 0; index < leng; index++) {
-          if (this.users[index].id == id) {
-            name = this.users[index].name
-            break
-          }
-        }
-        return name
-      },
-      setAdminUserES (id) {
-        if (id == 0) {
-          return ''
-        }
-        if (id in this.operatorMaps) {
-          return this.operatorMaps[id].url
-        }
-        return ''
-      },
-      modeName (mode_id) {
-        return typeof this.modeOptions[mode_id] != 'undefined' &&
-        typeof this.modeOptions[mode_id].name != 'undefined'
-          ? this.modeOptions[mode_id].name
-          : ''
-      },
-      getNumber () {
-        if (this.dialysisOrder != null) {
-          return (
-            this.patientInfo.DialysisSchedule.device_zone.name +
-            this.dialysisOrder.DeviceNumber.number
-          )
-        } else {
-          return this.patientInfo.DialysisSchedule.device_zone.name
-        }
-      },
-      getDialysisRecord () {
-        getPrintDialysisRecord(this.queryParams).then(response => {
-          if (response.data.state == 1) {
-            this.adminUser = response.data.data.users
-            this.users = response.data.data.users
-            this.patientInfo = response.data.data.patientInfo
-            this.patientInfo.birth = uParseTime(
-              this.patientInfo.birthday,
-              '{y}-{m}-{d}'
-            )
-            this.patientInfo.age = jsGetAge(this.patientInfo.birth, '-')
-            if (response.data.data.patientInfo.first_dialysis_date != 0) {
-              this.patientInfo.first_dialysis_date = uParseTime(
-                response.data.data.patientInfo.first_dialysis_date,
-                '{y}-{m}-{d}'
-              )
-            } else {
-              this.patientInfo.first_dialysis_date = ''
-            }
 
             this.predialysis = response.data.data.PredialysisEvaluation;
             this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
@@ -2190,6 +2118,11 @@
             this.$message.error("请求数据失败");
             return false;
           }
+<<<<<<< .mine
+
+=======
+
+>>>>>>> .theirs
           this.jumpPrint()
         });
       },
@@ -2246,10 +2179,6 @@
           this.patientInfo_gender_2 = false;
           this.patientInfo_gender_1 = false;
         }
-      },
-        })
-        this.loading = false
-        this.jumpPrint()
       },
       "patientInfo.source": function() {
         if (this.patientInfo.source == 1) {
@@ -2315,8 +2244,6 @@
       SideBar
     }
   };
-
-
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
@@ -2325,16 +2252,23 @@
   margin: 0 auto;
   .order-yy-name {
     margin: 10px auto 0 auto;
-
     text-align: center;
     font-size: 20px;
   }
   .order-title {
+<<<<<<< .mine
     margin: auto;
     font-weight: 600;
     text-align: center;
     font-size: 22px;
     padding: 10px 20px 20px 20px;
+=======
+  margin: auto;
+  font-weight: 600;
+  text-align: center;
+  font-size: 22px;
+  padding: 10px 20px 20px 20px;
+>>>>>>> .theirs
   }
   .table-box {
     width: 100%;
@@ -2366,7 +2300,11 @@
   }
 }
 
+<<<<<<< .mine
 .dialysis-print-order .radio-lebel-box {
+=======
+  .dialysis-print-order .radio-lebel-box {
+>>>>>>> .theirs
   font-weight: 400;
   cursor: pointer;
 }
@@ -2531,9 +2469,24 @@ body {
       margin-left: 0.1rem;
     }
   }
+<<<<<<< .mine
 }
 
+=======
+  }
+  }
+>>>>>>> .theirs
+
+<<<<<<< .mine
 .mainContent {
+=======
+  .mainContent {
+>>>>>>> .theirs
   margin: 0 0 0 1.58rem;
+<<<<<<< .mine
 }
 </style>
+=======
+  }
+</style>
+>>>>>>> .theirs