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

src/api/data.js

 }
 
 export function updateChildConfig(params) {
+  console.log('params', params)
   return request({
     url: '/api/updatechildconfig',
     method: 'post',
   })
 }
 
-
-export function updateFieldIsShow(id,is_show) {
+export function updateFieldIsShow(id, is_show) {
   return request({
-    url: '/api/filed/show?id='+id+'&is_show='+is_show,
-    method: 'post',
+    url: '/api/filed/show?id=' + id + '&is_show=' + is_show,
+    method: 'post'
   })
 }
 
-
-
-
-
 export function postPrintTemplate(params) {
   return request({
-    url: '/api/print/template/commit?template_id='+params,
-    method: 'post',
+    url: '/api/print/template/commit?template_id=' + params,
+    method: 'post'
   })
 }
 
 export function getPrintTemplate() {
   return request({
     url: '/api/print/template/get',
-    method: 'get',
+    method: 'get'
   })
 }
-

src/views/layout/components/Navbar.vue

 <template>
   <div class="top-nav">
-    <div class="nav-logo">
+    <!-- <div class="nav-logo">
       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
     </div>
-    <!-- <el-menu class="navbar" mode="horizontal">
+    <el-menu class="navbar" mode="horizontal">
       <div>
         <span> {{this.$store.getters.xt_user.org.org_name}}
         </span>
         <modify-org-info-dialog ref="modify_org_info_dialog"></modify-org-info-dialog>
 
       </div>
-    </el-menu> -->
-    <div style="display:flex;align-items: center;justify-content: space-between; width:96%">
-      <div class="dropdownBox">
-        <el-dropdown trigger="click" @command="handleOrgCommand">
-          <span class="el-dropdown-link">
-            {{ org_name }}
-            <i class="el-icon-arrow-down el-icon--right"></i>
-          </span>
+    </el-menu>-->
+    <div class="dropdownBox">
+      <el-dropdown trigger="click" @command="handleOrgCommand">
+        <span class="el-dropdown-link">
+          {{ org_name }}
+          <i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item
+            v-for="(item, index) in orgs"
+            :key="index"
+            :command="item.id"
+            >{{ item.org_name }}</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <div class="navRight">
+      <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
+      <div style="color: #b2b2b3;">通知中心</div> -->
+      <div class="right-menu">
+        <el-dropdown
+          class="avatar-container right-menu-item"
+          trigger="click"
+          @command="handleCommand"
+        >
+          <div class="avatar-wrapper">
+            <img class="user-avatar" :src="avater" />
+            <span class="user-title">{{
+              this.$store.getters.xt_user.user.user_name
+            }}</span>
+            <i class="el-icon-caret-bottom"></i>
+          </div>
           <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="modifyUserInfoAction"
+              >个人信息</el-dropdown-item
+            >
             <el-dropdown-item
-              v-for="(item, index) in orgs"
-              :key="index"
-              :command="item.id"
-              >{{ item.org_name }}</el-dropdown-item
+              command="modifyOrgInfoAction"
+              v-if="is_super_admin === 1"
+              >机构信息</el-dropdown-item
             >
+            <el-dropdown-item divided command="logout">{{
+              $t("navbar.logOut")
+            }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
+
+        <modify-user-info-dialog
+          ref="modify_user_info_dialog"
+        ></modify-user-info-dialog>
+        <modify-org-info-dialog
+          ref="modify_org_info_dialog"
+        ></modify-org-info-dialog>
       </div>
-      <div class="navRight">
-        <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
-        <div style="color: #b2b2b3;">通知中心</div> -->
-        <div class="right-menu">
-          <el-dropdown
-            class="avatar-container right-menu-item"
-            trigger="click"
-            @command="handleCommand"
-          >
-            <div class="avatar-wrapper">
-              <img class="user-avatar" :src="avater" />
-              <span class="user-title">{{
-                this.$store.getters.xt_user.user.user_name
-              }}</span>
-              <i class="el-icon-caret-bottom"></i>
-            </div>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="modifyUserInfoAction"
-                >个人信息</el-dropdown-item
-              >
-              <el-dropdown-item command="modifyOrgInfoAction"
-                >机构信息</el-dropdown-item
-              >
-              <el-dropdown-item divided command="logout">{{
-                $t("navbar.logOut")
-              }}</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-
-          <modify-user-info-dialog
-            ref="modify_user_info_dialog"
-          ></modify-user-info-dialog>
-          <modify-org-info-dialog
-            ref="modify_org_info_dialog"
-          ></modify-org-info-dialog>
-        </div>
-        <div>
-          <i class="el-icon-question"></i>
-          <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
-        </div>
+      <div>
+        <i class="el-icon-question"></i>
+        <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
       </div>
     </div>
   </div>
     return {
       orgs: [],
       org_id: this.$store.getters.xt_user.org.id,
-      org_name: this.$store.getters.xt_user.org.org_name
-
+      org_name: this.$store.getters.xt_user.org.org_name,
+      is_super_admin: 0
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
     };
   },
         console.log("org", this.orgs);
         var creator = response.data.data.creator;
         console.log("creator", creator);
+        var admin = response.data.data.admin;
+        console.log("admin", admin);
+        this.is_super_admin = admin.is_super_admin;
         for (let i = 0; i < this.orgs.length; i++) {
           if (this.orgs[i].id == this.org_id) {
             this.org_name = this.orgs[i].org_name;
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .top-nav {
-  width: 100%;
   background: #409eff;
   position: fixed;
   top: 0;
-  // left: 150px;
+  left: 150px;
   right: 0;
   z-index: 1000;
   height: 50px;
   display: flex;
   align-items: center;
-  // justify-content: space-between;
+  justify-content: space-between;
   color: #fff;
   .dropdownBox {
     margin-left: 10px;

src/xt_pages/data/components/table.vue

   },
   created() {
     this.getList();
-    console.log("list是-----------", this.list);
   },
   methods: {
     fieldChange: function(newValue) {

src/xt_pages/data/components/tableson.vue

             <el-form-item label="排序" prop="order">
               <el-input
                 type="age"
-                v-model.number="temp.order"
+                v-model.number="temp.orders"
                 placeholder="请输入排序值，数值越大，排序越靠前"
               ></el-input>
             </el-form-item>
         name: "",
         field_name: undefined,
         value: "",
-        remark: ""
+        remark: "",
+        orders: 0
       },
       dialogFormVisible: false,
       dialogStatus: "",
         name: "",
         field_name: undefined,
         value: "",
-        remark: ""
+        remark: "",
+        orders: ""
       };
     });
   },
         name: "",
         field_name: undefined,
         value: "",
-        remark: ""
+        remark: "",
+        orders: 0
       };
     },
     handleCreate() {

src/xt_pages/dialysis/bloodPresssWatch.vue

       this.getSchedualPatientList();
     },
     batchPrintAction: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
       // 模板ID为6
       var sch_ids = [];
 
       }
     },
     batchPrintActionOne: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
       var sch_ids = [];
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].sch_id);
       }
