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

src/pages/main/Print.vue

@@ -1102,7 +1102,7 @@
                     </td>
                     <td width="20">L</td>
                     <td></td>
-                    <td width="60">透后体重</td>
+                    <td width="60">透后称重</td>
                     <td width="50">
                       <div class="under-line">&nbsp;{{afterdialysis.weight_after?afterdialysis.weight_after:''}}</div>
                     </td>

src/pages/main/dialog/AssessmentDialog.vue

@@ -8,8 +8,8 @@
       </div>
 
       <div class="DialogContent" id="dialogTop">
-        <div class="item" v-if="isShow('透前体重')">
-          <h2 class="name">透前体重(kg)</h2>
+        <div class="item" v-if="isShow('透前称重')">
+          <h2 class="name">透前称重(kg)</h2>
           <div class="content">
             <input
               type="number"

src/pages/main/dialog/ThorougDialog.vue

@@ -28,8 +28,8 @@
           </div>
         </div>
 
-        <div class="item" v-if="isShow('透后体重')">
-          <label class="name" for="sjcll">透后体重(kg)</label>
+        <div class="item" v-if="isShow('透后称重')">
+          <label class="name" for="sjcll">透后称重(kg)</label>
           <div class="content">
             <input
               type="number"
@@ -1603,7 +1603,7 @@ export default {
         this.formValue[key] = this.record[key]
       }
     }
-    
+
     if ((this.record.id == undefined || this.record.id == '') && this.predialysis.id != undefined) {
       this.$set(this.formValue, 'additional_weight', this.predialysis['additional_weight'].toString())
     }

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

@@ -19,9 +19,9 @@
         </div>
       </div>
       <div class="item" style="display:block;">
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透前体重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{ getBeforeWeight(predialysis)}}</span></div>
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透前称重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{ getBeforeWeight(predialysis)}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透前体重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{ getBeforeWeight(predialysis)}}</span>kg=
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透前称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{ getBeforeWeight(predialysis)}}</span>kg=
           透前总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.weight_before}}</span>kg-
           衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
            </span>
@@ -46,8 +46,8 @@
         <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">体重增加（kg）<span style="text-align:right;float: right;color:#ec6618;">{{add_weight}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
           <span class="text" style="text-align:left;display:block;height:0.8rem;line-height:0.6rem;" id="txms">体重增加:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{add_weight}}</span>kg=
-          透前体重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getBeforeWeight(predialysis)}}</span>kg -
-          上次透后体重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg
+          透前称重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getBeforeWeight(predialysis)}}</span>kg -
+          上次透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg
           </span>
         </div>
         <br>
@@ -59,9 +59,9 @@
         </div>
       </div> -->
       <div class="item" style="display:block;">
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透后体重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getAfterWeight(record)}}</span></div>
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透后称重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getAfterWeight(record)}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后体重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
           透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{record.weight_after}}</span>kg-
           衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
            </span>
@@ -81,9 +81,9 @@
         </div>
       </div>
       <div class="item" style="display:block;">
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">上次透后体重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getLastAfterWeight(last_record)}}</span></div>
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">上次透后称重（kg）<span style="text-align:right;float: right;color:#ec6618;">{{getLastAfterWeight(last_record)}}</span></div>
         <div class="content" style="margin-top:5px;margin-left:0;">
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后体重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
           上次透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_record.weight_after}}</span>kg-
           上次衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_predialysis.additional_weight}}</span>kg
            </span>

src/pages/main/dialysis/RecordTable.vue

@@ -63,8 +63,8 @@
             <th width="110px">透析模式</th>
             <th width="92px">透析时长(h)</th>
             <th width="76px">干体重(kg)</th>
-            <th width="76px">透前体重(kg)</th>
-            <th width="76px">透后体重(kg)</th>
+            <th width="76px">透前称重(kg)</th>
+            <th width="76px">透后称重(kg)</th>
             <th width="92px">透前血压(mmHg)</th>
             <th width="92px">透后血压(mmHg)</th>
             <th width="92px">超滤总量(L)</th>

