添加打印模版和PC端自动扣减

build/utils.js

@@ -47,7 +47,8 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
-        fallback: 'vue-style-loader'
+        fallback: 'vue-style-loader',
+        publicPath: '../../'
       })
     } else {
       return ['vue-style-loader'].concat(loaders)

package-lock.json

@@ -469,8 +469,8 @@
     },
     "async-validator": {
       "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
-      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+      "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
+      "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
       "requires": {
         "babel-runtime": "6.x"
       }
@@ -3179,8 +3179,8 @@
     },
     "deepmerge": {
       "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
+      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
+      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
     },
     "define-properties": {
       "version": "1.1.3",
@@ -3507,9 +3507,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.7.2.tgz",
-      "integrity": "sha512-Exh9QTkm9gwMMPzg1TyaTlBKyr3k4K9XcC5vl0A/mneDvJX//RsURGuOWsCNDVQMdhh5h9e+W5icosh+pKfbCg==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.12.0.tgz",
+      "integrity": "sha1-qJO8Ea5Pfbt+nVQWBvI+ZD8THuQ=",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -7928,7 +7928,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "normalize.css": {
@@ -11880,8 +11880,8 @@
     },
     "resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+      "resolved": "http://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
     },
     "resolve": {
       "version": "1.10.0",
@@ -13536,8 +13536,8 @@
     },
     "throttle-debounce": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
-      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
+      "resolved": "http://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
     },
     "through": {
       "version": "2.3.8",

package.json

@@ -45,7 +45,7 @@
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "^2.7.2",
+    "element-ui": "^2.12.0",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",

src/api/data.js

@@ -47,3 +47,21 @@ export function updateFieldIsShow(id,is_show) {
     method: 'post',
   })
 }
+
+
+
+
+
+export function postPrintTemplate(params) {
+  return request({
+    url: '/api/print/template/commit?template_id='+params,
+    method: 'post',
+  })
+}
+
+export function getPrintTemplate() {
+  return request({
+    url: '/api/print/template/get',
+    method: 'get',
+  })
+}

src/icons/svg/system.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569292702427" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4856" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1017.377674 456.010825c-3.988848-22.373567-25.431206-44.900629-47.617507-49.979298l-16.45067-3.802606c-39.015595-11.780301-73.665767-37.860283-95.66685-75.9416-22.185278-38.356586-27.235294-81.920778-17.633612-121.807207l4.860704-15.611559c6.66991-21.719674-1.994424-51.633984-19.256576-66.345034 0 0-15.643282-13.20986-59.709917-38.699394-44.060495-25.457812-63.191204-32.410154-63.191204-32.410154-21.37789-7.726985-51.54291-0.37146-66.99688 16.32992l-11.594059 12.462846c-29.665647 28.045753-69.645197 45.215808-113.584941 45.215808-44.152593 0-84.258009-17.294898-113.954355-45.526893L385.393999 67.804269c-15.393595-16.669658-45.591361-24.056905-66.967204-16.325827 0 0-19.131733 6.915503-63.290465 32.405037-43.996027 25.490557-59.546188 38.639019-59.546188 38.639019-17.326621 14.71105-26.019607 44.500517-19.289322 66.313312l4.827959 15.769149c9.474792 39.853683 4.364401 83.325777-17.633612 121.653711-22.063505 38.235836-57.056484 64.380286-96.228645 76.030627L51.186288 405.967058c-22.090111 5.050016-43.564191 27.608801-47.553039 49.950645 0 0-3.613294 20.09978-3.613294 71.109548 0 51.012837 3.613294 71.019497 3.613294 71.019497 4.02057 22.434965 25.461905 44.933375 47.553039 50.105165l15.708773 3.492544c39.325657 11.713786 74.411757 37.95238 96.600105 76.343759 22.091134 38.327934 27.14115 81.892125 17.573237 121.779577l-4.767584 15.579837c-6.730285 21.686928 1.962701 51.601238 19.349697 66.309218 0 0 15.551184 13.21293 59.644425 38.702464 44.093241 25.551956 63.164598 32.411177 63.164598 32.411177 21.408589 7.726985 51.509141 0.311085 66.967204-16.269545l11.06194-11.902074c29.697369-28.355815 69.829392-45.617967 114.047476-45.617967 44.189432 0 84.387969 17.386996 114.210181 45.617967l0.027629 0 10.940167 11.902074c15.45397 16.58063 45.493124 23.99653 66.930365 16.269545 0 0 19.071358-6.979972 63.321164-32.411177 44.002167-25.489534 59.579957-38.702464 59.579957-38.702464 17.328667-14.70798 25.928532-44.496423 19.323091-66.309218l-4.860704-16.080234c-9.349949-39.761586-4.239558-83.139535 17.633612-121.279181 22.25077-38.452777 57.277518-64.569598 96.538707-76.343759l0-0.065492 15.705704-3.612271c22.187325-5.051039 43.62866-27.545356 47.615461-49.983391 0 0 3.613294-20.068058 3.613294-71.109548C1020.990968 476.078883 1017.377674 456.010825 1017.377674 456.010825zM510.507508 691.592284c-90.588181 0-164.067706-73.665767-164.067706-164.532287 0-90.741677 73.478502-164.342975 164.067706-164.342975 90.584088 0 163.970492 73.633021 163.970492 164.467819C674.478 618.052384 601.091596 691.592284 510.507508 691.592284z" p-id="4857"></path></svg>

src/lang/zh.js

