Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/dialysis.js

@@ -148,7 +148,7 @@ export function postPrescription(params) {
   return request({
     url: '/api/dialysis/prescription',
     method: 'Post',
-    params: params
+    params: params,
   })
 }
 

src/xt_pages/dialysis/bloodPresssWatch.1.vue

@@ -128,12 +128,12 @@
 
         <el-table-column
           prop="dialysis_before_weight"
-          label="透前体重 (kg)"
+          label="透前称重 (kg)"
           align="center"
         ></el-table-column>
         <el-table-column
           prop="dialysis_after_weight"
-          label="透后体重 (kg)"
+          label="透后称重 (kg)"
           align="center"
         ></el-table-column>
         <el-table-column label="透中血压">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -245,13 +245,13 @@
 
         <el-table-column
           prop="dialysis_before_weight"
-          label="透前体重(kg)"
+          label="透前称重(kg)"
           align="center"
           width="120"
         ></el-table-column>
         <el-table-column
           prop="dialysis_after_weight"
-          label="透后体重(kg)"
+          label="透后称重(kg)"
           align="center"
           width="120"
         ></el-table-column>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -160,8 +160,8 @@
 
       </ul>
       <ul>
-        <li v-if="isShow('透后体重')">
-          <label>透后体重 : </label>
+        <li v-if="isShow('透后称重')">
+          <label>透后称重 : </label>
           <span class="content" v-if="weight_after!='0'">{{ weight_after }}</span>
           <span class="unit" v-if="weight_after!='0'">kg</span>
         </li>

src/xt_pages/dialysis/details/assessmentBefore.vue

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

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -41,8 +41,8 @@
           </el-col>
 
 
-          <el-col :span="8" v-if="isShow('透后体重')">
-            <el-form-item label="透后体重(kg): " >
+          <el-col :span="8" v-if="isShow('透后称重')">
+            <el-form-item label="透后称重(kg): " >
               <el-input v-model="form.weight_after"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/details/dialog/MsgTip.vue

@@ -26,7 +26,7 @@
           </div>
         </div>
         <div class="item">
-          <label class="name" for="txms">透前体重（kg）</label>
+          <label class="name" for="txms">透前称重（kg）</label>
           <div class="content">
             <span class="text" id="txms">{{ predialysis.weight_before }}</span>
           </div>
@@ -54,7 +54,7 @@
           </div>
         </div>
         <div class="item">
-          <label class="name" for="txms">透后体重（kg）</label>
+          <label class="name" for="txms">透后称重（kg）</label>
           <div class="content">
             <span class="text" id="txms">{{ record.weight_after }}</span>
           </div>
@@ -66,7 +66,7 @@
           </div>
         </div>
         <div class="item">
-          <label class="name" for="txms">上次透后体重（kg）</label>
+          <label class="name" for="txms">上次透后称重（kg）</label>
           <div class="content">
             <span class="text" id="txms">{{ last_record.weight_after }}</span>
           </div>

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -23,7 +23,7 @@
       <el-form ref="assessmentBeforeDislysis" :model="assessmentBeforeDislysis" label-width="125px">
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="透前体重(kg)： " v-if="isShow('透前体重')">
+            <el-form-item label="透前称重(kg)： " v-if="isShow('透前称重')">
               <el-input type="number" v-model="assessmentBeforeDislysis.weight_before"></el-input>
             </el-form-item>
           </el-col>
@@ -165,7 +165,7 @@
               <el-select v-model="assessmentBeforeDislysis.blood_access_part_opera_id">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="item in 8" :label="item.name" :value="item.id"
+                <el-option v-for="item in blood_access_part_opera" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
               </el-select>
             </el-form-item>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -502,7 +502,7 @@
         <span>{{dialysis_date}}</span>
       </div>
       <div class="newLine">
-        <span>透前体重(kg)</span>
+        <span>透前称重(kg)</span>
         <span>{{ getBeforeWeight(predialysis)}}</span>
       </div>
       <div class="newLine">
@@ -520,7 +520,7 @@
         <span>{{ add_weight }}</span>
       </div>
       <div class="newLine">
-        <span>透后体重(kg)</span>
+        <span>透后称重(kg)</span>
         <span>{{ getAfterWeight(record) }}</span>
       </div>
       <div class="newLine">
@@ -528,7 +528,7 @@
         <span>{{ record.weight_loss }}</span>
       </div>
       <div class="newLine">
-        <span>上次透后体重(kg)</span>
+        <span>上次透后称重(kg)</span>
         <span>{{getLastAfterWeight(last_record)}}</span>
       </div>
 

src/xt_pages/dialysis/details/pastData.vue

