a

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"
@@ -997,26 +997,14 @@
                              alt="" srcset="" v-else>
 
 
-<<<<<<< .mine
-                    <!--<span v-if="setAdminUserES(advices[0][0].advice_doctor) == ''">{{getAdminUser(advices[0][0].advice_doctor)}}</span>-->
-                    <!--<img class="es-img" :src="setAdminUserES(advices[0][0].advice_doctor)"-->
-                    <!--alt="" srcset="" v-else>-->
-=======
                         <!--<span v-if="setAdminUserES(advices[0][0].advice_doctor) == ''">{{getAdminUser(advices[0][0].advice_doctor)}}</span>-->
                         <!--<img class="es-img" :src="setAdminUserES(advices[0][0].advice_doctor)"-->
                         <!--alt="" srcset="" v-else>-->
->>>>>>> .theirs
 
 
-<<<<<<< .mine
-                    <!--<span v-if="setAdminUserES(advice[0].advice_doctor) == ''">{{getAdminUser(advice[0].advice_doctor)}}</span>-->
-                    <!--<img class="es-img" :src="setAdminUserES(advice[0].advice_doctor)"-->
-                    <!--alt="" srcset="" v-else>-->
-=======
                         <!--<span v-if="setAdminUserES(advice[0].advice_doctor) == ''">{{getAdminUser(advice[0].advice_doctor)}}</span>-->
                         <!--<img class="es-img" :src="setAdminUserES(advice[0].advice_doctor)"-->
                         <!--alt="" srcset="" v-else>-->
->>>>>>> .theirs
 
 
                         <!-- {{getXuserName(prescription.prescription_doctor)}} -->
@@ -1184,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"
@@ -1211,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"
@@ -1943,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(
@@ -2178,10 +2094,6 @@
             for (var i = 0; i < halfLen; i++) {
               leftAdvice.push(advices[i]);
               rightAdvice.push(advices[i + halfLen]);
-
-
-
-
             }
 
             if (halfLen < 5) {
@@ -2201,20 +2113,12 @@
               item.push(leftAdvice[i]);
               item.push(rightAdvice[i]);
               this.advices.push(item);
-
-
             }
           } else {
             this.$message.error("请求数据失败");
             return false;
           }
 
-
-
-
-
-
-
           this.jumpPrint()
         });
       },
@@ -2272,10 +2176,6 @@
           this.patientInfo_gender_1 = false;
         }
       },
-        })
-        this.loading = false
-        this.jumpPrint()
-      },
 
       "patientInfo.source": function() {
         if (this.patientInfo.source == 1) {
@@ -2284,39 +2184,11 @@
         } else if (this.patientInfo.source == 2) {
           this.patientInfo_source_2 = true;
           this.patientInfo_source_1 = false;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         } else {
           this.patientInfo_source_2 = false;
           this.patientInfo_source_1 = false;
         }
       }
-
-
-
-
-
-
-
-
-
-
-
-
     },
     created() {
       var xtuser = this.$store.getters.user;
@@ -2371,8 +2243,6 @@
 
 
   };
-
-
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
@@ -2381,12 +2251,10 @@
   margin: 0 auto;
   .order-yy-name {
   margin:10px auto 0 auto;
-
   text-align: center;
   font-size: 20px;
   }
   .order-title {
-
   margin: auto;
   font-weight: 600;
   text-align: center;
@@ -2424,14 +2292,6 @@
   }
 
   .dialysis-print-order .radio-lebel-box {
-
-
-
-
-
-
-
-
   font-weight: 400;
   cursor: pointer;
   }
@@ -2595,19 +2455,10 @@
   .iconfont {
   margin-left: 0.1rem;
   }
-<<<<<<< .mine
-  }
-  }
-
-
-
-
-=======
   }
   }
 
   .mainContent {
   margin: 0 0 0 1.58rem;
   }
->>>>>>> .theirs
-</style>
+</style>