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.1.256"
+  "version": "1.1.257"
 }

src/pages/main/dialog/DoubleDialog.vue

@@ -4,7 +4,7 @@
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">双人核对</h1>
-        <span @click="commitInfo" class="success">保存</span>
+        <span :style="doubleReview.creater == 0 || doubleReview.modifier == 0 ? '':'visibility:hidden'" @click="commitInfo" class="success" >保存</span>
       </div>
       <div style="height: 8rem" class="DialogContent choose">
         <el-form
@@ -287,7 +287,6 @@ export default {
           return false;
         } else {
           Toast.success("提交成功");
-
           this.doubleReview.creater = response.data.data.doubleCheck.creater;
           this.doubleReview.check_time =
             response.data.data.doubleCheck.check_time;

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

@@ -21,7 +21,7 @@
       <div class="item">
         <label class="name" for="txms">透前体重（kg）</label>
         <div class="content">
-          <span class="text" id="txms">{{ predialysis.weight_before }}</span>
+          <span class="text" id="txms">{{ getBeforeWeight(predialysis)}}</span>
         </div>
       </div>
       <div class="item">
@@ -47,7 +47,7 @@
       <div class="item">
         <label class="name" for="txms">透后体重（kg）</label>
         <div class="content">
-          <span class="text" id="txms">{{ record.weight_after }}</span>
+          <span class="text" id="txms">{{ getAfterWeight(record)}}</span>
         </div>
       </div>
       <div class="item">
@@ -121,6 +121,23 @@ export default {
     }
   },
   methods: {
+    getBeforeWeight(predialysis){
+      if(predialysis.id > 0){
+        if(predialysis.weight_before > 0) {
+          return parseFloat(predialysis.weight_before - predialysis.additional_weight).toFixed(1);
+        }else{
+          return ''
+        }
+      }
+    }, getAfterWeight(record){
+      if(record.id > 0){
+        if(record.weight_after > 0) {
+          return parseFloat(record.weight_after - this.predialysis.additional_weight).toFixed(1);
+        }else{
+          return ''
+        }
+      }
+    },
     cancle: function() {
       this.$emit("menu-msg-tip");
     },

src/utils/tools.js

@@ -9,9 +9,9 @@ export function getFileExtension (filename) {
     return ext;
 }
 
-export function isCardNo(card) 
-{ 
-    // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X 
+export function isCardNo(card)
+{
+    // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
     var reg_18 = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
     var reg_15 = /^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$/;
 
@@ -65,7 +65,7 @@ export function jsGetAge(strBirthday, splitstr) {
 export function isPositiveInteger(s){//是否为正整数
     var re = /^[0-9]+$/ ;
     return re.test(s)
-} 
+}
 
 export function isPositiveNumber(s) {
     var re = /^\d+(\.\d+)?$/ ;
@@ -167,5 +167,6 @@ export function uParseTime(time, cFormat) {
       if (isNaN(shouji) ||isNaN(shichang) ||isNaN(weichi)) {
           return 0
       }
+
       return (shouji + (shichang-t) * weichi).toFixed(1);
-  }
+  }