@@ -1,12 +1,12 @@
 <template>
    <div class="plate-box">
     <h2 class="DetailsTit"><span>{{title}}</span></h2>
-    <div class="tableTit " >   
+    <div class="tableTit " >
         <ul>
              <li v-for="(item,index) in tableTit" :key="index" :value="item.value" >{{item}}</li>
         </ul>
     </div>
-    <div class="tableDate" >   
+    <div class="tableDate" >
         <ul>
              <li v-for="(item,index) in tableDate" :key="index" :value="item.value" >
                <span>{{item.data}}</span>
@@ -18,8 +18,8 @@
              </li>
         </ul>
     </div>
-    <div class="middleLine"></div>    
-  </div>    
+    <div class="middleLine"></div>
+  </div>
 </template>
 
 <script>
@@ -31,8 +31,8 @@ export default {
       tableTit: [
         "日期",
         "透析模式",
-        "透前体重(kg)",
-        "透后体重(kg)",
+        "透前称重(kg)",
+        "透后称重(kg)",
         "设定脱水(L)",
         "实际脱水(L)"
       ],

src/xt_pages/dialysis/dialysisPage.vue

@@ -715,7 +715,7 @@
                   <table class="dan-table" style="margin-top: 0px;">
                     <tbody>
                     <tr>
-                      <td class="dan-td-col-4">透前体重</td>
+                      <td class="dan-td-col-4">透前称重</td>
                       <td class="dan-td">
                         <div class="dan-value"><b class="print-b">{{danPrintData.weight_before}}</b></div>
                       </td>
@@ -1072,7 +1072,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="size">
-                  <el-form-item label="透前体重(kg):">
+                  <el-form-item label="透前称重(kg):">
                     <el-input v-model="dialysisBeforeAsses.dialysisbeforeWeight"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1482,7 +1482,7 @@
 
 
                 <el-col :span="size">
-                  <el-form-item label="透后体重(kg):">
+                  <el-form-item label="透后称重(kg):">
                     <el-input v-model="dialysisAfterAsses.weightAfterDialysi"></el-input>
                   </el-form-item>
                 </el-col>

src/xt_pages/dialysis/order.html

@@ -1,7 +1,7 @@
 <style>
     .dialysis-print-order{
     width:960px; margin:0 auto
-} 
+}
 
 .dialysis-print-order .order-yy-name{
     margin: auto;
@@ -238,7 +238,7 @@
                                         <table class="table-box">
                                             <tbody>
                                                 <tr>
-                                                    <td width="90">透前体重：</td>
+                                                    <td width="90">透前称重：</td>
                                                     <td width="">
                                                         <div class="under-line">&nbsp;{{predialysis.weight_before}}</div>
                                                     </td>
@@ -358,7 +358,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    
+
                                     <td>
                                         <table class="table-box">
                                             <tbody>
@@ -554,7 +554,7 @@
                                         <div class="under-line">&nbsp;{{prescription.bicarbonate}}</div>
                                     </td>
                                     <td width="75">mmol/L</td>
-                                    
+
                                 </tr>
                             </tbody>
                         </table>
@@ -582,7 +582,7 @@
                 </tr>
                 <tr v-for="advice in advices" :key="advice.id">
                     <td> {{advice.start_time | parseTime('{y}-{m}-{d} {h}:{i}')}}</td>
-                    <td> 
+                    <td>
                         <span v-if="advice.parent_id>0">└</span>
                         <span >{{advice.advice_name }}</span>
                         <span >{{advice.advice_desc}}</span>
@@ -621,7 +621,7 @@
                     <td >透析液温度<font size="2"> (℃)</font></td>
                     <td >置换率<font size="2"> (ml/min)</font></td>
                     <td >置换量<font size="2"> (L)</font></td>
-                    
+
                     <td width="" style="min-width:45px;">病情变化</td>
                     <td width="" style="min-width:120px;">处理</td>
                     <td width="" style="min-width:45px;">结果</td>
@@ -645,7 +645,7 @@
                 </tr>
             </tbody>
         </table>
-        
+
         <table class="print-table" border="1">
             <tbody>
                 <tr>
@@ -711,4 +711,4 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -820,7 +820,7 @@
             </div>
             <div class="row" style="padding: 2px 0;line-height:24px;">
               <div class="inline_block">
-                透前体重：
+                透前称重：
                 <div class="under_line" style="width: 70px;text-align: left" v-if="predialysis.weight_before">
                   {{predialysis.weight_before}}
                 </div>

src/xt_pages/qcd/patientAnalysis/person/oralMedicine.vue

@@ -7,7 +7,7 @@
       <person-info :patient="patientInfo"></person-info>
       <person-nav activeName="oralmedicine" :patientID="patientID"></person-nav>
 
-      
+
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
@@ -38,7 +38,7 @@
           value-format="yyyy-MM-dd"
         ></el-date-picker>
       </div>
-      
+
       <div class="cell clearfix">
         <label class="title">
           <span class="name">医嘱类型</span> :
@@ -67,7 +67,7 @@
           </el-option>
         </el-select>
       </div> -->
-      
+
       <!-- <div class="cqd-dataTitle">统计图</div>
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="24">
@@ -88,7 +88,7 @@
         :cell-style="cellstyle"
         style="width: 100%;margin-top: 10px;"
         id="qcd-person-oral-medical"
-        :span-method="mergeSpan" 
+        :span-method="mergeSpan"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
         <el-table-column  label="医嘱类型" width="80" property="advice_type" align="center" >
@@ -98,13 +98,13 @@
                 <span v-else></span>
             </template>
         </el-table-column>
-        
+
         <el-table-column  label="医嘱内容" property="advice_name" min-width="180" align="center" >
             <template slot-scope="scope">
                {{scope.row.parent_id>0?'&nbsp;&nbsp;':''}} {{scope.row.advice_name }}
             </template>
         </el-table-column>
-        
+
         <el-table-column  label="开始时间" width="180" property="start_time" align="center">
             <template slot-scope="scope">
                 {{scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}")}}
@@ -116,19 +116,19 @@
                 <span v-if="scope.row.advice_type==1&&scope.row.stop_state==1"> {{scope.row.stop_time | parseTime("{y}-{m}-{d} {h}:{i}")}}</span>
             </template>
         </el-table-column>
-        
+
         <el-table-column label="开嘱医生" width="180"  property="advice_doctor" align="center">
             <template slot-scope="scope">
                 {{getXuserName(scope.row.advice_doctor)}}
             </template>
         </el-table-column>
-        
+
         <el-table-column  label="执行护士" width="180"  property="execution_staff" align="center">
             <template slot-scope="scope">
                 <span v-if="scope.row.parent_id==0">{{getXuserName(scope.row.execution_staff)}}</span>
             </template>
         </el-table-column>
-        
+
       </el-table>
 
       <!-- <pagi-nation title="分页"></pagi-nation> -->
@@ -225,7 +225,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    
+
     this.getList();
   },
   methods: {
@@ -259,7 +259,7 @@ export default {
       }
       return '';
     },
-    
+
     handleTableRow() {
       this.tableRow = [];
       var pos = 0;
@@ -311,7 +311,7 @@ export default {
         }
         return ""
     },
-    
+
     getXuserName(id) {
       if (id <= 0) {
         return "";
@@ -387,10 +387,10 @@ export default {
       }
 
       if (this.diagramType == 1) {
-        this.CompletionOptions.legend = ['透前体重', '透后体重', '干体重'];
+        this.CompletionOptions.legend = ['透前称重', '透后称重', '干体重'];
         this.CompletionOptions.series = [
-          { name:'透前体重', type:'line', data:[] },
-          { name:'透后体重', type:'line', data:[] },
+          { name:'透前称重', type:'line', data:[] },
+          { name:'透后称重', type:'line', data:[] },
           { name:'干体重', type:'line', data:[] },
         ];
       }else {
@@ -531,4 +531,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/xt_pages/qcd/patientAnalysis/person/weight.vue

@@ -7,7 +7,7 @@
       <person-info :patient="patientInfo"></person-info>
       <person-nav activeName="weight" :patientID="patientID"></person-nav>
 
-      
+
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询</span> :
@@ -38,7 +38,7 @@
           value-format="yyyy-MM-dd"
         ></el-date-picker>
       </div>
-      
+
       <div class="cell clearfix">
         <label class="title">
           <span class="name">曲线图</span> :
@@ -54,7 +54,7 @@
           </ul>
         </div>
       </div>
-      
+
       <div class="cqd-dataTitle">统计图</div>
       <el-row :gutter="32">
         <el-col :xs="24" :sm="24" :lg="24">
@@ -75,23 +75,23 @@
         style="width: 100%;margin-top: 10px;"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
-        
+
         <el-table-column  label="透析日期" min-width="80" property="schedule_date" align="center">
           <template slot-scope="scope"><span>{{getTime(scope.row.schedule_date, '{y}{m}{d}')}}</span></template>
         </el-table-column>
         <el-table-column  label="干体重" min-width="80" property="assessment_before_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
         </el-table-column>
-        <el-table-column  label="透前体重" min-width="80" property="assessment_before_dislysis" align="center">
+        <el-table-column  label="透前称重" min-width="80" property="assessment_before_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before + 'Kg':'--'}}</span></template>
         </el-table-column>
         <el-table-column  label="体重增加" min-width="80" property="assessment_before_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before - scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
         </el-table-column>
-        <el-table-column  label="透后体重" min-width="80" property="assessment_after_dislysis" align="center">
+        <el-table-column  label="透后称重" min-width="80" property="assessment_after_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis?scope.row.assessment_after_dislysis.weight_after+ 'Kg':'--'}}</span></template>
         </el-table-column>
-        
+
       </el-table>
 
       <!-- <pagi-nation title="分页"></pagi-nation> -->
@@ -184,7 +184,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    
+
     this.getList();
   },
   methods: {
@@ -297,10 +297,10 @@ export default {
       }
 
       if (this.diagramType == 1) {
-        this.CompletionOptions.legend = ['透前体重', '透后体重', '干体重'];
+        this.CompletionOptions.legend = ['透前称重', '透后称重', '干体重'];
         this.CompletionOptions.series = [
-          { name:'透前体重', type:'line', data:[] },
-          { name:'透后体重', type:'line', data:[] },
+          { name:'透前称重', type:'line', data:[] },
+          { name:'透后称重', type:'line', data:[] },
           { name:'干体重', type:'line', data:[] },
         ];
       }else {
@@ -438,4 +438,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/xt_pages/qcd/patientAnalysis/weight.vue

@@ -82,7 +82,7 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8">
           <div class="chart-wrapper">
-              <pie-chart title="透后体重（人次）" :options="WeightAfterOptions"/>
+              <pie-chart title="透后称重（人次）" :options="WeightAfterOptions"/>
           </div>
         </el-col>
       </el-row>
@@ -98,7 +98,7 @@
         style="width: 100%;margin-top: 10px;"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
-      
+
         <el-table-column  label="透析日期" min-width="80" property="schedule_date" align="center">
           <template slot-scope="scope"><span>{{getTime(scope.row.schedule_date, '{y}{m}{d}')}}</span></template>
         </el-table-column>
@@ -120,16 +120,16 @@
         <el-table-column  label="干体重" min-width="80" property="assessment_before_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
         </el-table-column>
-        <el-table-column  label="透前体重" min-width="80" property="assessment_before_dislysis" align="center">
+        <el-table-column  label="透前称重" min-width="80" property="assessment_before_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before + 'Kg':'--'}}</span></template>
         </el-table-column>
         <el-table-column  label="体重增加" min-width="80" property="assessment_before_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_before_dislysis?scope.row.assessment_before_dislysis.weight_before - scope.row.assessment_before_dislysis.dry_weight + 'Kg':'--'}}</span></template>
         </el-table-column>
-        <el-table-column  label="透后体重" min-width="80" property="assessment_after_dislysis" align="center">
+        <el-table-column  label="透后称重" min-width="80" property="assessment_after_dislysis" align="center">
           <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis?scope.row.assessment_after_dislysis.weight_after+ 'Kg':'--'}}</span></template>
         </el-table-column>
-        
+
         <el-table-column  label="统计" min-width="80" property="patient" align="center">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="统计" placement="top">
@@ -362,7 +362,7 @@ export default {
               });
             }
 
-            
+
         }
       });
     },