src/pages/main/today/assessmentAfter.vue

@@ -24,8 +24,8 @@
           <span class="content" id="ssy">{{systolic_blood_pressure?systolic_blood_pressure:''}}</span>
           <span class="unit">{{systolic_blood_pressure?'mmHg':''}}</span>
         </li>
-        <li v-if="isShow('透后体重')">
-          <label for="thtz">透后体重 : </label>
+        <li v-if="isShow('透后称重')">
+          <label for="thtz">透后称重 : </label>
           <span class="content" id="thtz">{{weight_after?weight_after:''}}</span>
           <span class="unit">{{weight_after?'kg':''}}</span>
         </li>

src/pages/main/today/assessmentBefore.vue

@@ -7,8 +7,8 @@
     </h2>
     <div class="plate ">
       <ul>
-        <li v-if="isShow('透前体重')">
-          <label>透前体重 : </label>
+        <li v-if="isShow('透前称重')">
+          <label>透前称重 : </label>
           <span class="content">{{ weight_before ? weight_before : "" }}</span>
           <span class="unit">{{ weight_before ? "kg" : "" }}</span>
         </li>

src/pages/main/today/pastData.vue

@@ -36,8 +36,8 @@ export default {
       tableTit: [
         "日期",
         "透析模式",
-        "透前体重(kg)",
-        "透后体重(kg)",
+        "透前称重(kg)",
+        "透后称重(kg)",
         "设定脱水(L)",
         "实际脱水(L)"
       ],

src/pages/waitingRoom/components/assessmentAfter.vue

@@ -8,7 +8,7 @@
     <div class="plate ">
       <ul>
         <li>
-          <label>透后体重 : </label>
+          <label>透后称重 : </label>
           <span class="content">{{ weight_after }}</span>
           <span class="unit">kg</span>
         </li>
@@ -98,7 +98,7 @@ export default {
       note: "无明显异常",
       doctor: "刘小军  医生",
       info1: [
-        { value: "1", label: "透后体重 : ", content: "55", unit: "kg" },
+        { value: "1", label: "透后称重 : ", content: "55", unit: "kg" },
         { value: "2", label: "收缩压 : ", content: "174", unit: "mmHg" },
         { value: "3", label: "实际超滤量: ", content: "20", unit: "ml" },
         { value: "4", label: "疑血 : ", content: "无震颤", unit: "" },

src/pages/waitingRoom/components/assessmentBefore.vue

@@ -44,7 +44,7 @@ export default {
       note: "",
       doctor: "刘小军  医生",
       info1: [
-        { value: "1", label: "透前体重 : ", content: "0", unit: "kg" },
+        { value: "1", label: "透前称重 : ", content: "0", unit: "kg" },
         { value: "2", label: "收缩压 : ", content: "0", unit: "mmHg" },
         { value: "3", label: "前次透析后: ", content: "0", unit: "" },
         { value: "4", label: " ", content: " ", unit: "" }

src/pages/waitingRoom/components/dialog/afterThoroughly.vue

@@ -7,7 +7,7 @@
     </h2>
     <div class="content">
       <div class="cell">
-        <label>透后体重(kg)</label>
+        <label>透后称重(kg)</label>
         <input
           type="text"
           class="inputBox"

src/pages/waitingRoom/components/dialog/preDialysis.vue

@@ -7,7 +7,7 @@
     </h2>
     <div class="content">
       <div class="cell">
-        <label>透前体重(kg)</label>
+        <label>透前称重(kg)</label>
         <input
           type="text"
           class="inputBox"

src/pages/waitingRoom/components/pastData.vue

@@ -36,8 +36,8 @@ export default {
       tableTit: [
         "日期",
         "透析模式",
-        "透前体重(kg)",
-        "透后体重(kg)",
+        "透前称重(kg)",
+        "透后称重(kg)",
         "设定脱水(L)",
         "实际脱水(L)"
       ],