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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.317"
+  "version": "1.0.318"
 }

src/pages/main/dialog/AssessmentDialog.vue

@@ -469,7 +469,7 @@
   export default {
     name: 'PrescriptionDialog',
     props: {
-      dry_weight:{
+      dry_weight: {
         type: Object,
 
       },
@@ -481,15 +481,15 @@
       },
       last_predialysis: {
         type: Object,
-      },  admin_users_prop: {
+      }, admin_users_prop: {
         type: Array
       },
     },
-    data () {
+    data() {
       return {
-        propDryForm:{
-          weight:0,
-          doctor:[],
+        propDryForm: {
+          weight: 0,
+          doctor: [],
         },
         isShowDialog: true,
         //sub menu prop
@@ -506,13 +506,13 @@
           isHasOther: 1 //是否有其他选项  1是 2否
         },
         hemorrhage_state: false,
-        infect_state:false,
-        hemorrhages:[
+        infect_state: false,
+        hemorrhages: [
           {id: 1, name: "有"},
           {id: 2, name: "无"},
         ],
 
-        infects:[
+        infects: [
           {id: 1, name: "无"},
           {id: 2, name: "有"},
         ],
@@ -520,7 +520,7 @@
         formValue: {
           weight_before: '',
           dry_weight: '',
-          additional_weight :'',
+          additional_weight: '',
           temperature: '',
           systolic_blood_pressure: '',
           diastolic_blood_pressure: '',
@@ -550,15 +550,15 @@
           blood_access_noise: '',
           internal_fistula_other: '',
           blood_access_internal_fistula: '',
-          machine_type:'',
-          breathing_rate:'',
-          is_infect:0,
-          exposed:'',
-          skin:'',
-          skin_other:'',
-          infect_other:'',
-          ductus_arantii_other:'',
-          puncture_needle:'',
+          machine_type: '',
+          breathing_rate: '',
+          is_infect: 0,
+          exposed: '',
+          skin: '',
+          skin_other: '',
+          infect_other: '',
+          ductus_arantii_other: '',
+          puncture_needle: '',
 
         },
 
@@ -567,16 +567,16 @@
       }
     },
     methods: {
-      menuDryComfirm(val){
+      menuDryComfirm(val) {
         this.isShowDialog = true
         this.$refs.dry.close()
         this.formValue.dry_weight = val.dry_weight
         this.propDryForm.weight = val.dry_weight
         this.dry_weight = val
-        this.$emit("weight_update",this.dry_weight);
+        this.$emit("weight_update", this.dry_weight);
 
       },
-      menuDryCancle(){
+      menuDryCancle() {
         this.isShowDialog = true
         this.$refs.dry.close()
 
@@ -584,11 +584,11 @@
 
 
       },
-      isShow(name){
+      isShow(name) {
         var filedList = this.$store.getters.user.fileds
 
-        for (let i = 0; i < filedList.length; i++){
-          if(filedList[i].module == 3 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
             return true
           }
         }
@@ -661,7 +661,7 @@
         }
         return emergencyTreatmentName
 
-      },getSkin:function(id){
+      }, getSkin: function (id) {
         if (id == -1) {
           return '其他'
         }
@@ -1224,23 +1224,23 @@
             this.formValue.puncture_way = val.selectId
             break
           case 19:
-            if( val.selectId == 1){
+            if (val.selectId == 1) {
               this.hemorrhage_state = true
               this.formValue.is_hemorrhage = val.selectId
-            }else if(val.selectId == 2){
+            } else if (val.selectId == 2) {
               this.hemorrhage_state = false
               this.formValue.is_hemorrhage = val.selectId
-            }else if(this.formValue.is_hemorrhage == -2){
+            } else if (this.formValue.is_hemorrhage == -2) {
             }
             break
           case 20:
-            if( val.selectId == 1){
+            if (val.selectId == 1) {
               this.infect_state = true
               this.formValue.is_infect = val.selectId.toString()
-            }else if(val.selectId == 2){
+            } else if (val.selectId == 2) {
               this.infect_state = false
               this.formValue.is_infect = val.selectId.toString()
-            }else if(this.formValue.is_infect == -2){
+            } else if (this.formValue.is_infect == -2) {
             }
             break
           case 21:
@@ -1288,9 +1288,9 @@
       },
       commitInfo: function () {
         Toast.loading({forbidClick: true, duration: 0})
-        if (this.formValue.dry_weight == undefined){
+        if (this.formValue.dry_weight == undefined) {
           this.formValue.dry_weight = "0"
-        }else{
+        } else {
 
           this.formValue.dry_weight = this.formValue.dry_weight.toString()
         }
@@ -1307,15 +1307,15 @@
             this.$emit('evaluation', response.data.data.evaluation)
           }
         })
-      },showDryWeight:function(){
-        if(this.$store.getters.user.user.user_type == 3){
+      }, showDryWeight: function () {
+        if (this.$store.getters.user.user.user_type == 3) {
           return
         }
         this.isShowDialog = false
         this.$refs.dry.open()
-        this.propDryForm.doctor=[]
-        for (let i = 0; i < this.admin_users_prop.length;i++){
-          if(this.admin_users_prop[i].user_type == 2 || this.admin_users_prop[i].user_type == 1){
+        this.propDryForm.doctor = []
+        for (let i = 0; i < this.admin_users_prop.length; i++) {
+          if (this.admin_users_prop[i].user_type == 2 || this.admin_users_prop[i].user_type == 1) {
             this.propDryForm.doctor.push(this.admin_users_prop[i])
           }
         }
@@ -1331,7 +1331,7 @@
             dialogTop.scrollTop = 0
           })
         }
-      },menuEmpty:function (val) {
+      }, menuEmpty: function (val) {
         this.visibility = false
         this.isShowDialog = true
         switch (val.type) {
@@ -1367,7 +1367,7 @@
       DryWeightMenu,
       CheckBoxSubMenu,
 
-    }, created () {
+    }, created() {
 
       var date = this.$route.query && this.$route.query.date
       date *= 1000
@@ -1408,20 +1408,19 @@
         // this.$set(this.formValue, 'pulse_frequency', this.last_predialysis['pulse_frequency'])
       }
 
-      if(this.$store.getters.user.template_info.template_id != 6 && this.predialysis.id == undefined && this.last_predialysis.id != undefined){
-        this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
-      }
+      // if(this.$store.getters.user.template_info.template_id != 6 && this.predialysis.id == undefined && this.last_predialysis.id != undefined){
+      //   this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+      // }
 
-      if (this.$store.getters.user.template_info.template_id == 6 ) {
+      // if (this.$store.getters.user.template_info.template_id == 6 ) {
 
-        if(this.dry_weight != null && this.dry_weight.id != undefined){
-          this.$set(this.formValue, 'dry_weight', this.dry_weight.dry_weight.toString())
-          this.propDryForm.weight = this.dry_weight.dry_weight.toString()
-        }else{
-          if(this.predialysis.id == undefined && this.last_predialysis.id != undefined){
-            this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
-            this.propDryForm.weight = this.formValue.dry_weight
-          }
+      if (this.dry_weight != null && this.dry_weight.id != undefined) {
+        this.$set(this.formValue, 'dry_weight', this.dry_weight.dry_weight.toString())
+        this.propDryForm.weight = this.dry_weight.dry_weight.toString()
+      } else {
+        if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {
+          this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+          this.propDryForm.weight = this.formValue.dry_weight
         }
       }
       this.hemorrhage_state = this.formValue.is_hemorrhage == 0

src/pages/main/dialog/subMenu/MsgTip.vue

@@ -61,7 +61,7 @@
         <label class="name" for="txms">上次透后体重（kg）</label>
         <div class="content">
           <span class="text" id="txms">{{
-            predialysis.weight_after_last_transparency
+            last_record.weight_after
           }}</span>
         </div>
       </div>
@@ -77,10 +77,10 @@ export default {
   created() {
     if (
       this.predialysis.weight_before > 0 &&
-      this.predialysis.weight_after_last_transparency > 0
+      this.last_record.weight_after > 0
     ) {
       add_weight = parseFloat(
-        this.predialysis.weight_before - this.predialysis.weight_after_last_transparency
+        this.predialysis.weight_before - this.last_record.weight_after
       ).toFixed(2);
     }
   },

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -338,7 +338,7 @@
                     <td width="70">
                       <div class="under-line">&nbsp;{{prescription.target_ultrafiltration?prescription.target_ultrafiltration:''}}</div>
                     </td>
-                    <td width="20">ml</td>
+                    <td width="20">L</td>
                   </tr>
                   </tbody>
                 </table>

src/pages/main/today/dialysisPrescription.vue

@@ -7,6 +7,10 @@
     </h2>
     <div class="plate">
       <ul>
+        <li v-if="isShow('透析模式')">
+          <label>透析模式 :</label>
+          <span class="content">{{dialysis_mode}}</span>
+        </li>
         <li v-if="isShow('透析模式')">
           <label>透析模式 :</label>
           <span class="content">{{dialysis_mode}}</span>