Merge branch 'master' of http://git.shengws.com/csx/Vue_New

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

@@ -28,7 +28,7 @@
 
           <el-col :span="8" v-if="isShow('实际超滤量')">
 
-            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6 || this.template_id == 10">
+            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6 || this.template_id == 10 || this.template_id == 11">
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

@@ -691,10 +691,10 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleCancle">取 消</el-button>
         <!-- <el-button type="primary" @click="handleCommit" v-if="isPermission()">保 存</el-button> -->
-        <el-button type="primary" @click="handleCommit" v-if="hasPermission"
+        <el-button type="primary" @click="handleCommit"
           >保 存</el-button
         >
-        <el-button type="primary" @click="handleSolution" v-if="isPermission()"
+        <el-button type="primary" @click="handleSolution"
           >保存为长期处方</el-button
         >
       </span>
@@ -1178,17 +1178,6 @@ export default {
         }
       }
     },
-    isPermission() {
-      if (
-        this.$store.getters.xt_user.user.user_type == 3 &&
-        (this.$store.getters.xt_user.template_info.template_id == 2 ||
-          this.$store.getters.xt_user.template_info.template_id == 6)
-      ) {
-        return false;
-      } else {
-        return true;
-      }
-    },
     setLastRecord: function(
       schedual,
       lastAssessmentAfterDislysis,

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

@@ -140,7 +140,7 @@
             align="center"
             label="超滤量(ml)"
             width="110"
-            v-if="isShow('超滤量') && (template_id == 6 || template_id == 10)"
+            v-if="isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11)"
           >
             <template slot-scope="scope">
               {{
@@ -155,7 +155,7 @@
             align="center"
             label="超滤量(L)"
             width="110"
-            v-if="isShow('超滤量') && template_id != 6 &&  template_id != 10"
+            v-if="isShow('超滤量') && template_id != 6 &&  template_id != 10 && template_id != 11"
           >
             <template slot-scope="scope">
               {{
@@ -200,7 +200,7 @@
             align="center"
             label="置换率(ml/min)"
             width="120"
-            v-if="isShow('置换率') && (template_id == 6  || template_id == 10)"
+            v-if="isShow('置换率') && (template_id == 6  || template_id == 10 || template_id == 11)"
           >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
@@ -211,7 +211,7 @@
             align="center"
             label="置换率(L/h)"
             width="120"
-            v-if="isShow('置换率') && template_id != 6 && template_id != 10"
+            v-if="isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11"
           >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
@@ -222,7 +222,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if="isShow('置换量') && (template_id == 6 || template_id == 10)"
+            v-if="isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11)"
           >
             <template slot-scope="scope">
               {{
@@ -238,7 +238,7 @@
             align="center"
             label="SpO₂(%)"
             width="100"
-            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10"
+            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11"
           >
             <template slot-scope="scope">
               {{
@@ -254,7 +254,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if="isShow('置换量') && template_id != 6 && template_id != 10"
+            v-if="isShow('置换量') && template_id != 6 && template_id != 10 || template_id != 11"
           >
             <template slot-scope="scope">
               {{
@@ -417,12 +417,12 @@
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤量') &&(template_id != 6 || template_id != 10)">
+          <el-col :span="8" v-if="isShow('超滤量') &&(template_id != 6 || template_id != 10 || template_id != 11)">
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤量') && template_id != 6 && template_id != 10">
+          <el-col :span="8" v-if="isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11">
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -778,6 +778,9 @@ export default {
         this.form.replacement_rate = resp.monitor.replacement_rate
           ? resp.monitor.replacement_rate
           : "";
+        this.form.heparin = resp.monitor.heparin
+          ? resp.monitor.heparin
+          : "";
         this.form.displacement_quantity = ""; // this.last_monitor_record.displacement_quantity;
         this.form.conductivity = "";
         this.form.displacement_flow_quantity = "";
@@ -836,6 +839,8 @@ export default {
         this.form.displacement_quantity = "";
         this.form.conductivity = "";
         this.form.displacement_flow_quantity = "";
+        this.form.heparin = "";
+
         this.form.ktv = "";
         this.form.symptom = "";
         this.form.dispose = "";
@@ -898,6 +903,12 @@ export default {
           ? monitor.displacement_flow_quantity
           : "";
 
+        this.form.heparin = monitor.heparin
+          ? monitor.heparin
+          : "";
+
+
+
         this.form.ktv = monitor.ktv;
         this.form.symptom = monitor.symptom;
         this.form.dispose = monitor.dispose;
@@ -983,6 +994,12 @@ export default {
           ? 0
           : parseFloat(this.form.displacement_flow_quantity);
 
+
+      this.form.heparin =
+        parseFloat(this.form.heparin) == NaN
+          ? 0
+          : parseFloat(this.form.heparin);
+
       this.form.ktv =
         parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
       this.form.monitoring_date = parseInt(this.form.monitoring_date);
@@ -1085,6 +1102,11 @@ export default {
               ? 0
               : parseFloat(this.form.displacement_flow_quantity);
 
+          this.form.heparin =
+            parseFloat(this.form.heparin) == NaN
+              ? 0
+              : parseFloat(this.form.heparin);
+
           this.form.ktv =
             parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
 

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -12,18 +12,20 @@
         <th width="76px">静脉压/动脉压(mmHg)</th>
         <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
         <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmhg)</th>
-        <th v-if="isShow('超滤量') && (template_id == 6 || template_id == 10)" width="76px">超滤量(ml)</th>
-        <th v-if="isShow('超滤量') && template_id != 6 && template_id != 10" width="76px">超滤量(L)</th>
+        <th v-if="isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11)" width="76px">超滤量(ml)</th>
+        <th v-if="isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11" width="76px">超滤量(L)</th>
         <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
         <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-        <th v-if="isShow('置换率')&& (template_id == 6 || template_id == 10)" width="92px">置换率(ml/min)</th>
-        <th v-if="isShow('置换率')&& template_id != 6 && template_id != 10" width="92px">置换率(L/h)</th>
+        <th v-if="isShow('置换率')&& (template_id == 6 || template_id == 10 || template_id == 11)" width="92px">置换率(ml/min)</th>
+        <th v-if="isShow('置换率')&& template_id != 6 && template_id != 10 && template_id != 11" width="92px">置换率(L/h)</th>
 
-        <th v-if="isShow('置换量')&& (template_id == 6 || template_id == 10)" width="92px">置换量(ml)</th>
-        <th v-if="isShow('置换量')&& template_id != 6 && template_id != 10" width="92px">置换量(L)</th>
-         <th v-if="isShow('SpO₂')&& template_id != 6 && template_id != 10" width="92px">SpO₂(%)</th>
+        <th v-if="isShow('置换量')&& (template_id == 6 || template_id == 10 ||  template_id == 11)" width="92px">置换量(ml)</th>
+        <th v-if="isShow('置换量')&& template_id != 6 && template_id != 10 && template_id != 10" width="92px">置换量(L)</th>
+         <th v-if="isShow('SpO₂')&& template_id != 6 && template_id != 10 && template_id != 11" width="92px">SpO₂(%)</th>
         <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
         <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
+        <th v-if="isShow('肝素用量余量')"  width="92px">肝素用量余量(ml)</th>
+
         <th v-if="isShow('病情变化')" width="92px">病情变化</th>
         <th v-if="isShow('处理')"  width="92px">处理</th>
         <th v-if="isShow('结果')" width="92px">结果</th>
@@ -45,6 +47,9 @@
         <td v-if="isShow('SpO₂')">{{monitor.blood_oxygen_saturation?monitor.blood_oxygen_saturation:''}}</td>
         <td v-if="isShow('电导度')">{{ monitor.conductivity?monitor.conductivity:'' }}</td>
         <th v-if="isShow('置换液流量')" >{{monitor.displacement_flow_quantity?monitor.displacement_flow_quantity:''}}</th>
+
+        <th v-if="isShow('肝素用量余量')" >{{monitor.heparin?monitor.heparin:''}}</th>
+
         <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
         <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
         <td v-if="isShow('结果')">{{ monitor.result }}</td>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -96,7 +96,7 @@
       <template
         v-if="
           org_template_info.template_id == 6 ||
-            org_template_info.template_id == 10
+            org_template_info.template_id == 10 ||  org_template_info.template_id == 11
         "
       >
         <el-button
@@ -211,6 +211,11 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 9"
       ></DialysisPrintOrderNine>
+
+    <DialysisPrintOrderEleven
+      v-bind:childResponse="childResponse"
+      v-if="org_template_info.template_id == 11"
+    ></DialysisPrintOrderEleven>
     </div>
   </div>
 </template>
@@ -232,10 +237,12 @@ import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
 import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
 import print from "print-js";
 import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
+import DialysisPrintOrderEleven from './template/DialysisPrintOrderEleven'
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderEleven,
     DialysisPrintOrderTen,
     DialysisPrintOrderOne,
     DialysisPrintOrderTwo,
@@ -423,7 +430,7 @@ export default {
         });
       } else if (
         this.org_template_info.template_id == 6 ||
-        this.org_template_info.template_id == 10
+        this.org_template_info.template_id == 10 ||  this.org_template_info.template_id == 11
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -489,18 +489,6 @@
                   <td width="200">病情变化及处理</td>
                   <td width="100">护士签名</td>
 
-
-                  <!-- <td width="100">时间</td>
-              <td width="30">T<br>C°</td>
-              <td width="30">P<br/>次/分</td>
-              <td width="30">R<br/>次/分</td>
-              <td width="100">BP<br/>mmHg</td>
-              <td width="60">静脉压/动脉压<br/>mmHg</td>
-              <td width="80">血流量<br/>ml/min</td>
-              <td width="90">超滤量累计L</td>
-              <td width="80">钠浓度<br/>mmol/L</td>
-              <td width="240">病情特殊情况处理<br/>及专科护理措施记录</td>
-              <td  width="100">护士签名</td> -->
                 </tr>
 
                 <tr v-for="(monitor, monindex) in monitors" :key="monindex">
@@ -551,6 +539,8 @@
                   <td></td>
                   <td></td>
                   <td></td>
+                  <td></td>
+
                   <td v-if=" prescription.mode_id == 2 || prescription.mode_id == 5  "  width="50" ></td>
                   <td style="line-height:16px;padding:0px;">
                     <div style="height:40px;line-height:20px; overflow:hidden;" >
@@ -1015,7 +1005,7 @@
   import print from 'print-js'
 
   export default {
-    name: 'dialysisPrintOrderSix',
+    name: 'DialysisPrintOrderEleven',
     props: ['childResponse'],
     components: {
       // DialysisPrintOrderOne,

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1025,6 +1025,8 @@
                           </span>
                     </div>
                   </td>
+
+
                   <td>
                   <span
                     v-if="setAdminUserES(monitor.monitoring_nurse) == ''"