@@ -390,7 +390,7 @@ export default {
       this.listQuery.age = age;
       this.getList();
     },
-    
+
     getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)
@@ -526,4 +526,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/xt_pages/sign/index.vue

@@ -64,7 +64,7 @@
                    </div>
                     <div class="border"></div>
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
-                    透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    透前称重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="true" style="width:200px"></el-input><br>
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">

src/xt_pages/user/dialysisRecord.vue

@@ -153,14 +153,14 @@
             prop="predialysis_evaluation.weight_before"
             width="110"
             align="center"
-            label="透前体重(kg)"
+            label="透前称重(kg)"
           >
           </el-table-column>
           <el-table-column
             prop="assessment_after_dislysis.weight_after"
             width="110"
             align="center"
-            label="透后体重(kg)"
+            label="透后称重(kg)"
           >
           </el-table-column>
           <el-table-column
@@ -299,8 +299,8 @@
               <th>透析模式</th>
               <th>透析时长（h）</th>
               <th>干体重（kg）</th>
-              <th>透前体重（kg）</th>
-              <th>透后体重（kg）</th>
+              <th>透前称重（kg）</th>
+              <th>透后称重（kg）</th>
               <th>透前血压（mmhg）</th>
               <th>透后血压（mmhg）</th>
               <th>超滤总量（L）</th>