@@ -156,6 +156,9 @@ export default {
 
     showconfig:'显示配置',
     user_detail:'使用明细',
+    systemManage:'系统管理',
+    printTemplate:'打印模版',
+
 
   },
   navbar: {

src/router/index.js

@@ -14,6 +14,9 @@ import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'
 import service from './modules/service'
 import org from './modules/org'
+import systems from './modules/systems'
+
+
 
 Vue.use(Router)
 
@@ -92,10 +95,11 @@ var _asy_router_map = [
   dialysis,
   stock,
   qcd,
-  data_dict,
+  // data_dict,
   device,
-  role,
-  org
+  // role,
+  org,
+  systems,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/modules/data_dict.js

@@ -10,7 +10,8 @@ export default {
     title: 'data_dictionary',
     icon: 'excel'
   },
-  children: [{
+  children: [
+    {
     path: '/data/dictionary',
     component: () => import('@/xt_pages/data/index'),
     name: 'dictionary',

src/router/modules/systems.js

@@ -0,0 +1,109 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/system',
+  component: Layout,
+  redirect: '/role/admin/manage',
+  name: 'system',
+  alwaysShow: true,
+  meta: {
+    title: 'systemManage',
+    icon: 'system'
+  },
+  children: [{
+    path: '/role/admin/manage',
+    component: () => import('@/xt_pages/role/admin'),
+    name: 'adminManage',
+    meta: {
+      title: 'adminManage'
+    }
+  },
+    {
+      path: '/role/manage',
+      component: () => import('@/xt_pages/role/role'),
+      name: 'roleManage',
+      meta: {
+        title: 'roleManage'
+      }
+    },
+    {
+      path: '/role/admin/create',
+      component: () => import('@/xt_pages/role/CreateAdmin'),
+      name: 'addAdmin',
+      meta: {
+        title: 'addAdmin',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {
+      path: '/role/admin/edit',
+      component: () => import('@/xt_pages/role/EditAdmin'),
+      name: 'editAdmin',
+      meta: {
+        title: 'editAdmin',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {
+      path: '/role/perview',
+      component: () => import('@/xt_pages/role/EditPerview'),
+      name: 'setupPerview',
+      meta: {
+        title: 'setupPerview',
+        noCache: true
+      },
+      hidden: true,
+      is_menu: false
+    },
+    {
+      path: '/role/admin/specialpermission',
+      component: () => import('@/xt_pages/role/special_permission'),
+      name: 'special_permission_manage',
+      meta: {
+        title: 'special_permission_manage'
+      }
+    },
+    {
+      path: '/data/dictionary',
+      component: () => import('@/xt_pages/data/index'),
+      name: 'dictionary',
+      meta: {
+        title: 'data_dictionary'
+      }
+    },
+    {
+      path: '/data/template',
+      component: () => import('@/xt_pages/data/template'),
+      name: 'template',
+      meta: {
+        title: 'template'
+      }
+    },
+    {
+      path: '/data/druguse',
+      component: () => import('@/xt_pages/data/druguseTemplate'),
+      name: 'druguse',
+      meta: {
+        title: 'druguse'
+      }
+    }, {
+      path: '/data/showconfig',
+      component: () => import('@/xt_pages/data/showConfig'),
+      name: 'showconfig',
+      meta: {
+        title: 'showconfig'
+      }
+    },{
+      path: '/data/print',
+      component: () => import('@/xt_pages/data/printTemplate'),
+      name: 'printTemplate',
+      meta: {
+        title: 'printTemplate'
+      }
+    }
+  ]
+}

src/xt_pages/data/druguseTemplate.vue

@@ -549,7 +549,7 @@
                 </el-table-column>
                 <el-table-column prop="blood_flow_volume" align="center" label="执行频率">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
+                    <span v-if="scope.row.parent_id == 0">{{scope.row.execution_frequency}}</span>
                   </template>
                 </el-table-column>
               </el-table>

src/xt_pages/data/printTemplate.vue

@@ -0,0 +1,144 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container" style="text-align: center">
+     <p style="margin-top: 10px;margin-bottom: 30px">请选择你需要打印的血液透析护理记录单样式</p>
+      <el-row :gutter="20" type="flex" justify="center">
+        <el-col :span="6" style="text-align: center">
+          <div>
+            <el-tooltip class="item" effect="dark" :hide-after='2000' content="点击查看大图" placement="top-start">
+              <el-image
+                style="width: 200px; height: 200px"
+                :src="require('@/assets/home/1.jpg')"
+                :preview-src-list="imgs_one"
+              ></el-image>
+            </el-tooltip>
+
+          </div>
+          <el-radio v-model="radio" label="1" @change="change">模版一</el-radio>
+        </el-col>
+        <el-col :span="6" style="margin-left: 100px;margin-right: 100px;text-align: center">
+          <div>
+            <el-tooltip class="item" effect="dark" content="点击查看大图" placement="top-start" :hide-after='2000'>
+
+              <el-image
+                style="width: 200px; height: 200px"
+                :src="require('@/assets/home/2.jpg')"
+                :preview-src-list="imgs_two"
+              ></el-image>
+            </el-tooltip>
+
+          </div>
+          <el-radio v-model="radio" label="2" @change="change">模版二</el-radio>
+        </el-col>
+        <el-col :span="6" style="text-align: center">
+          <div class="demo-image__preview">
+            <el-tooltip class="item" effect="dark" content="点击查看大图" placement="top-start" :hide-after='2000'>
+
+              <el-image
+                style="width: 200px; height: 200px"
+                :src="require('@/assets/home/5.jpg')"
+                :preview-src-list="imgs_five"
+              ></el-image>
+            </el-tooltip>
+
+          </div>
+          <el-radio v-model="radio" label="5" @change="change">模版三</el-radio>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getPrintTemplate, postPrintTemplate } from '@/api/data'
+
+  export default {
+    name: 'printTemplate',
+    components: { BreadCrumb },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '系统管理' },
+          { path: 'data/print', name: '打印模版' }
+        ],
+        imgUrl_One: require('@/assets/home/1.jpg'),
+        imgUrl_Two: require('@/assets/home/2.jpg'),
+        imgUrl_Five: require('@/assets/home/5.jpg'),
+
+        url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+        imgs_one: [
+          'https://images.shengws.com/template_one.jpg'
+        ],
+        imgs_two: [
+          'https://images.shengws.com/template_two.jpg'
+
+        ],
+        imgs_five: [
+          'https://images.shengws.com/template_five.jpg'
+
+        ],
+        delay:500,
+        radio: 0,
+        tempRadio: 0
+      }
+    }, methods: {
+      change: function(val) {
+
+        this.$confirm('是否切换模版', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'info'
+        }).then(() => {
+          postPrintTemplate(val).then(response => {
+            if (response.data.state == 1) {
+              var template_id = response.data.data.template_id
+              this.radio = template_id.toString()
+              this.tempRadio = template_id.toString()
+              //同步
+              this.$message({
+                type: 'success',
+                message: '切换成功'
+              })
+
+            }
+          })
+        }).catch(() => {
+          this.radio = this.tempRadio
+        })
+
+      }
+    }, created() {
+      getPrintTemplate().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          var template = response.data.data.template
+          this.radio = template.template_id.toString()
+          this.tempRadio = template.template_id.toString()
+        }
+      })
+    }
+  }
+</script>
+
+<style scoped>
+  .el-row {
+    margin-bottom: 20px;
+
+  &
+  :last-child {
+    margin-bottom: 0;
+  }
+
+  }
+  .el-col {
+    border-radius: 4px;
+  }
+
+
+</style>

