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

config/dev.env.js

@@ -6,7 +6,7 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API:'"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

src/xt_pages/data/druguseTemplate.vue

@@ -1211,7 +1211,7 @@
         day_count: '',
 
         crumbs: [
-          { path: false, name: '数据字典' },
+          { path: false, name: '管理中心' },
           { path: 'data/druguse', name: '医嘱模版' }
         ],
         rowIndex: -1,
@@ -1928,7 +1928,7 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
-                  this.$message.error('添加成功')
+                  this.$message.success('添加成功')
 
                   this.efFormVisible = false
                   this.resetForm(formName)

src/xt_pages/data/index.vue

@@ -31,8 +31,8 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: '数据字典' },
-        { path: 'data/dictionary', name: '字段配置' }
+        { path: false, name: '管理中心' },
+        { path: 'data/dictionary', name: '数据字典' }
       ],
       tabMapOptions: [
         { label: this.$t('data_config.patient'), key: 'patient' },

src/xt_pages/data/printTemplate.vue

@@ -181,7 +181,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "系统管理" },
+        { path: false, name: "管理中心" },
         { path: "data/print", name: "打印模版" }
       ],
       imgUrl_One: require("@/assets/home/1.jpg"),

src/xt_pages/data/showConfig.vue

@@ -52,7 +52,7 @@
     data() {
       return {
         crumbs: [
-          { path: false, name: '数据字典' },
+          { path: false, name: '管理中心' },
           { path: '/data/showconfig', name: '显示配置' }
         ],
         activeName: 'first',

src/xt_pages/data/template.vue

@@ -27,7 +27,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: '数据字典' },
+        { path: false, name: '管理中心' },
         { path: 'data/template', name: '模版配置' },
       ],
       tabMapOptions: [

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -265,7 +265,7 @@
           align="center"
           width="120"
         ></el-table-column>
-        <el-table-column label="透中血压(Hgmm)" align="center">
+        <el-table-column label="透中血压(mmHg)" align="center">
           <el-table-column
             v-for="(item, index) in labelArr"
             :key="index"
@@ -336,23 +336,59 @@ export default {
           {
             text: "今天",
             onClick(picker) {
-              picker.$emit("pick", new Date());
+              var date = new Date();
+              var year = date.getFullYear();
+              var month = date.getMonth() + 1;
+              var day = date.getDate();
+              if (month < 10) {
+                month = "0" + month;
+              }
+              if (day < 10) {
+                day = "0" + day;
+              }
+              var nowDate = year + "-" + month + "-" + day;
+              var date1 = new Date(nowDate + " 00:00:00");
+              picker.$emit("pick", date1.getTime());
             }
           },
           {
             text: "昨天",
             onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
+              var d = new Date();
+              d.setTime(d.getTime() - 3600 * 1000 * 24);
+              var date = d;
+              var year = date.getFullYear();
+              var month = date.getMonth() + 1;
+              var day = date.getDate();
+              if (month < 10) {
+                month = "0" + month;
+              }
+              if (day < 10) {
+                day = "0" + day;
+              }
+              var nowDate = year + "-" + month + "-" + day;
+              var date1 = new Date(nowDate + " 00:00:00");
+              picker.$emit("pick", date1.getTime());
             }
           },
           {
             text: "一周前",
             onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
+              var d = new Date();
+              d.setTime(d.getTime() - 3600 * 1000 * 24 * 7);
+              var date = d;
+              var year = date.getFullYear();
+              var month = date.getMonth() + 1;
+              var day = date.getDate();
+              if (month < 10) {
+                month = "0" + month;
+              }
+              if (day < 10) {
+                day = "0" + day;
+              }
+              var nowDate = year + "-" + month + "-" + day;
+              var date1 = new Date(nowDate + " 00:00:00");
+              picker.$emit("pick", date1.getTime());
             }
           },
           {

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

@@ -9,21 +9,9 @@
     >
       <div v-show="edit == false">
         <div class="txsj">
-          <el-button round :disabled="!is_has_create" @click="newRecordAction"
-            >新增监测</el-button
-          >
-          <el-button
-            round
-            :disabled="!is_has_modify && !is_has_modify_other"
-            @click="modifyRecordAction"
-            >修改监测</el-button
-          >
-          <el-button
-            round
-            :disabled="!is_has_del && !is_has_del_other"
-            @click="deleteRecordAction"
-            >删除监测</el-button
-          >
+          <el-button round :disabled="!is_has_create" @click="newRecordAction">新增监测</el-button>
+          <el-button round :disabled="!is_has_modify && !is_has_modify_other" @click="modifyRecordAction">修改监测</el-button>
+          <el-button round :disabled="!is_has_del && !is_has_del_other" @click="deleteRecordAction">删除监测</el-button>
         </div>
         <el-table
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -152,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">
               {{
@@ -167,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">
               {{
@@ -212,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 : "" }}
@@ -223,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 : "" }}
@@ -234,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">
               {{
@@ -250,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">
               {{
@@ -266,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">
               {{
@@ -383,7 +371,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                @click="venousPressureChangeOne"
+                @click="venousPressureChange(1)"
                 >转换</el-button
               >
             </el-form-item>
@@ -397,7 +385,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                @click="venousPressureChangeTwo"
+                @click="venousPressureChange(3)"
                 >转换</el-button
               >
             </el-form-item>
@@ -418,7 +406,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                @click="venousPressureChangeThree"
+                @click="venousPressureChange(2)"
                 >转换</el-button
               >
             </el-form-item>
@@ -429,18 +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>
@@ -487,6 +469,13 @@
             </el-form-item>
           </el-col>
 
+
+          <el-col :span="8" v-if="isShow('肝素用量余量')">
+            <el-form-item label="肝素用量余量(ml)：">
+              <el-input v-model="form.heparin"></el-input>
+            </el-form-item>
+          </el-col>
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -616,21 +605,21 @@ import {
 } from "@/api/dialysis_record";
 import store from "@/store";
 
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 export default {
   name: "MonitorDialog",
   data() {
     return {
-      is_has_create: true,
-      is_has_modify: true,
-      is_has_modify_other: true,
-      is_has_del: true,
-      is_has_del_other: true,
+      is_has_create:true,
+      is_has_modify:true,
+      is_has_modify_other:true,
+      is_has_del:true,
+      is_has_del_other:true,
       visible: false,
       edit: false,
       current_row_class: "current-box-class",
-      creator: 0,
+      creator:0,
       patient_id: 0,
       schedule_date: 0,
       template_id: 0,
@@ -660,6 +649,7 @@ export default {
         displacement_quantity: "", // 置换量
         conductivity: "", // 电导度
         displacement_flow_quantity: "", // 置换液流量
+        heparin:"", //肝素用量余量
         ktv: "", // KT/V
         symptom: "", // 病情变化
         dispose: "", // 处理
@@ -674,10 +664,7 @@ export default {
       dispose_selecteds: [],
       dispose_options: getDataConfig("hemodialysis", "deals"),
       result_selecteds: [],
-      result_options: getDataConfig("hemodialysis", "results"),
-      value: 0,
-      valuetwo: 0,
-      valuethree: 0
+      result_options: getDataConfig("hemodialysis", "results")
     };
   },
   props: {
@@ -717,54 +704,6 @@ export default {
         );
       }
     },
-    venousPressureChangeOne() {
-      if (this.value == 0) {
-        this.form.venous_pressure = Math.ceil(
-          Math.round(this.form.venous_pressure * 7.5)
-        );
-        this.value = 1;
-        return false;
-      }
-      if (this.value == 1) {
-        this.form.venous_pressure = Math.ceil(
-          Math.round(this.form.venous_pressure / 7.5)
-        );
-        this.value = 0;
-        return false;
-      }
-    },
-    venousPressureChangeTwo() {
-      if (this.valuetwo == 0) {
-        this.form.arterial_pressure = Math.ceil(
-          Math.round(this.form.arterial_pressure * 7.5)
-        );
-        this.valuetwo = 1;
-        return false;
-      }
-      if (this.valuetwo == 1) {
-        this.form.arterial_pressure = Math.ceil(
-          Math.round(this.form.arterial_pressure / 7.5)
-        );
-        this.valuetwo = 0;
-        return false;
-      }
-    },
-    venousPressureChangeThree() {
-      if (this.valuethree == 0) {
-        this.form.transmembrane_pressure = Math.ceil(
-          Math.round(this.form.transmembrane_pressure * 7.5)
-        );
-        this.valuethree = 1;
-        return false;
-      }
-      if (this.valuethree == 1) {
-        this.form.transmembrane_pressure = Math.ceil(
-          Math.round(this.form.transmembrane_pressure / 7.5)
-        );
-        this.valuethree = 0;
-        return false;
-      }
-    },
     isShow(name) {
       var filedList = store.getters.xt_user.fileds;
       for (let i = 0; i < filedList.length; i++) {
@@ -782,7 +721,7 @@ export default {
       this.cancelEditAction();
     },
     show() {
-      this.getPermission();
+      this.getPermission()
       this.visible = true;
     },
     hide() {
@@ -839,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 = "";
@@ -855,10 +797,10 @@ export default {
         this.$message.error("请选择一条监测记录");
         return;
       }
-      this.creator = this.table_current_row.creator;
-      console.log(this.table_current_row);
-      console.log(this.table_current_row.creator);
-      console.log(this.creator);
+      this.creator = this.table_current_row.creator
+      console.log( this.table_current_row)
+      console.log( this.table_current_row.creator)
+      console.log(this.creator)
       this.setEditMonitor(this.table_current_row);
       this.$refs.table.setCurrentRow(null);
       this.edit = true;
@@ -897,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 = "";
@@ -959,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;
@@ -1044,118 +994,126 @@ 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);
 
-      let mode = "1";
-      if (this.form.id > 0) {
-        mode = "2";
-        if (
-          this.creator > 0 &&
-          this.creator != this.$store.getters.xt_user.user.id
-        ) {
-          mode = "3";
-        }
+
+      let mode = "1"
+       if(this.form.id > 0){
+         mode = "2"
+         if(this.creator > 0 && this.creator!= this.$store.getters.xt_user.user.id){
+          mode = "3"
+         }
       }
-      editMonitor(this.patient_id, this.schedule_date, this.form, mode).then(
-        rs => {
-          var resp = rs.data;
-          if (resp.state == 1) {
-            var monitor = resp.data.monitor;
-            if (this.isAdd) {
-              this.monitors.unshift(monitor);
-              this.monitors.sort((a, b) => b.operate_time - a.operate_time);
-              this.monitors.reverse();
-            } else {
-              for (let index = 0; index < this.monitors.length; index++) {
-                const m = this.monitors[index];
-                if (m.id == monitor.id) {
-                  for (const key in monitor) {
-                    m[key] = monitor[key];
-                  }
-                  break;
+      editMonitor(this.patient_id, this.schedule_date, this.form,mode).then(rs => {
+        var resp = rs.data;
+        if (resp.state == 1) {
+          var monitor = resp.data.monitor;
+          if (this.isAdd) {
+            this.monitors.unshift(monitor);
+            this.monitors.sort((a, b) => b.operate_time - a.operate_time);
+            this.monitors.reverse();
+          } else {
+            for (let index = 0; index < this.monitors.length; index++) {
+              const m = this.monitors[index];
+              if (m.id == monitor.id) {
+                for (const key in monitor) {
+                  m[key] = monitor[key];
                 }
+                break;
               }
             }
-            this.reset();
-          } else {
-            this.form.systolic_bp =
-              parseFloat(this.form.systolic_bp) == NaN
-                ? 0
-                : parseFloat(this.form.systolic_bp);
-            this.form.diastolic_bp =
-              parseFloat(this.form.diastolic_bp) == NaN
-                ? 0
-                : parseFloat(this.form.diastolic_bp);
-            this.form.temperature =
-              parseFloat(this.form.temperature) == NaN
-                ? 0
-                : parseFloat(this.form.temperature);
-            this.form.pulse_frequency =
-              parseFloat(this.form.pulse_frequency) == NaN
-                ? 0
-                : parseFloat(this.form.pulse_frequency);
-            this.form.breathing_rated =
-              parseFloat(this.form.breathing_rated) == NaN
-                ? 0
-                : parseFloat(this.form.breathing_rated);
-            this.form.blood_flow_volume =
-              parseFloat(this.form.blood_flow_volume) == NaN
-                ? 0
-                : parseFloat(this.form.blood_flow_volume);
-            this.form.venous_pressure =
-              parseFloat(this.form.venous_pressure) == NaN
-                ? 0
-                : parseFloat(this.form.venous_pressure);
-            this.form.transmembrane_pressure =
-              parseFloat(this.form.transmembrane_pressure) == NaN
-                ? 0
-                : parseFloat(this.form.transmembrane_pressure);
-            this.form.ultrafiltration_volume =
-              parseFloat(this.form.ultrafiltration_volume) == NaN
-                ? 0
-                : parseFloat(this.form.ultrafiltration_volume);
-            this.form.ultrafiltration_rate =
-              parseFloat(this.form.ultrafiltration_rate) == NaN
-                ? 0
-                : parseFloat(this.form.ultrafiltration_rate);
-            this.form.arterial_pressure =
-              parseFloat(this.form.arterial_pressure) == NaN
-                ? 0
-                : parseFloat(this.form.arterial_pressure);
-            this.form.sodium_concentration =
-              parseFloat(this.form.sodium_concentration) == NaN
-                ? 0
-                : parseFloat(this.form.sodium_concentration);
-            this.form.dialysate_temperature =
-              parseFloat(this.form.dialysate_temperature) == NaN
-                ? 0
-                : parseFloat(this.form.dialysate_temperature);
-            this.form.replacement_rate =
-              parseFloat(this.form.replacement_rate) == NaN
-                ? 0
-                : parseFloat(this.form.replacement_rate);
-            this.form.displacement_quantity =
-              parseFloat(this.form.displacement_quantity) == NaN
-                ? 0
-                : parseFloat(this.form.displacement_quantity);
-            this.form.conductivity =
-              parseFloat(this.form.conductivity) == NaN
-                ? 0
-                : parseFloat(this.form.conductivity);
-            this.form.displacement_flow_quantity =
-              parseFloat(this.form.displacement_flow_quantity) == NaN
-                ? 0
-                : parseFloat(this.form.displacement_flow_quantity);
+          }
+          this.reset();
+        } else {
+          this.form.systolic_bp =
+            parseFloat(this.form.systolic_bp) == NaN
+              ? 0
+              : parseFloat(this.form.systolic_bp);
+          this.form.diastolic_bp =
+            parseFloat(this.form.diastolic_bp) == NaN
+              ? 0
+              : parseFloat(this.form.diastolic_bp);
+          this.form.temperature =
+            parseFloat(this.form.temperature) == NaN
+              ? 0
+              : parseFloat(this.form.temperature);
+          this.form.pulse_frequency =
+            parseFloat(this.form.pulse_frequency) == NaN
+              ? 0
+              : parseFloat(this.form.pulse_frequency);
+          this.form.breathing_rated =
+            parseFloat(this.form.breathing_rated) == NaN
+              ? 0
+              : parseFloat(this.form.breathing_rated);
+          this.form.blood_flow_volume =
+            parseFloat(this.form.blood_flow_volume) == NaN
+              ? 0
+              : parseFloat(this.form.blood_flow_volume);
+          this.form.venous_pressure =
+            parseFloat(this.form.venous_pressure) == NaN
+              ? 0
+              : parseFloat(this.form.venous_pressure);
+          this.form.transmembrane_pressure =
+            parseFloat(this.form.transmembrane_pressure) == NaN
+              ? 0
+              : parseFloat(this.form.transmembrane_pressure);
+          this.form.ultrafiltration_volume =
+            parseFloat(this.form.ultrafiltration_volume) == NaN
+              ? 0
+              : parseFloat(this.form.ultrafiltration_volume);
+          this.form.ultrafiltration_rate =
+            parseFloat(this.form.ultrafiltration_rate) == NaN
+              ? 0
+              : parseFloat(this.form.ultrafiltration_rate);
+          this.form.arterial_pressure =
+            parseFloat(this.form.arterial_pressure) == NaN
+              ? 0
+              : parseFloat(this.form.arterial_pressure);
+          this.form.sodium_concentration =
+            parseFloat(this.form.sodium_concentration) == NaN
+              ? 0
+              : parseFloat(this.form.sodium_concentration);
+          this.form.dialysate_temperature =
+            parseFloat(this.form.dialysate_temperature) == NaN
+              ? 0
+              : parseFloat(this.form.dialysate_temperature);
+          this.form.replacement_rate =
+            parseFloat(this.form.replacement_rate) == NaN
+              ? 0
+              : parseFloat(this.form.replacement_rate);
+          this.form.displacement_quantity =
+            parseFloat(this.form.displacement_quantity) == NaN
+              ? 0
+              : parseFloat(this.form.displacement_quantity);
+          this.form.conductivity =
+            parseFloat(this.form.conductivity) == NaN
+              ? 0
+              : parseFloat(this.form.conductivity);
+          this.form.displacement_flow_quantity =
+            parseFloat(this.form.displacement_flow_quantity) == NaN
+              ? 0
+              : parseFloat(this.form.displacement_flow_quantity);
 
-            this.form.ktv =
-              parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
+          this.form.heparin =
+            parseFloat(this.form.heparin) == NaN
+              ? 0
+              : parseFloat(this.form.heparin);
 
-            this.$message.error(resp.msg);
-          }
+          this.form.ktv =
+            parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
+
+
+          this.$message.error(resp.msg);
         }
-      );
+      });
     },
 
     symptomTextareaBlur: function() {
@@ -1215,19 +1173,16 @@ export default {
         type: "warning"
       })
         .then(() => {
-          let mode = "4";
-          if (
-            this.table_current_row.creator > 0 &&
-            this.table_current_row.creator !=
-              this.$store.getters.xt_user.user.id
-          ) {
-            mode = "5";
+          let mode = "4"
+          if(this.table_current_row.creator > 0 && this.table_current_row.creator != this.$store.getters.xt_user.user.id){
+            mode = "5"
           }
 
           const params = {
             patient_id: this.patient_id,
             record_id: this.table_current_row.id,
             mode: mode
+
           };
 
           postDelMonitorInfo(params).then(response => {
@@ -1242,14 +1197,14 @@ export default {
                 }
               }
               this.$message.success("删除成功");
+
             }
           });
         })
         .catch(() => {});
     },
     getPermission() {
-      request
-        .get("/api/func_per/get", {
+        request.get("/api/func_per/get", {
           params: {
             create_url: "/api/dislysis/monitor/edit?mode=1",
             modify_url: "/api/dislysis/monitor/edit?mode=2",
@@ -1258,23 +1213,22 @@ export default {
             del_other_url: "/api/dialysis/monitor/del?mode=5",
             module: 7
           }
-        })
-        .then(res => {
-          console.log(res);
+        }).then(res => {
+          console.log(res)
           if (res.data.state == 0) {
-            this.hasPermission = false;
+            this.hasPermission = false
           } else if (res.data.state == 1) {
-            this.is_has_create = res.data.data.is_has_create;
-            this.is_has_exce = res.data.data.is_has_exce;
-            this.is_has_check = res.data.data.is_has_check;
-            this.is_has_modify = res.data.data.is_has_modify;
-            this.is_has_modify_other = res.data.data.is_has_modify_other;
-            this.is_has_modify_exce = res.data.data.is_has_modify_exce;
-            this.is_has_del = res.data.data.is_has_del;
-            this.is_has_del_other = res.data.data.is_has_del_other;
+            this.is_has_create = res.data.data.is_has_create
+            this.is_has_exce = res.data.data.is_has_exce
+            this.is_has_check = res.data.data.is_has_check
+            this.is_has_modify = res.data.data.is_has_modify
+            this.is_has_modify_other = res.data.data.is_has_modify_other
+            this.is_has_modify_exce = res.data.data.is_has_modify_exce
+            this.is_has_del = res.data.data.is_has_del
+            this.is_has_del_other = res.data.data.is_has_del_other
           }
-        });
-    }
+        })
+      }
   }
 };
 </script>
@@ -1332,7 +1286,7 @@ export default {
 .el-table__body-wrapper::-webkit-scrollbar {
   height: 20px;
 }
-.dialog_box .current-box-class .current-row {
+.dialog_box .current-box-class .current-row{
   background: #87ceff;
 }
 .dialog_box tr:hover > td {

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/DialysisPrintOrderTen.vue

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

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

@@ -1383,7 +1383,7 @@
                   </tr> -->
                   <tr>
                     <td width="70">拔针压迫:</td>
-                    <td width="350">
+                    <td width="300">
                       <div style="display:flex;justify-content:space-between;">
                         <label-box
                           showValue="自己压迫"
@@ -1405,12 +1405,6 @@
                             afterdialysis.hemostasis_opera == 1 ? true : false
                           "
                         ></label-box>
-                        <label-box
-                          showValue="内瘘止血带"
-                          :isChecked="
-                            afterdialysis.hemostasis_opera == 4 ? true : false
-                          "
-                        ></label-box>
                       </div>
                     </td>
                     <td width="50"></td>
@@ -1669,24 +1663,24 @@
                         ></label-box>
                       </div>
                     </td>
-                    <!--<td width="80"></td>-->
-                    <!--<td width="60">管路:</td>-->
-                    <!--<td width="220">-->
-                      <!--<div style="display:flex;justify-content:space-between;">-->
-                        <!--<label-box showValue="无" :isChecked="-->
-                            <!--afterdialysis.channel == 1 ? true : false-->
-                          <!--"></label-box>-->
-                        <!--<label-box showValue="+" :isChecked="-->
-                            <!--afterdialysis.channel == 2 ? true : false-->
-                          <!--"></label-box>-->
-                        <!--<label-box showValue="+ +" :isChecked="-->
-                            <!--afterdialysis.channel == 3  ? true : false-->
-                          <!--"></label-box>-->
-                        <!--<label-box showValue="+ + +" :isChecked="-->
-                            <!--afterdialysis.channel == 4 ? true : false-->
-                          <!--"></label-box>-->
-                      <!--</div>-->
-                    <!--</td>-->
+                    <td width="80"></td>
+                    <td width="60">管路:</td>
+                    <td width="220">
+                      <div style="display:flex;justify-content:space-between;">
+                        <label-box showValue="无" :isChecked="
+                            afterdialysis.channel == 1 ? true : false
+                          "></label-box>
+                        <label-box showValue="+" :isChecked="
+                            afterdialysis.channel == 2 ? true : false
+                          "></label-box>
+                        <label-box showValue="+ +" :isChecked="
+                            afterdialysis.channel == 3  ? true : false
+                          "></label-box>
+                        <label-box showValue="+ + +" :isChecked="
+                            afterdialysis.channel == 4 ? true : false
+                          "></label-box>
+                      </div>
+                    </td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -1977,9 +1971,13 @@
             <td width="30">医生</td>
             <td width="80">
               <div class="under-line">
-                &nbsp
-                <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater)}}</span >
-                <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
+                &nbsp;
+                <span v-if="doctorForm.url === ''">{{
+                  doctorForm.doctor
+                }}</span>
+                <span v-if="doctorForm.url !== ''">
+                  <img style="height:20px" :src="doctorForm.url" />
+                </span>
               </div>
             </td>
             <td width="50">治疗护士</td>

src/xt_pages/role/admin.vue

@@ -163,7 +163,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "权限管理" },
+        { path: false, name: "管理中心" },
         { path: false, name: "员工管理" }
       ],
       is_loading_admins: true,

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -10,6 +10,19 @@
         <el-input v-model="form.name" placeholder="用户姓名"></el-input>
       </el-form-item>
 
+      <el-form-item label="角色 : " prop="role" label-width="60px">
+
+           <el-checkbox-group v-model="form.role">
+            <el-checkbox label="子管理员" name="type"></el-checkbox>
+            <el-checkbox label="医生" name="type"></el-checkbox>
+            <el-checkbox label="护士" name="type"></el-checkbox>
+            <el-checkbox label="技师" name="type"></el-checkbox>
+            <el-checkbox label="运营" name="type"></el-checkbox>
+            <el-checkbox label="库存" name="type"></el-checkbox>
+            <el-checkbox label="院长" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
       <el-form-item label="职称 : ">
         <el-select v-model="form.user_type" placeholder="用户类型">
           <el-option
@@ -114,8 +127,8 @@
         },
         rules: {
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
-          name: [{ required: true, validator: checkName, trigger: 'blur' }]
-
+          name: [{ required: true, validator: checkName, trigger: 'blur' }],
+          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
         }
       }
     },

src/xt_pages/role/components/EditRole.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
-    title="新增用户"
-    width="660px"
+    title="新增员工"
+    width="750px"
     :visible.sync="visible"
     :before-close="_close"
   >
@@ -14,7 +14,7 @@
             </el-form-item>
     </el-form>-->
     <div class="chooseuser">
-      <span style="color:#303133">选择用户：</span>
+      <span style="color:#303133">选择员工：</span>
       <el-radio v-model="checked" label="1">从已有员工中选择</el-radio>
       <el-radio v-model="checked" label="2">新增员工</el-radio>
     </div>
@@ -78,6 +78,18 @@
 
           <el-input  v-model="ruleForm.phone"  maxlength="11"></el-input>
         </el-form-item>
+        <el-form-item label="角色" prop="role" label-width="70px">
+
+           <el-checkbox-group v-model="ruleForm.role">
+            <el-checkbox label="子管理员" name="type"></el-checkbox>
+            <el-checkbox label="医生" name="type"></el-checkbox>
+            <el-checkbox label="护士" name="type"></el-checkbox>
+            <el-checkbox label="技师" name="type"></el-checkbox>
+            <el-checkbox label="运营" name="type"></el-checkbox>
+            <el-checkbox label="库存" name="type"></el-checkbox>
+            <el-checkbox label="院长" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 
         <el-form-item label="职称 : " label-width="50px">
           <el-select v-model="ruleForm.user_type" placeholder="用户类型">
@@ -160,7 +172,7 @@
         rules: {
           phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
-          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
+          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }],
         },
         admin_user: [],
         is_check_admin_user: [],
@@ -202,7 +214,8 @@
           name: [
             { required: true, message: '请输入用户名字', trigger: 'blur' },
             { max: 10, message: '10个字以内', trigger: 'blur' }
-          ]
+          ],
+          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
         }
       }
     },

src/xt_pages/role/role.vue

@@ -161,7 +161,7 @@ export default {
   data: function() {
     return {
       crumbs: [
-        { path: false, name: "权限管理" },
+        { path: false, name: "管理中心" },
         { path: false, name: "角色管理" }
       ],
       loading_roles: true,

src/xt_pages/workforce/remind_print.vue

@@ -125,6 +125,7 @@
 
       getScheduleWeekDay({week_type: this.week_type}).then(rs => {
         var resp = rs.data
+        console.log(resp)
         if (resp.state == 1) {
           this.scheduleData = resp.data.schdules
         } else {