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

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

@@ -704,8 +704,11 @@
             </td>
             <td >&nbsp;{{ monitor.temperature ? monitor.temperature : '' }}</td>
             <td>
-              &nbsp;{{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
+              &nbsp;
+              <span v-if='monitor.operate_time'>
+              {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+              </span>
             </td>
             <td>
               &nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
@@ -950,7 +953,7 @@
         <div style="display:flex;align-items:center;">
           <span>医生:</span>
           <span style="width:100px;display: inline-block;" class="under-line">&nbsp;
-             <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
+             <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
                         <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
           </span>
         </div>

src/xt_pages/user/components/PatientForm.vue

@@ -1387,7 +1387,6 @@ export default {
       if (!this.formSubmit) {
         return false;
       }
-
       this.form.user_sys_before_count =  this.form.user_sys_before_count.toString()
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -1400,7 +1399,7 @@ export default {
             }else{
               this.form.avatar = this.form.avatar + "?imageView2/2/w/500/h/500/q/90"
             }
-            console.log("form",this.form)
+            console.log("form---",this.form)
             editPatient(this.patientID, this.form)
 
               .then(response => {