src/xt_pages/dialysis/batch_print/batch_print_order_five_one.vue

@@ -500,8 +500,8 @@
                     </div>
                     <div class="inline_block" style="margin-left:30px;">
                       透析期间进食：
-                      <check-box text="无" :checked="record.assessment_after_dislysis.is_eat == 1?true:false"></check-box>
-                      <check-box text="有" :checked="record.assessment_after_dislysis.is_eat == 2?true:false"></check-box>
+                      <check-box text="无" :checked="record.assessment_after_dislysis&&record.assessment_after_dislysis.is_eat == 1?true:false"></check-box>
+                      <check-box text="有" :checked="record.assessment_after_dislysis&&record.assessment_after_dislysis.is_eat == 2?true:false"></check-box>
                     </div>
                     <!--<div class="inline_block" style="margin-left: 30px;">-->
                     <!--实际超滤量：-->

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -151,6 +151,7 @@
 import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getPrintTemplate } from '@/api/data'
 
 export default {
   name: "Patient",
@@ -175,7 +176,7 @@ export default {
         { value: 2, label: "下午" },
         { value: 3, label: "晚上" }
       ],
-      template_id : 1,
+      template_id : 0,
 
       partitionType: 0,
 
@@ -244,9 +245,21 @@ export default {
     this.listQuery.schedul_time = date.getTime();
     this.getAllZone();
     this.getSchedualPatientList();
-    this.template_id = this.$store.getters.xt_user.template_info.template_id;
+    this.getTemplateInfo();
+    // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
+    getTemplateInfo(){
+      getPrintTemplate().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          var template = response.data.data.template
+          this.template_id = template.template_id
+        }
+      })
+    },
     clickCurrent(val) {
       console.log(val);
       this.$router.push({
@@ -404,17 +417,17 @@ export default {
         sch_ids.push(this.selecting_schs[index].sch_id)
       }
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
-      if (this.$store.getters.xt_user.template_info.template_id == 2 ||this.$store.getters.xt_user.template_info.template_id == 0 ){
+      if (this.template_id == 2 ||this.template_id == 0 ){
         this.$router.push({ path: "/dialysis/print/batch/other" });
-      }else if(this.$store.getters.xt_user.template_info.template_id == 1) {
+      }else if(this.template_id == 1) {
         this.$router.push({ path: "/dialysis/print/batch" });
       }
-      else if(this.$store.getters.xt_user.template_info.template_id == 3) {
+      else if(this.template_id == 3) {
         this.$router.push({ path: "/dialysis/print/batch/three" });
       }
-      else if(this.$store.getters.xt_user.template_info.template_id == 4) {
+      else if(this.template_id == 4) {
         this.$router.push({ path: "/dialysis/print/batch/four" });
-      } else if (this.$store.getters.xt_user.template_info.template_id == 5  ){
+      } else if (this.template_id == 5  ){
         this.$router.push({ path: "/dialysis/print/batch/five" });
       }
     },
@@ -424,11 +437,11 @@ export default {
         sch_ids.push(this.selecting_schs[index].sch_id)
       }
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
-      if (this.$store.getters.xt_user.template_info.template_id == 2 ||this.$store.getters.xt_user.template_info.template_id == 0){
+      if (this.template_id == 2 ||this.template_id == 0){
         this.$router.push({ path: "/dialysis/print/batch/otherone" });
-      }else if(this.$store.getters.xt_user.template_info.template_id == 1) {
+      }else if(this.template_id == 1) {
         this.$router.push({ path: "/dialysis/print/batch" });
-      } else if (this.$store.getters.xt_user.template_info.template_id == 5){
+      } else if (this.template_id == 5){
         this.$router.push({ path: "/dialysis/print/batch/fiveone" });
       }
     },
@@ -438,11 +451,11 @@ export default {
         sch_ids.push(this.selecting_schs[index].sch_id)
       }
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
-      if (this.$store.getters.xt_user.template_info.template_id == 2 ||this.$store.getters.xt_user.template_info.template_id == 0 ){
+      if (this.template_id == 2 ||this.template_id == 0 ){
         this.$router.push({ path: "/dialysis/print/batch/othertwo" });
-      }else if(this.$store.getters.xt_user.template_info.template_id == 1){
+      }else if(this.template_id == 1){
         this.$router.push({ path: "/dialysis/print/batch" });
-      } else if (this.$store.getters.xt_user.template_info.template_id == 5  ){
+      } else if (this.template_id == 5  ){
         this.$router.push({ path: "/dialysis/print/batch/fivetwo" });
       }
     }

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -151,6 +151,8 @@
         </li>
       </ul>
 
+
+
     </div>
     <div class="note">备注 : <span>{{note}}</span></div>
   </div>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -53,7 +53,13 @@
 
         <div class="middleLine"></div>
 
-        <dialysis-prescription-dialog title="透析处方" ref="prescription" :patient="patient" :prescription="prescription" :solution="solution"></dialysis-prescription-dialog>
+        <dialysis-prescription-dialog title="透析处方" ref="prescription" :patient="patient" :prescription="prescription" :solution="solution"
+                                      :niprocart_info="niprocart_info" :jms_info="jms_info" :fistula_needle_set_info="fistula_needle_set_info"
+        :fistula_needle_set_16_info="fistula_needle_set_16_info"  :hemoperfusion_info="hemoperfusion_info" :dialyser_sterilised_info="dialyser_sterilised_info"
+        :filtryzer_info="filtryzer_info" :dialyzers_info="dialyzers_info" :injector_info="injector_info" :bloodlines_info="bloodlines_info"  :tubingHemodialysis_info="tubingHemodialysis_info"
+        :safe_package_info="safe_package_info" :aliquid_info="aliquid_info" :config="config"
+
+        ></dialysis-prescription-dialog>
 
         <double-check-dialog title="双人核对" ref="doubleCheck" :patient="patient" :double_check="double_check" :admin_users="admin_users" ></double-check-dialog>
 
@@ -198,6 +204,105 @@ export default {
         }
       },
 
+
+      niprocart_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      jms_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+
+      fistula_needle_set_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+
+      fistula_needle_set_16_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+
+      hemoperfusion_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      dialyser_sterilised_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      filtryzer_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      dialyzers_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      injector_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      bloodlines_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      tubingHemodialysis_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      safe_package_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      aliquid_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      config: {
+        type: Object,
+        default: () => {
+          return {id: 0}
+        }
+      },
+
+
+
+
       admin_user_map: { // {user_id: admin_user object}
         type: Object,
         default: () => {

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

@@ -9,7 +9,7 @@
     <el-form ref="dialysisPrescription" :model="dialysisPrescription" label-width="148px">
       <!-- <el-row :gutter="20"> -->
       <el-row :gutter="24">
-        <el-col :span="8"  v-if="isShows('透析模式')">
+        <el-col :span="8" v-if="isShows('透析模式')">
           <el-form-item label="透析模式： ">
             <el-select v-model="dialysisPrescription.mode_id">
               <el-option :key="0" label="请选择" :value="0"></el-option>
@@ -18,33 +18,33 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="isShows('透析时长')">
-          <el-form-item label="透析时长(h)： " >
+          <el-form-item label="透析时长(h)： ">
             <el-input type="number" v-model="dialysisPrescription.dialysis_duration_hour"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="isShows('透析时长')">
-          <el-form-item label="透析时长(min)： " >
+          <el-form-item label="透析时长(min)： ">
             <el-input type="number" v-model="dialysisPrescription.dialysis_duration_minute"></el-input>
           </el-form-item>
         </el-col>
-      <!-- </el-row>
+        <!-- </el-row>
 
-      <el-row :gutter="20"> -->
+        <el-row :gutter="20"> -->
         <el-col :span="8" v-if="isShows('血流量')">
-          <el-form-item label="血流量(ml/min)：" >
+          <el-form-item label="血流量(ml/min)：">
             <el-input type="number" v-model="dialysisPrescription.blood_flow_volume"></el-input>
           </el-form-item>
         </el-col>
 
 
         <el-col :span="8" v-if="isShows('目标超滤量')">
-          <el-form-item label="目标超滤量(L)：" >
+          <el-form-item label="目标超滤量(L)：">
             <el-input type="number" v-model="dialysisPrescription.target_ultrafiltration"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8" v-if="isShows('透析液配方')">
-          <el-form-item label="透析液配方：" >
+          <el-form-item label="透析液配方：">
             <!-- <el-input type="number" v-model="dialysisPrescription.dialysate_formulation"></el-input> -->
             <el-select v-model="dialysisPrescription.dialysate_formulation" placeholder="请选择">
               <el-option :key="0" label="请选择" :value="0"></el-option>
@@ -55,24 +55,24 @@
         </el-col>
 
 
-      <!-- </el-row>
+        <!-- </el-row>
 
-      <el-row :gutter="20"> -->
+        <el-row :gutter="20"> -->
         <el-col :span="8" v-if="isShows('透析液温度')">
-          <el-form-item label="透析液温度(°C)：" >
+          <el-form-item label="透析液温度(°C)：">
             <el-input type="number" v-model="dialysisPrescription.dialysate_temperature"></el-input>
           </el-form-item>
         </el-col>
 
 
         <el-col :span="8" v-if="isShows('置换量')">
-          <el-form-item label="置换量(L)：" >
+          <el-form-item label="置换量(L)：">
             <el-input type="number" v-model="dialysisPrescription.replacement_total"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8" v-if="isShows('抗凝剂')">
-          <el-form-item label="抗凝剂：" >
+          <el-form-item label="抗凝剂：">
             <el-select v-model="dialysisPrescription.anticoagulant" placeholder="请选择" style="width:100%;"
                        @change="changeThisAnticoagulant">
               <el-option :key="0" label="请选择" :value="0"></el-option>
@@ -82,9 +82,9 @@
             </el-select>
           </el-form-item>
         </el-col>
-      <!-- </el-row>
+        <!-- </el-row>
 
-      <el-row :gutter="20"> -->
+        <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="anticoagulant.shouji != -1&&isShows('首剂')">
           <el-form-item :label="'首剂('+anticoagulant.shouji_unit+') : '">
@@ -120,13 +120,13 @@
         </el-col>
 
 
-      <!-- </el-row>
+        <!-- </el-row>
 
 
-      <el-row :gutter="20"> -->
+        <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShows('钾')">
-          <el-form-item label="钾(mmol/L)： " >
+          <el-form-item label="钾(mmol/L)： ">
             <el-input type="number" v-model="dialysisPrescription.kalium"></el-input>
           </el-form-item>
         </el-col>
@@ -145,9 +145,9 @@
         </el-col>
 
 
-      <!-- </el-row>
+        <!-- </el-row>
 
-      <el-row :gutter="20"> -->
+        <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShows('透析器/灌流器')">
           <el-form-item label="透析器/灌流器：">
@@ -162,13 +162,13 @@
         </el-col>
 
         <el-col :span="8" v-if="isShows('葡萄糖')">
-          <el-form-item label="葡萄糖(mmol/L)：" >
+          <el-form-item label="葡萄糖(mmol/L)：">
             <el-input type="number" v-model="dialysisPrescription.glucose"></el-input>
           </el-form-item>
         </el-col>
-      <!-- </el-row>
+        <!-- </el-row>
 
-      <el-row :gutter="20"> -->
+        <el-row :gutter="20"> -->
         <el-col :span="8" v-if="isShows('透析液流量')">
           <el-form-item label="透析液流量(ml/min)：">
             <el-input type="number" v-model="dialysisPrescription.dialysate_flow"></el-input>
@@ -182,7 +182,7 @@
         <el-col :span="8" v-if="isShows('体液过多症状')">
           <el-form-item label="体液过多症状：">
             <el-select v-model="dialysisPrescription.body_fluid" placeholder="请选择" style="width:100%;"
-                       >
+            >
               <el-option :key="0" label="请选择" :value="0"></el-option>
 
               <el-option v-for="item in body_fluid_option" :label="item.name" :key="item.id"
@@ -192,10 +192,10 @@
         </el-col>
 
 
-      <!-- </el-row>
+        <!-- </el-row>
 
 
-      <el-row :gutter="20" > -->
+        <el-row :gutter="20" > -->
 
         <el-col :span="8" v-if="isShows('体液过多其他症状')">
           <el-form-item label="其他体液过多症状">
@@ -217,16 +217,15 @@
         </el-col>
 
 
-
         <el-col :span="8" v-if="isShows('透析前使用其他特殊药物')">
           <el-form-item label="使用其他特殊药物">
             <el-input v-model="dialysisPrescription.special_medicine_other"></el-input>
           </el-form-item>
         </el-col>
 
-      <!-- </el-row>
+        <!-- </el-row>
 
-      <el-row :gutter="20" > -->
+        <el-row :gutter="20" > -->
         <el-col :span="8">
           <el-form-item label="置换液：" v-if="isShows('置换液')">
 
@@ -257,13 +256,13 @@
           </el-form-item>
         </el-col>
 
-      <!-- </el-row>
-      <el-row :gutter="20" > -->
-          <el-col :span="8" v-if="isShows('实际超滤量')">
-            <el-form-item label="实际超滤量(L)">
-              <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>
-            </el-form-item>
-          </el-col>
+        <!-- </el-row>
+        <el-row :gutter="20" > -->
+        <el-col :span="8" v-if="isShows('实际超滤量')">
+          <el-form-item label="实际超滤量(L)">
+            <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>
+          </el-form-item>
+        </el-col>
 
 
         <el-col :span="8" v-if="isShows('目标KT/V')">
@@ -271,6 +270,170 @@
             <el-input v-model="dialysisPrescription.target_ktv"></el-input>
           </el-form-item>
         </el-col>
+
+
+        <!--&lt;!&ndash;透析耗材&ndash;&gt;-->
+        <!--<el-col :span="8" v-if="isShows('血液透析干粉')&&config.is_open == 1">-->
+          <!--<el-form-item label="血液透析干粉：">-->
+            <!--<el-select v-model="dialysisPrescription.niprocart" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+              <!--<el-option v-for="(option, index) in niprocart_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('一次性使用动静脉穿刺针')&&config.is_open == 1">-->
+          <!--<el-form-item label="一次性使用动静脉穿刺针：">-->
+            <!--<el-select v-model="dialysisPrescription.jms" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in jms_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('内瘘管翼状针')&&config.is_open == 1">-->
+          <!--<el-form-item label="内瘘管翼状针：">-->
+            <!--<el-select v-model="dialysisPrescription.fistula_needle_set" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in fistula_needle_set_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('内瘘管翼状针16G')&&config.is_open == 1">-->
+          <!--<el-form-item label="内瘘管翼状针16G：">-->
+            <!--<el-select v-model="dialysisPrescription.fistula_needle_set_16" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in fistula_needle_set_16_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('一次性使用血液灌流器')&&config.is_open == 1">-->
+          <!--<el-form-item label="一次性使用血液灌流器：">-->
+            <!--<el-select v-model="dialysisPrescription.hemoperfusion" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in hemoperfusion_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('空心纤维血液透析器')&&config.is_open == 1">-->
+          <!--<el-form-item label="空心纤维血液透析器：">-->
+            <!--<el-select v-model="dialysisPrescription.dialyser_sterilised" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in dialyser_sterilised_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('中空纤维透析器')&&config.is_open == 1">-->
+          <!--<el-form-item label="中空纤维透析器：">-->
+            <!--<el-select v-model="dialysisPrescription.filtryzer" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in filtryzer_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('透析器')&&config.is_open == 1">-->
+          <!--<el-form-item label="透析器：">-->
+            <!--<el-select v-model="dialysisPrescription.dialyzers" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in dialyzers_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+
+        <!--<el-col :span="8" v-if="isShows('注射器')&&config.is_open == 1">-->
+          <!--<el-form-item label="注射器：">-->
+            <!--<el-select v-model="dialysisPrescription.injector" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in injector_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+
+        <!--<el-col :span="8" v-if="isShows('体外循环血路管')&&config.is_open == 1">-->
+          <!--<el-form-item label="体外循环血路管：">-->
+            <!--<el-select v-model="dialysisPrescription.bloodlines" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in bloodlines_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+
+        <!--<el-col :span="8" v-if="isShows('血液净化补液管路(置换管)')&&config.is_open == 1">-->
+          <!--<el-form-item label="血液净化补液管路(置换管)：">-->
+            <!--<el-select v-model="dialysisPrescription.tubing_hemodialysis" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in tubingHemodialysis_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('护理包')&&config.is_open == 1">-->
+          <!--<el-form-item label="护理包：">-->
+            <!--<el-select v-model="dialysisPrescription.package" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in safe_package_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+        <!--<el-col :span="8" v-if="isShows('A液')&&config.is_open == 1">-->
+          <!--<el-form-item label="A液：">-->
+            <!--<el-select v-model="dialysisPrescription.a_liquid" placeholder="请选择">-->
+              <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+              <!--<el-option v-for="(option, index) in aliquid_info" :key="index"-->
+                         <!--:label="option.GoodInfo.specification_name" :value="option.GoodInfo.id"></el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
+
+
+
+
+
       </el-row>
 
 
@@ -297,12 +460,107 @@
   import { postPrescription, postSoulution } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
   import { uParseTime } from '@/utils/tools'
-  import store from "@/store";
+  import store from '@/store'
 
   export default {
     name: 'dialysisPrescriptionDialog',
     props: {
 
+      niprocart_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      jms_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+
+      fistula_needle_set_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+
+      fistula_needle_set_16_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+
+      hemoperfusion_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      dialyser_sterilised_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      filtryzer_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+
+      dialyzers_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      injector_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      bloodlines_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      tubingHemodialysis_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      safe_package_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      aliquid_info: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      config: {
+        type: Object,
+        default: () => {
+          return {id: 0}
+        }
+      },
+
       prescription: { // 透析处方
         type: Object,
         default: () => {
@@ -399,7 +657,21 @@
           displace_liqui_value: '',
           ultrafiltration: '',
           blood_access: '',
+
+          niprocart:'',
+          jms:'',
+          fistula_needle_set:'',
+          fistula_needle_set_16:'',
+          hemoperfusion:'',
+          dialyser_sterilised:'',
+          filtryzer:'',
           target_ktv:'',
+          dialyzers:'',
+          injector:'',
+          bloodlines:'',
+          tubing_hemodialysis:'',
+          package:'',
+          a_liquid:'',
         },
 
         anticoagulant: {
@@ -506,15 +778,15 @@
             this.hide()
           }
         })
-      }, isShows(name){
+      }, isShows(name) {
         var filedList = store.getters.xt_user.fileds
-        for (let i = 0; i < filedList.length; i++){
-          if(filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1){
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
             return true
           }
         }
         return false
-      },
+      }
     },
     created() {
       this.treatment_mode = this.$store.getters.treatment_mode

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

@@ -10,86 +10,95 @@
         </div>
         <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table" :data="monitors" border highlight-current-row
                   @current-change="tableCurrentRowChange" style="width: 100%" :class="current_row_class">
-          <el-table-column label="时间" align="center" width="144">
+          <el-table-column label="监测时间" align="center" width="144" v-if="isShow('监测时间')">
             <template slot-scope="scope">
               {{ getMonitorDate(scope.row) }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="血压(mmhg)" width="110">
+          <el-table-column prop="temperature" align="center" width="100" label="体温(℃)" v-if="isShow('体温')">
             <template slot-scope="scope">
-              {{scope.row.systolic_blood_pressure?scope.row.systolic_blood_pressure:''}}/{{scope.row.diastolic_blood_pressure?scope.row.diastolic_blood_pressure:''}}
+              {{scope.row.temperature?scope.row.temperature:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="pulse_frequency" align="center" width="100" label="脉率(次/分)">
+          <el-table-column align="center" label="血压(mmhg)" width="110" v-if="isShow('血压')">
             <template slot-scope="scope">
-              {{scope.row.pulse_frequency?scope.row.pulse_frequency:''}}
+              {{scope.row.systolic_blood_pressure?scope.row.systolic_blood_pressure:''}}/{{scope.row.diastolic_blood_pressure?scope.row.diastolic_blood_pressure:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="temperature" align="center" width="100" label="体温(℃)">
+
+          <el-table-column prop="pulse_frequency" align="center" width="100" label="脉搏(次/分)" v-if="isShow('脉搏')">
             <template slot-scope="scope">
-              {{scope.row.temperature?scope.row.temperature:''}}
+              {{scope.row.pulse_frequency?scope.row.pulse_frequency:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="breathing_rate" align="center" label="呼吸(次/分)" width="100">
+
+
+          <el-table-column prop="breathing_rate" align="center" label="呼吸频率(次/分)" width="100" v-if="isShow('呼吸频率')">
             <template slot-scope="scope">
               {{scope.row.breathing_rate?scope.row.breathing_rate:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="blood_flow_volume" align="center" label="血流量(ml/min)" width="120">
+
+          <el-table-column prop="venous_pressure" align="center" label="静脉压/动脉压(mmhg)" width="120" >
             <template slot-scope="scope">
-              {{scope.row.blood_flow_volume?scope.row.blood_flow_volume:''}}
+              <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="venous_pressure" align="center" label="静脉压/动脉压(mmhg)" width="120">
+
+          <el-table-column prop="blood_flow_volume" align="center" label="血流量(ml/min)" width="120" v-if="isShow('血流量')">
             <template slot-scope="scope">
-              <span>{{scope.row.venous_pressure?scope.row.venous_pressure:''}}/ {{scope.row.arterial_pressure?scope.row.arterial_pressure:''}}</span>
+              {{scope.row.blood_flow_volume?scope.row.blood_flow_volume:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="transmembrane_pressure" align="center" label="跨膜压(mmhg)" width="120">
+
+          <el-table-column prop="transmembrane_pressure" align="center" label="跨膜压(mmhg)" width="120" v-if="isShow('跨膜压')">
             <template slot-scope="scope">
               {{scope.row.transmembrane_pressure?scope.row.transmembrane_pressure:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="ultrafiltration_volume" align="center" label="超滤量(L)" width="110">
+
+
+
+          <el-table-column prop="ultrafiltration_volume" align="center" label="超滤量(L)" width="110" v-if="isShow('超滤量')">
             <template slot-scope="scope">
               {{scope.row.ultrafiltration_volume?scope.row.ultrafiltration_volume:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="sodium_concentration" align="center" label="钠浓度(mmol/L)" width="126">
+          <el-table-column prop="sodium_concentration" align="center" label="钠浓度(mmol/L)" width="126" v-if="isShow('钠浓度')">
             <template slot-scope="scope">
               {{scope.row.sodium_concentration?scope.row.sodium_concentration:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="dialysate_temperature" align="center" label="透析液温度(℃)" width="120">
+          <el-table-column prop="dialysate_temperature" align="center" label="透析液温度(℃)" width="120" v-if="isShow('透析液温度')">
             <template slot-scope="scope">
               {{scope.row.dialysate_temperature?scope.row.dialysate_temperature:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="replacement_rate" align="center" label="置换率(L/h)" width="120">
+          <el-table-column prop="replacement_rate" align="center" label="置换率(L/h)" width="120" v-if="isShow('置换率')">
             <template slot-scope="scope">
               {{scope.row.replacement_rate?scope.row.replacement_rate:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="displacement_quantity" align="center" label="置换量(L)" width="100">
+          <el-table-column prop="displacement_quantity" align="center" label="置换量(L)" width="100" v-if="isShow('置换量')">
             <template slot-scope="scope">
               {{scope.row.displacement_quantity?scope.row.displacement_quantity:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="displacement_flow_quantity" align="center" label="电导度(mS/m)" width="100">
+          <el-table-column prop="displacement_flow_quantity" align="center" label="电导度(mS/m)" width="100" v-if="isShow('电导度')">
             <template slot-scope="scope">
-              {{scope.row.displacement_flow_quantity?scope.row.displacement_flow_quantity:''}}
+              {{scope.row.conductivity?scope.row.conductivity:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="displacement_flow_quantity" align="center" label="置换液流量(ml/h)" width="100">
+          <el-table-column prop="displacement_flow_quantity" align="center" label="置换液流量(ml/h)" width="100" v-if="isShow('置换液流量')">
             <template slot-scope="scope">
               {{scope.row.displacement_flow_quantity?scope.row.displacement_flow_quantity:''}}
             </template>
           </el-table-column>
-          <el-table-column prop="symptom" align="center" label="病情变化" width="130">
+          <el-table-column prop="symptom" align="center" label="病情变化" width="130" v-if="isShow('病情变化')">
           </el-table-column>
-          <el-table-column prop="dispose" align="center" label="处理" width="130">
+          <el-table-column prop="dispose" align="center" label="处理" width="130" v-if="isShow('处理')">
           </el-table-column>
-          <el-table-column prop="result" align="center" label="结果" width="130">
+          <el-table-column prop="result" align="center" label="结果" width="130" v-if="isShow('结果')">
           </el-table-column>
         </el-table>
       </div>
@@ -106,6 +115,12 @@
                                 format="yyyy-MM-dd HH:mm" value-format="timestamp"></el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="8" v-if="isShow('体温')" >
+              <el-form-item label="体温(℃)：" >
+                <el-input v-model="form.temperature"></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="8" v-if="isShow('收缩压')">
               <el-form-item label="收缩压(mmhg)：">
                 <el-input v-model="form.systolic_bp"></el-input>
@@ -122,21 +137,22 @@
                 <el-input v-model="form.pulse_frequency"></el-input>
               </el-form-item>
             </el-col>
-          <!-- </el-row>
-
-          <el-row :gutter="20"> -->
-
-            <el-col :span="8" v-if="isShow('体温')" >
-              <el-form-item label="体温(℃)：" >
-                <el-input v-model="form.temperature"></el-input>
-              </el-form-item>
-            </el-col>
-
             <el-col :span="8" v-if="isShow('呼吸频率')">
               <el-form-item label="呼吸频率(次/分)：">
                 <el-input v-model="form.breathing_rated"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8"  v-if="isShow('静脉压')">
+              <el-form-item label="静脉压(mmHg)：">
+                <el-input v-model="form.venous_pressure"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" v-if="isShow('动脉压')">
+              <el-form-item label="动脉压(mmHg)：">
+                <el-input v-model="form.arterial_pressure"></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="8" v-if="isShow('血流量')">
               <el-form-item label="血流量(ml/min)：">
                 <el-input v-model="form.blood_flow_volume"></el-input>
@@ -145,25 +161,22 @@
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
-            <el-col :span="8"  v-if="isShow('静脉压')">
-              <el-form-item label="静脉压(mmHg)：">
-                <el-input v-model="form.venous_pressure"></el-input>
-              </el-form-item>
-            </el-col>
+
+
+
+
+          <!-- </el-row>
+
+          <el-row :gutter="20"> -->
+
             <el-col :span="8" v-if="isShow('跨膜压')">
               <el-form-item label="跨膜压(mmHg)：">
                 <el-input v-model="form.transmembrane_pressure"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="isShow('动脉压')">
-              <el-form-item label="动脉压(mmHg)：">
-                <el-input v-model="form.arterial_pressure"></el-input>
-              </el-form-item>
-            </el-col>
 
-          <!-- </el-row>
 
-          <el-row :gutter="20"> -->
+
             <el-col :span="8" v-if="isShow('超滤率')">
               <el-form-item label="超滤率(ml/h)">
                 <el-input v-model="form.ultrafiltration_rate"></el-input>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -19,7 +19,6 @@
         <th v-if="isShow('置换量')" width="92px">置换量(L)</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">病情变化</th>
         <th v-if="isShow('处理')"  width="92px">处理</th>
         <th v-if="isShow('结果')" width="92px">结果</th>

src/xt_pages/dialysis/details/index.vue

@@ -28,7 +28,25 @@
         :device_numbers="device_numbers"
         :admin_user_map="admin_user_map"
         :device_map="device_map"
-        :device_number_map="device_number_map">
+        :device_number_map="device_number_map"
+        :niprocart_info="niprocart_info"
+        :jms_info="jms_info"
+        :fistula_needle_set_info="fistula_needle_set_info"
+        :fistula_needle_set_16_info="fistula_needle_set_16_info"
+        :hemoperfusion_info="hemoperfusion_info"
+        :dialyser_sterilised_info="dialyser_sterilised_info"
+        :filtryzer_info="filtryzer_info"
+        :dialyzers_info="dialyzers_info"
+        :injector_info="injector_info"
+        :bloodlines_info="bloodlines_info"
+        :tubingHemodialysis_info="tubingHemodialysis_info"
+        :safe_package_info="safe_package_info"
+        :aliquid_info="aliquid_info"
+        :config = "config"
+
+
+
+      >
       </nav-igation>
 
       <basic-infor :patient="patient" :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
@@ -285,7 +303,22 @@
 
         admin_user_map: {}, // {user_id: admin_user object}
         device_map: {}, // {device_id: device}
-        device_number_map: {} // {device_number_id: device_number}
+        device_number_map: {}, // {device_number_id: device_number}
+
+        niprocart_info:[],
+        jms_info:[],
+        fistula_needle_set_info:[],
+        fistula_needle_set_16_info:[],
+        hemoperfusion_info:[],
+        dialyser_sterilised_info:[],
+        filtryzer_info:[],
+        dialyzers_info:[],
+        injector_info:[],
+        bloodlines_info:[],
+        tubingHemodialysis_info:[],
+        safe_package_info:[],
+        aliquid_info:[],
+        config:{},
       }
     },
     created() {
@@ -331,7 +364,7 @@
         var mrl = this.monitor_records.length
         for (let index = 0; index < mrl; index++) {
           if (this.monitor_records[index].id == record_id) {
-            console.log('11111')
+
             this.monitor_records.splice(index, 1)
             break
           }
@@ -356,6 +389,42 @@
             var monitor_records = resp.data.monitor_records // 透析监测
             var dialysis_order = resp.data.dialysis_order // 透析记录
 
+
+            var niprocart_info = resp.data.niprocart_info
+            var jms_info = resp.data.jms_info
+            var fistula_needle_set_info = resp.data.fistula_needle_set_info
+            var fistula_needle_set_16_info = resp.data.fistula_needle_set_16_info
+            var hemoperfusion_info = resp.data.hemoperfusion_info
+            var dialyser_sterilised_info = resp.data.dialyser_sterilised_info
+            var filtryzer_info = resp.data.filtryzer_info
+            var dialyzers_info = resp.data.dialyzers_info
+            var injector_info = resp.data.injector_info
+            var bloodlines_info = resp.data.bloodlines_info
+            var tubingHemodialysis_info = resp.data.tubingHemodialysis_info
+            var safe_package_info = resp.data.safe_package_info
+            var aliquid_info = resp.data.aliquid_info
+
+            var config = resp.data.config
+
+
+
+            this.niprocart_info = niprocart_info
+            this.jms_info = jms_info
+            this.fistula_needle_set_info = fistula_needle_set_info
+            this.fistula_needle_set_16_info = fistula_needle_set_16_info
+            this.hemoperfusion_info = hemoperfusion_info
+            this.dialyser_sterilised_info = dialyser_sterilised_info
+            this.filtryzer_info = filtryzer_info
+            this.dialyzers_info = dialyzers_info
+            this.injector_info = injector_info
+            this.bloodlines_info = bloodlines_info
+            this.tubingHemodialysis_info = tubingHemodialysis_info
+            this.safe_package_info = safe_package_info
+            this.aliquid_info = aliquid_info
+            this.config = config
+
+
+
             this.patient = patient
             this.schedual = schedual == null ? { id: 0 } : schedual
             this.prescription = prescription == null ? { id: 0 } : prescription

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -10,7 +10,7 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-table
-          :data="propForm.goodType"
+          :data="propForm.goods"
           ref="table"
           border
           highlight-current-row
@@ -24,7 +24,7 @@
             align="center"
             label="商品类型">
             <template slot-scope="scope">
-              <span>{{scope.row.type_name}}</span>
+              <span>{{getGoodTypeName(scope.row)}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -137,6 +137,7 @@
             keyName = key
           }
         }
+        console.log(keyName)
         this.goodInfoTableData = []
         this.goodInfo = []
         if (keyName.length > 0) {
@@ -287,7 +288,6 @@
         }
 
       }, getGoodTypeName: function(val) {
-        console.log(val)
         let keyName = ''
         for (var key in val) {
           if (key != 'index') {

src/xt_pages/stock/config/automaticReduce.vue

@@ -0,0 +1,92 @@
+<template>
+  <div class=" sign-and-weigh-box" style="background: white">
+    <div style="text-align: center;margin-top: 150px">
+      <el-button type="primary"   v-if="!is_open" @click="changeOpen(1)">启用自动扣减</el-button>
+      <el-button type="danger"   v-if="is_open"  @click="changeOpen(2)">关闭自动扣减</el-button>
+      <div style="margin-top: 40px;" ><p style="color:#909399;text-align: center;">开启后，系统设定的固定商品类型，在pad端中透析记录-透析处方-透析耗材中设置好（pc端暂不支持），患者执行上机之后，将会自动产生出库单；<br/>系统设定之外的商品类型则需要手动新增出库单。</p></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { createStockAutomaticReduceConfig, getAutomaticReduceConfig } from '@/api/config'
+
+  export default {
+    name: 'automaticReduce',
+    data() {
+      return {
+        is_open: false
+      }
+    },
+    methods: {
+      changeOpen(val){
+        var message = ''
+        if(val == 1){
+          message = '启用库存自动扣减功能'
+        }else{
+          message = '关闭库存自动扣减功能'
+        }
+
+        this.$confirm(message , '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'info'
+        }).then(() => {
+          createStockAutomaticReduceConfig(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.is_open == 1){
+                this.is_open = true
+                this.$message({
+                  type: 'success',
+                  message: '已启用'
+                });
+              }else{
+                this.is_open = false
+                this.$message({
+                  type: 'success',
+                  message: '已关闭'
+                });
+              }
+            }
+          })
+        }).catch(() => {
+
+        });
+
+      },
+      getConfig() {
+        getAutomaticReduceConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var config = response.data.data.config
+            if (config.is_open == 1) {
+              this.is_open = true
+            } else {
+              this.is_open = false
+            }
+          }
+        })
+      }
+    },
+    created() {
+      this.getConfig()
+    }
+  }
+</script>
+
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+</style>

src/xt_pages/stock/config/goodType.vue

@@ -47,19 +47,35 @@
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
+                  v-if="scope.row.type == 0"
                   size="small"
                   type="primary"
                   icon="el-icon-edit-outline"
                   @click="handleEdit(scope.$index, scope.row)">
                 </el-button>
+                <el-button
+                  v-if="scope.row.type == 1"
+                  size="small"
+                  type="info" plain
+                  icon="el-icon-edit-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
+                  v-if="scope.row.type == 0"
                   size="small"
                   type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.$index, scope.row)">
                 </el-button>
+                <el-button
+                  v-if="scope.row.type == 1"
+                  size="small"
+                  type="info" plain
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
               </el-tooltip>
             </template>
           </el-table-column>

src/xt_pages/stock/index.vue

@@ -19,6 +19,9 @@
           <el-tab-pane label="商品信息">
             <good-info></good-info>
           </el-tab-pane>
+          <el-tab-pane label="自动扣减">
+            <automatic-reduce></automatic-reduce>
+          </el-tab-pane>
 
         </el-tabs>
 
@@ -33,13 +36,11 @@
   import GoodInfo from './config/goodInfo'
   import GoodType from './config/goodType'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {
-    createStockAutomaticReduceConfig,
-    getAutomaticReduceConfig
-  } from '@/api/config'
+  import AutomaticReduce from './config/automaticReduce'
   export default {
     name: 'service',
     components: {
+      AutomaticReduce,
       GoodType,
       GoodInfo,
       Manufacturer,
@@ -60,41 +61,8 @@
     methods: {
       handleClick(tab, event) {
         console.log(tab, event, this.activeName)
-      },changeOpen(val){
-        var isOpen = 0
-
-        if(val){
-          isOpen = 1
-        }else{
-          isOpen = 2
-        }
-        createStockAutomaticReduceConfig(isOpen).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            // this.$message.success("已启动")
-
-          }
-        })
-      },getConfig(){
-        getAutomaticReduceConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            var config = response.data.data.config
-
-            if (config.is_open == 1){
-              this.is_open = true
-            }else{
-              this.is_open = false
-            }
-          }
-        })
       }
     },created(){
-      this.getConfig()
 
     }
   }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -479,7 +479,9 @@
           }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
           this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+          console.log(goodObj)
           this.propForm.goods.push(goodObj)
+          console.log(this.propForm.goods)
 
         }
 

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -30,6 +30,7 @@
       <el-row :gutter="12" style="margin-top: 10px">
         <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
                   border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+                  :span-method="merge"
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
@@ -115,6 +116,8 @@
     },
     data() {
       return {
+        tempArr: [],
+        sameRowArr: [],
         crumbs: [
           { path: false, name: '库存管理' },
           { path: false, name: '耗材出库单' },
@@ -199,6 +202,7 @@
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
+            this.handleSpanTempArr()
           }
         })
       }, deleteRecord: function() {
@@ -239,6 +243,52 @@
           name: 'user_detail',
           query: { id: row.id }
         })
+      },merge({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      },handleSpanTempArr(){
+        this.tempArr = []
+
+        for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.warehousingOutInfo.warehousingOutData[i].good_type_id === this.warehousingOutInfo.warehousingOutData[i - 1].good_type_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.warehousingOutInfo.warehousingOutData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.good_type_id === this.warehousingOutInfo.warehousingOutData[index - 1].good_type_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+
+
+
       }
     }
   }