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

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -221,7 +221,7 @@
                       </div>
                       ml/min
                     </div>
-                    <div class="inline_block" style="margin-left: 30px;">
+                    <div class="inline_block" style="margin-left: 20px;">
                       体重：
                       透前
                       <div class="under_line" style="width: 50px;">
@@ -234,9 +234,9 @@
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="margin-left: 30px;">
+                    <div class="inline_block" style="margin-left: 20px;">
                       目标超滤量：
-                      <div class="under_line" style="width: 80px;">
+                      <div class="under_line" style="width: 60px;">
                         {{record.prescription&&record.prescription.target_ultrafiltration?record.prescription.target_ultrafiltration:''}}
                       </div>
                       ml
@@ -249,12 +249,12 @@
                                  :checked="isCheckBoxChecked(record.prescription, 'anticoagulant', 2)"></check-box>
                       （
                       首剂
-                      <div class="under_line" style="width: 40px;">{{isCheckBoxChecked(record.prescription,
+                      <div class="under_line" style="width: 30px;">{{isCheckBoxChecked(record.prescription,
                         'anticoagulant', 2)?record.prescription.anticoagulant_shouji:''}}
                       </div>
                       mg&nbsp;
                       维持
-                      <div class="under_line" style="width: 40px;">{{isCheckBoxChecked(record.prescription,
+                      <div class="under_line" style="width: 30px;">{{isCheckBoxChecked(record.prescription,
                         'anticoagulant', 2)?record.prescription.anticoagulant_weichi:''}}
                       </div>
                       mg/h
@@ -262,15 +262,15 @@
 
                       <check-box text="低分子肝素"
                                  :checked="isCheckBoxChecked(record.prescription, 'anticoagulant', 3)"></check-box>
-                      <div class="under_line" style="width: 50px;">{{isCheckBoxChecked(record.prescription,
+                      <div class="under_line" style="width: 40px;">{{isCheckBoxChecked(record.prescription,
                         'anticoagulant', 3)?record.prescription.anticoagulant_zongliang:''}}
                       </div>
                       IU
 
                       <check-box text="无肝素" :checked="isCheckBoxChecked(record.prescription, 'anticoagulant', 1)"
                                  style="margin-left: 10px;"></check-box>
-                      其他方式：
-                      <div class="under_line" style="width: 170px;">
+                      其他方式
+                      <div class="under_line" style="width: 140px;">
                         {{record.prescription&&record.prescription.anticoagulant>3?anticoagulantName(record.prescription):''}}
                       </div>
                     </div>
@@ -409,21 +409,21 @@
                       </div>
                       min
                     </div>
-                    <div class="inline_block" style="margin-left: 25px;">
+                    <div class="inline_block" style="margin-left: 15px;">
                       实际超滤量：
-                      <div class="under_line" style="width: 50px;">
+                      <div class="under_line" style="width: 40px;">
                         {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:''}}
                       </div>
                       ml
                     </div>
-                    <div class="inline_block" style="margin-left: 25px;">
+                    <div class="inline_block" style="margin-left: 15px;">
                       透后体重：
-                      <div class="under_line" style="width: 50px;">
+                      <div class="under_line" style="width: 40px;">
                         {{record.assessment_after_dislysis&&record.assessment_after_dislysis.weight_after?record.assessment_after_dislysis.weight_after:''}}
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="margin-left: 25px;">
+                    <div class="inline_block" style="margin-left: 20px;">
                       透析器凝血：
                       <check-box text="0级"
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'cruor', '0度')"></check-box>

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -37,18 +37,18 @@
             </div>
             <div class="inline_block" style="margin-left: 25px;">
               住院号/ID号：
-              <div class="under_line" style="width: 120px;">
+              <div class="under_line" style="width: 100px;">
                 {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no }}
               </div>
             </div>
           </div>
           <div class="row flex">
-            
+
             <div class="inline_block">
               诊断：
               <div class="under_line" style="width: 500px;">{{record.patient.diagnose}}</div>
             </div>
-            
+
           </div>
           <div class="row">
             <table class="proj_table" style="margin-bottom: 300px;">
@@ -56,7 +56,7 @@
                 <tr><td colspan="2">一、透析前护理评估：</td></tr>
               <tr>
                 <td  colspan="2">
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       入科方式：
                       <check-box text="步行"
@@ -82,9 +82,9 @@
                       型号
                       <div class="under_line" style="width: 50px;">{{''}}</div>
                     </div>
-                    
+
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block" >
                       意识：
                       <check-box text="清醒"
@@ -117,7 +117,7 @@
                       &nbsp;）
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       血管通路(内瘘):
                       <check-box text="正常"
@@ -140,7 +140,7 @@
                       </div>
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       血管杂音:
                       <!-- <check-box text="震颤" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'internal_fistula', '震颤-存在')"></check-box> -->
@@ -159,7 +159,7 @@
                                  :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 3)"></check-box>
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       中心静脉置管：
                       <check-box text="长期"
@@ -183,7 +183,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       中心静脉导管：
                       <check-box text="正常"
@@ -209,7 +209,7 @@
 
                     </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       急诊：
                       <check-box text="急性心衰"
@@ -239,7 +239,7 @@
               </tr>
               <tr>
                 <td colspan="2">
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       跌倒风险评估：
                       评分：
@@ -257,8 +257,8 @@
                     </div>
 
                   </div>
-              
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       营养状况评估:
                       &emsp;食欲：
@@ -291,7 +291,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0; line-height:21px;">
+                  <div class="row" style="padding: 2px 0; line-height:19px;">
                     <div class="inline_block">
                       心理评估:
                       <check-box text="正常"
@@ -368,9 +368,9 @@
               </tr>
               <tr><td colspan="2"  style="font-size:16px;padding: 10px 8px;line-height: 30px;text-align:left;">三、透析后护理纪录</td></tr>
               <tr>
-                
+
                 <td>
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
 
                     <div class="inline_block">
                       透析过程:
@@ -410,7 +410,7 @@
                     </div>
 
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
 
                     <div class="inline_block">
                       内瘘管拔针后压迫止血时间:
@@ -433,7 +433,7 @@
 
                   </div>
 
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       内瘘震颤和血管杂音:
                       <check-box text="存在"
@@ -465,7 +465,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0;line-height:21px;">
+                  <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       透析器及血路管凝血情况:
                       动脉管道:
@@ -507,7 +507,7 @@
               </tr>
               <tr>
                 <td colspan="2">
-                <div class="row" style="padding: 2px 0;line-height:21px;">
+                <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block" style="float: left;">
                       责任护士：
                       <div class="under_line" style="width: 100px;">
@@ -549,7 +549,7 @@
               </tr>
               <tr>
                 <td colspan="2">
-                  <div class="row" style="padding: 2px 0; line-height:21px;">
+                  <div class="row" style="padding: 2px 0; line-height:19px;">
                     患者去向：
                     <check-box text="门诊"
                                :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'patient_gose', 4)"></check-box>
@@ -566,7 +566,7 @@
                     </div>
                     ）
                   </div>
-                  <div class="row" style="padding: 2px 0; line-height:21px;">
+                  <div class="row" style="padding: 2px 0; line-height:19px;">
                     <div class="inline_block" >
                       血透室护士签名：
                       <div class="under_line" style="width: 100px;">
@@ -899,7 +899,7 @@
                         <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
                         <span
                           v-if="advice.parent_id == 0  &&advice.children&& advice.children.length == 0">{{advice.execution_frequency}}</span>
-                        <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
+                        <span v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
 
                       </td>
 
@@ -1040,9 +1040,9 @@
             this.advice_groups = []
             var dlegh = 0
             if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 8) {
-              dlegh = 10 - this.records[recordIndex].monitor_records.length
+              dlegh = 8 - this.records[recordIndex].monitor_records.length
             } else {
-              dlegh = 10
+              dlegh = 8
             }
             if (dlegh > 0) {
               if (typeof (this.records[recordIndex].monitor_records) === 'undefined' || this.records[recordIndex].monitor_records == null) {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -819,7 +819,7 @@ export default {
             children: [],
             parent_row: 0
           }
-          this.nameFormTitle = '添加医嘱内容'
+          this.nameFormTitle = '新增医嘱内容'
         }
         this.nameFormVisible = true
       },

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -1051,7 +1051,7 @@ export default {
             children: [],
             parent_row: 0
           }
-          this.nameFormTitle = '添加医嘱内容'
+          this.nameFormTitle = '新增医嘱内容'
         }
         this.nameFormVisible = true
       },

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

