Sfoglia il codice sorgente

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

csx 4 anni fa
parent
commit
6a9850b9a6

+ 1 - 1
build/cdn.json Vedi File

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "1.1.256"
2
+  "version": "1.1.257"
3 3
 }

+ 1 - 2
src/pages/main/dialog/DoubleDialog.vue Vedi File

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

+ 19 - 2
src/pages/main/dialog/subMenu/MsgTip.vue Vedi File

@@ -21,7 +21,7 @@
21 21
       <div class="item">
22 22
         <label class="name" for="txms">透前体重(kg)</label>
23 23
         <div class="content">
24
-          <span class="text" id="txms">{{ predialysis.weight_before }}</span>
24
+          <span class="text" id="txms">{{ getBeforeWeight(predialysis)}}</span>
25 25
         </div>
26 26
       </div>
27 27
       <div class="item">
@@ -47,7 +47,7 @@
47 47
       <div class="item">
48 48
         <label class="name" for="txms">透后体重(kg)</label>
49 49
         <div class="content">
50
-          <span class="text" id="txms">{{ record.weight_after }}</span>
50
+          <span class="text" id="txms">{{ getAfterWeight(record)}}</span>
51 51
         </div>
52 52
       </div>
53 53
       <div class="item">
@@ -121,6 +121,23 @@ export default {
121 121
     }
122 122
   },
123 123
   methods: {
124
+    getBeforeWeight(predialysis){
125
+      if(predialysis.id > 0){
126
+        if(predialysis.weight_before > 0) {
127
+          return parseFloat(predialysis.weight_before - predialysis.additional_weight).toFixed(1);
128
+        }else{
129
+          return ''
130
+        }
131
+      }
132
+    }, getAfterWeight(record){
133
+      if(record.id > 0){
134
+        if(record.weight_after > 0) {
135
+          return parseFloat(record.weight_after - this.predialysis.additional_weight).toFixed(1);
136
+        }else{
137
+          return ''
138
+        }
139
+      }
140
+    },
124 141
     cancle: function() {
125 142
       this.$emit("menu-msg-tip");
126 143
     },

+ 6 - 5
src/utils/tools.js Vedi File

@@ -9,9 +9,9 @@ export function getFileExtension (filename) {
9 9
     return ext;
10 10
 }
11 11
 
12
-export function isCardNo(card) 
13
-{ 
14
-    // 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X 
12
+export function isCardNo(card)
13
+{
14
+    // 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X
15 15
     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]$/;
16 16
     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}$/;
17 17
 
@@ -65,7 +65,7 @@ export function jsGetAge(strBirthday, splitstr) {
65 65
 export function isPositiveInteger(s){//是否为正整数
66 66
     var re = /^[0-9]+$/ ;
67 67
     return re.test(s)
68
-} 
68
+}
69 69
 
70 70
 export function isPositiveNumber(s) {
71 71
     var re = /^\d+(\.\d+)?$/ ;
@@ -167,5 +167,6 @@ export function uParseTime(time, cFormat) {
167 167
       if (isNaN(shouji) ||isNaN(shichang) ||isNaN(weichi)) {
168 168
           return 0
169 169
       }
170
+
170 171
       return (shouji + (shichang-t) * weichi).toFixed(1);
171
-  }
172
+  }