-      console.log("第二个", sch_ids);
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
       if (this.template_id == 2 || this.template_id == 0) {
         this.$router.push({ path: "/dialysis/print/batch/otherone" });
       }
     },
     batchPrintActionTwo: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
       var sch_ids = [];
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].sch_id);

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

 
           <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

       <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>
         }
       }
     },
-    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

             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">
               {{
             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">
               {{
             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 : "" }}
             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 : "" }}
             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">
               {{
             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">
               {{
             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">
               {{
               <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>
             </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"> -->
         displacement_quantity: "", // 置换量
         conductivity: "", // 电导度
         displacement_flow_quantity: "", // 置换液流量
+        heparin:"", //肝素用量余量
         ktv: "", // KT/V
         symptom: "", // 病情变化
         dispose: "", // 处理
         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 = "";
         this.form.displacement_quantity = "";
         this.form.conductivity = "";
         this.form.displacement_flow_quantity = "";
+        this.form.heparin = "";
+
         this.form.ktv = "";
         this.form.symptom = "";
         this.form.dispose = "";
           ? 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;
           ? 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);
               ? 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

         <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>
         <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

       <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
         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>
 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,
         });
       } 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

                           </span>
                     </div>
                   </td>
+
+
                   <td>
                   <span
                     v-if="setAdminUserES(monitor.monitoring_nurse) == ''"

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

                   </tr> -->
                   <tr>
                     <td width="70">拔针压迫:</td>
-                    <td width="350">
+                    <td width="300">
                       <div style="display:flex;justify-content:space-between;">
                         <label-box
                           showValue="自己压迫"
                             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>
                         ></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>
             <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>