@@ -35,9 +35,9 @@
               {{scope.row.blood_flow_volume?scope.row.blood_flow_volume:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="venous_pressure" align="center" label="静脉压(mmhg)" width="120">
+          <el-table-column prop="venous_pressure" align="center" label="静脉压/动脉压(mmhg)" width="120">
             <template slot-scope="scope">
-              {{scope.row.venous_pressure?scope.row.venous_pressure:''}}
+              <span>{{scope.row.venous_pressure?scope.row.venous_pressure:''}}/ {{scope.row.arterial_pressure?scope.row.arterial_pressure:''}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="transmembrane_pressure" align="center" label="跨膜压(mmhg)" width="120">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -8,14 +8,14 @@
         <th width="72px">血压(mmhg)</th>
         <th width="80px">心率(次/分)</th>
         <th width="110px">呼吸(次/分)</th>
-        <th width="92px">血流量(ml/min)</th>  
-        <th width="76px">静脉压(mmhg)</th>
+        <th width="92px">血流量(ml/min)</th>
+        <th width="76px">静脉压/动脉压(mmhg)</th>
         <th width="76px">跨膜压(mmhg)</th>
         <th width="76px">超滤量(L)</th>
         <th width="92px">钠浓度(mmol/L)</th>
         <th width="92px">透析液温度(℃)</th>
         <th width="92px">置换率(L/h)</th>
-        <th width="92px">置换量(L)</th>        
+        <th width="92px">置换量(L)</th>
         <th width="92px">病情变化</th>
         <th width="92px">处理</th>
         <th width="92px">结果</th>
@@ -26,21 +26,21 @@
         <td>{{ monitor.pulse_frequency?monitor.pulse_frequency:'' }}</td>
         <td>{{ monitor.breathing_rate?monitor.breathing_rate:'' }}</td>
         <td>{{ monitor.blood_flow_volume?monitor.blood_flow_volume:'' }}</td>
-        <td>{{ monitor.venous_pressure?monitor.venous_pressure:'' }}</td>
+        <td>{{ monitor.venous_pressure?monitor.venous_pressure:'' }} /{{ monitor.arterial_pressure?monitor.arterial_pressure:'' }} </td>
         <td>{{ monitor.transmembrane_pressure?monitor.transmembrane_pressure:'' }}</td>
         <td>{{ monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'' }}</td>
         <td>{{ monitor.sodium_concentration?monitor.sodium_concentration:'' }}</td>
         <td>{{ monitor.dialysate_temperature?monitor.dialysate_temperature:'' }}</td>
         <td>{{ monitor.replacement_rate?monitor.replacement_rate:'' }}</td>
-        <td>{{ monitor.displacement_quantity?monitor.displacement_quantity:'' }}</td>        
+        <td>{{ monitor.displacement_quantity?monitor.displacement_quantity:'' }}</td>
         <td>{{ monitor.symptom }}</td>
         <td>{{ monitor.dispose }}</td>
         <td>{{ monitor.result }}</td>
       </tr>
       </table>
      </div>
-    <div class="middleLine"></div>     
-  </div>    
+    <div class="middleLine"></div>
+  </div>
 </template>
 
 <script>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2167,12 +2167,10 @@
               <td class="advice-name"  :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                 <span >{{advice.advice_name }}</span>
                 <span>{{advice.advice_desc}}</span>
-                <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                 <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                 <span  v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>
                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.execution_frequency}}</span>
-                <!-- <span v-if="advice.children && advice.children.length > 0 || advice.parent_id > 0" style="float:right;width: 1px;height:30px; background: darkgray;"></span> -->
                 <span v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
 
               </td>
@@ -2505,8 +2503,8 @@
             this.monitors = response.data.data.monitors
             this.summary = response.data.data.summary
             this.org_template_info = response.data.data.org_template_info
-            if (this.monitors.length < 9) {
-              var nl = 9 - this.monitors.length
+            if (this.monitors.length < 8) {
+              var nl = 8 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }

src/xt_pages/stock/detail/stockInDetail.vue

@@ -307,10 +307,10 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, startTimeChange(val) {
         this.GetCancelStock()
       }, endTimeChange(val) {

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -49,7 +49,7 @@
             >选择医嘱模板
             </el-button>
           </el-col>
-          
+
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -58,11 +58,11 @@
             >新增医嘱内容
             </el-button>
           </el-col>
-          
+
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              round              
+              round
               @click="openDeleteGroupAdvice()"
             >删除医嘱内容
             </el-button>
@@ -70,7 +70,7 @@
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              round              
+              round
               @click="openGroupAdvice(1)"
             >修改医嘱内容
             </el-button>
@@ -1037,7 +1037,7 @@
             children: [],
             parent_row: 0,
           };
-          this.nameFormTitle = '添加医嘱内容';
+          this.nameFormTitle = '新增医嘱内容';
         }
         this.nameFormVisible = true;
 

src/xt_pages/user/doctorAdvice.vue

@@ -358,7 +358,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column label="
-                        
+
                         " min-width="80" property="delivery_way" align="center">
                             <template slot-scope="scope">
                             <span v-if="scope.row.parent_row==0">{{scope.row.delivery_way}}</span>
@@ -558,7 +558,7 @@
                                 </el-col>
                             </el-form-item>
                         </el-col>
-                  
+
                         <el-col :span="12">
                             <el-form-item label="单次用量 :" prop="single_dose" >
                                 <el-col :span="9">
@@ -592,7 +592,7 @@
                                 </el-col>
                             </el-form-item>
                         </el-col>
-                    
+
                         <el-col :span="12">
                             <el-form-item label="给药途径 :" prop="delivery_way" >
                                 <el-select v-model="adviceForm.delivery_way" :disabled="adviceForm.parent_id==0?false:true" filterable clearable allow-create  placeholder="请选择(输入可搜索)" style="width:100%" >
@@ -625,7 +625,7 @@
                     <el-form-item label="开嘱医生 :" >
                         <span>{{adminusername}} </span>
                     </el-form-item>
-                    
+
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <template v-if="isEdit">
@@ -648,7 +648,7 @@
 
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                    <el-button  @click="dialogStopFormVisible = false">取消</el-button>                    
+                    <el-button  @click="dialogStopFormVisible = false">取消</el-button>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="submitStopAdvice('stopForm')">保 存</el-button>
                 </div>
             </el-dialog>
@@ -1539,7 +1539,7 @@ export default {
           children: [],
           parent_row: 0
         };
-        this.nameFormTitle = "添加医嘱内容";
+        this.nameFormTitle = "新增医嘱内容";
       }
       this.nameFormVisible = true;
     },