test

.idea/codeStyles/Project.xml

@@ -1,6 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <JSCodeStyleSettings version="0">
+    <JSCodeStyleSettings>
       <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
       <option name="FORCE_SEMICOLON_STYLE" value="true" />
       <option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

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)

config/dev.env.js

@@ -6,10 +6,12 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
-  SSO_HOST: '"https://testsso.sgjyun.com"',
+  BASE_API:  '"http://api.xt.test.sgjyun.com"',// //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+
+  SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
   CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }
+

config/index.js

@@ -0,0 +1,96 @@
+'use strict'
+// Template version: 1.2.6
+// see http://vuejs-templates.github.io/webpack for documentation.
+
+const path = require('path')
+
+module.exports = {
+  dev: {
+
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {},
+
+    // Various Dev Server settings
+
+    // can be overwritten by process.env.HOST
+    // if you want dev by ip, please set host: '0.0.0.0'
+
+    // host: 'xt.test.sgjyun.com',
+    // host: 'xt.kuyicloud.com',
+    host: 'xt.test.sgjyun.com',
+    port: 9526, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    autoOpenBrowser: true,
+    errorOverlay: true,
+    notifyOnErrors: false,
+    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+    // Use Eslint Loader?
+    // If true, your code will be linted during bundling and
+    // linting errors and warnings will be shown in the console.
+    useEslint: false,
+
+    // If true, eslint errors and warnings will also be shown in the error overlay
+    // in the browser.
+    showEslintErrorsInOverlay: false,
+
+    /**
+     * Source Maps
+     */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: '#cheap-source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    // CSS Sourcemaps off by default because relative paths are "buggy"
+    // with this option, according to the CSS-Loader README
+    // (https://github.com/webpack/css-loader#sourcemaps)
+    // In our experience, they generally work as expected,
+    // just be aware of this issue when enabling this option.
+    cssSourceMap: false,
+  },
+
+  build: {
+    // Template for index.html
+    index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
+    assetsRoot: path.resolve(__dirname, '../dist'),
+    assetsSubDirectory: 'static',
+
+    /**
+     * You can set by youself according to actual condition
+     * You will need to set this if you plan to deploy your site under a sub path,
+     * for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
+     * then assetsPublicPath should be set to "/bar/".
+     * In most cases please use '/' !!!
+     */
+    // assetsPublicPath: '/vue-element-admin/', // If you are deployed on the root path, please use '/'
+    assetsPublicPath: './',
+
+    /**
+     * Source Maps
+     */
+    productionSourceMap: false,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: '#source-map',
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css'],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+}

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",
@@ -4731,9 +4731,9 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": false,
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4755,15 +4755,16 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "resolved": false,
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4778,21 +4779,23 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "resolved": false,
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4921,9 +4924,9 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "resolved": false,
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4937,6 +4940,7 @@
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4953,21 +4957,23 @@
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "resolved": false,
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": false,
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4988,6 +4994,7 @@
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5074,9 +5081,9 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "resolved": false,
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5090,6 +5097,7 @@
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5183,9 +5191,9 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "resolved": false,
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5227,6 +5235,7 @@
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5248,6 +5257,7 @@
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5294,15 +5304,16 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "resolved": false,
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": false,
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -7928,7 +7939,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 +11891,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 +13547,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/api/signandweigh.js

@@ -74,7 +74,7 @@ export function sighdata(params){
 }
 
 export function updateSignweight(params){
-  console.log("好好玩")
+ 
   console.log(params)
   return request({
      url:'/api/sign/updateSignweight',

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/home/modifyOrgInfoDialog.vue

@@ -11,8 +11,8 @@
                 <el-form-item label="机构介绍:" prop="org_introduction">
                     <!-- <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="机构介绍" v-model="form.org_introduction">  </el-input> -->
                     <keep-alive>
-                    <neditor ref="neditor" 
-                        id="editor" 
+                    <neditor ref="neditor"
+                        id="editor"
                         v-bind:r_content="form.org_introduction">
                     </neditor>
                 </keep-alive>
@@ -28,7 +28,7 @@
                         :on-error="handleAvatarError"
                         :on-success="handleAvatarSuccess"
                         :before-upload="beforeAvatarUpload">
-                        <img v-if="form.org_logo" :src="form.org_logo" class="avatar">
+                        <img v-if="imageUrl" :src="imageUrl" class="avatar">
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
                 </el-form-item>
@@ -88,7 +88,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="营业时间:" prop="business_time">
-                    <el-input v-model="form.business_week" placeholder="营业时间" style="width:48%"></el-input> 
+                    <el-input v-model="form.business_week" placeholder="营业时间" style="width:48%"></el-input>
                     <el-input v-model="form.business_time" placeholder="营业时间" style="width:48%"></el-input>
                 </el-form-item>
                 <el-form-item label="" prop="business_time">
@@ -96,13 +96,13 @@
                         <el-checkbox v-for="(item, index) in weekOptions" :label="item" :key="index" :value="item" >{{item}}</el-checkbox>
                     </el-checkbox-group>
                 </el-form-item>
-                
+
                 <el-form-item label="上午:" prop="business_time">
                     <el-radio-group v-model="form.business_time_shange" @change="handleChangeTime">
                         <el-radio v-for="(item, index)  in shangOptions" :key="index" :label="item" :value="item" >{{item}}</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                
+
                 <el-form-item label="下午:" prop="business_time_xia">
                     <el-radio-group v-model="form.business_time_xia" @change="handleChangeTime">
                         <el-radio v-for="(item, index)  in xiaOptions" :key="index" :label="item" :value="item" >{{item}}</el-radio>
@@ -141,456 +141,451 @@
 </template>
 <script>
 import { getToken } from '@/api/qiniu'
-import {GetOrgInfo,SaveOrgGallery,DeleteOrgGallery,EditOrgInfo} from '@/api/org/orginfo';
-import {GetDistrictsByUpid} from '@/api/district';
-import { getFileExtension} from '@/utils/tools'
+import { GetOrgInfo, SaveOrgGallery, DeleteOrgGallery, EditOrgInfo } from '@/api/org/orginfo'
+import { GetDistrictsByUpid } from '@/api/district'
+import { getFileExtension } from '@/utils/tools'
 import Neditor from '@/components/Neditor'
 export default {
-    name: "ModifyOrgInfoDialog",
-    components:{
-        Neditor,
+  name: 'ModifyOrgInfoDialog',
+  components: {
+    Neditor
+  },
+  data() {
+    return {
+      qiniuDomain: 'https://images.shengws.com/',
+      visible: false,
+      formloading: false,
+      uploading: false,
+      guploading: false,
+      formsubmit: false,
+      loadingText: '',
+      illnessList: [],
+      fileList: [],
+      provinces: [],
+      citys: [],
+      districts: [],
+      orgtypes: [],
+      orgtypesMap: {},
+      childtypes: [],
+      uploadData: { token: '', key: '' },
+      operatingStateOptions: [{ value: 1, label: '正常营业' }, { value: 2, label: '暂未营业' }],
+      weekOptions: ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期天'],
+      shangOptions: ['1:00', '2:00', '3:00', '4:00', '5:00', '6:00', '7:00', '8:00', '9:00', '10:00', '11:00', '12:00'],
+      xiaOptions: ['13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'],
+      illnessOptions: [],
+      form: {
+        org_name: '',
+        org_short_name: '',
+        org_introduction: '',
+        org_logo: '',
+        province: '',
+        city: '',
+        district: '',
+        address: '',
+        parent_type: '',
+        child_type: '',
+        org_type: '',
+        telephone: '',
+        operating_state: '',
+        business_week: '',
+        business_week_select: [],
+        business_time_shange: '',
+        business_time_xia: '',
+        business_time: '',
+        illness: '',
+        illness_list: [],
+        org_gallery: []
+      },
+      myConfig: {
+        // 如果需要上传功能,找后端小伙伴要服务器接口地址
+        serverUrl: '/api/web/upload/ueditor',
+        // 你的UEditor资源存放的路径,相对于打包后的index.html
+        UEDITOR_HOME_URL: '/NEditor/',
+        // 编辑器不自动被内容撑高
+        autoHeightEnabled: false,
+        // 初始容器高度
+        initialFrameHeight: 240,
+        // 初始容器宽度
+        initialFrameWidth: '100%',
+        // 关闭自动保存
+        enableAutoSave: false
+      },
+      dialogImageUrl: '',
+      dialogVisible: false
+    }
+  },
+  created() {
+  },
+  methods: {
+    _close: function(done) {
+      this.clear()
+      done()
     },
-    data(){
-        return {
-            qiniuDomain: 'https://images.shengws.com/',
-            visible:false,
-            formloading:false,
-            uploading:false,
-            guploading:false,
-            formsubmit:false,
-            loadingText:'',
-            illnessList:[],
-            fileList:[],
-            provinces:[],
-            citys:[],
-            districts:[],
-            orgtypes:[],
-            orgtypesMap:{},
-            childtypes:[],
-            uploadData: { token: '', key: '' },
-            operatingStateOptions: [{ value: 1, label: '正常营业' }, { value: 2, label: '暂未营业' }],
-            weekOptions:["星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期天"],
-            shangOptions:['1:00','2:00','3:00','4:00','5:00','6:00','7:00','8:00','9:00','10:00','11:00','12:00'],
-            xiaOptions:['13:00','14:00','15:00','16:00','17:00','18:00','19:00','20:00','21:00','22:00','23:00','24:00'],
-            illnessOptions:[],
-            form:{
-                org_name:'',
-                org_short_name:'',
-                org_introduction:'',
-                org_logo:'',
-                province:'',
-                city:'',
-                district:'',
-                address:'',
-                parent_type:'',
-                child_type:'',
-                org_type:'',
-                telephone:'',
-                operating_state:'',
-                business_week:'',
-                business_week_select:[],
-                business_time_shange:'',
-                business_time_xia:'',
-                business_time:'',
-                illness:'',
-                illness_list:[],
-                org_gallery:[],
-            },
-             myConfig: {
-                // 如果需要上传功能,找后端小伙伴要服务器接口地址
-                serverUrl: '/api/web/upload/ueditor',
-                // 你的UEditor资源存放的路径,相对于打包后的index.html
-                UEDITOR_HOME_URL: '/NEditor/',
-                // 编辑器不自动被内容撑高
-                autoHeightEnabled: false,
-                // 初始容器高度
-                initialFrameHeight: 240,
-                // 初始容器宽度
-                initialFrameWidth: '100%',
-                // 关闭自动保存
-                enableAutoSave: false
-            },
-            dialogImageUrl: '',
-            dialogVisible: false
-        }
-
+    clear: function() {
+      this.form = {
+        org_name: '',
+        org_short_name: '',
+        org_introduction: '',
+        org_logo: '',
+        province: '',
+        city: '',
+        district: '',
+        address: '',
+        parent_type: '',
+        child_type: '',
+        org_type: '',
+        telephone: '',
+        operating_state: '',
+        business_week: '',
+        business_week_select: [],
+        business_time_shange: '',
+        business_time_xia: '',
+        business_time: '',
+        illness: '',
+        illness_list: [],
+        org_gallery: []
+      }
     },
-    created(){
+    show() {
+      this.clear()
+      this.visible = true
+      this.GetOrgInfo()
     },
-    methods:{
-        _close: function(done) {
-            this.clear()
-            done()
-        },
-        clear: function() {
-            this.form = {
-                org_name:'',
-                org_short_name:'',
-                org_introduction:'',
-                org_logo:'',
-                province:'',
-                city:'',
-                district:'',
-                address:'',
-                parent_type:'',
-                child_type:'',
-                org_type:'',
-                telephone:'',
-                operating_state:'',
-                business_week:'',
-                business_week_select:[],
-                business_time_shange:'',
-                business_time_xia:'',
-                business_time:'',
-                illness:'',
-                illness_list:[],
-                org_gallery:[],
-            };
-        },
-        show() {
-            this.clear()
-            this.visible = true
-            this.GetOrgInfo();
-        },
-        hide() {
-            this.clear()
-            this.visible = false
-        },
-        handleChangeIllness(values){
-            this.form.illness = values.join(',');
-        },
-        handleChangeWeek(values) {
-            var selectweek = [];
-            for (const index in values) {
-                var item = {id:this.weekOptions.indexOf(values[index]), name:values[index]};
-                selectweek.push(item);
-            }
-            
-            if(selectweek.length==0) {
-                this.form.business_week = '';
-            }else if(selectweek.length==1) {
-                this.form.business_week = selectweek[0];
-            }else {
-                selectweek = selectweek.sort(function (a,b) {
-                    return a.id-b.id;
-                });
-                var blen = selectweek.length;
-                if (blen == (selectweek[blen-1].id - selectweek[0].id + 1)) {
-                    this.form.business_week = selectweek[0]["name"] + ' — ' + selectweek[blen-1]["name"];
-                }else {
-                    var tem = [];
-                    for (const index in selectweek) {
-                        tem.push(selectweek[index].name);
-                    }
-                    this.form.business_week = tem.join("、")
-                }
-               
-            }
-        },
-        handleChangeTime(t){
-            if(this.form.business_time_shange.length>0 && this.form.business_time_xia.length>0) {
-                this.form.business_time = '上午'+this.form.business_time_shange+"—下午"+this.form.business_time_xia;
-            }else if (this.form.business_time_shange.length>0) {
-                this.form.business_time = '上午'+this.form.business_time_shange;
-            }else if (this.form.business_time_xia.length>0) {
-                this.form.business_time = "下午"+this.form.business_time_xia;
-            }else {
-                this.form.business_time = '';
-            }
-        },
-        handleAvatarError(err, file, fileList) {
-            this.$message.error(err);
-            this.uploading = false;
-            return false
-        },
-        handleAvatarSuccess(res, file) {
-            this.form.org_logo = this.qiniuDomain + res.url;
-            this.uploading = false;
-        },
-        beforeAvatarUpload(file) {
-            var fileType = file.type
-            const isJPG = fileType.indexOf('image') > -1
-            const isLt2M = file.size / 1024 / 1024 < 2
-
-            if (!isJPG) {
-                this.$message.error('只能上传图片')
-                return false
-            }
-            if (!isLt2M) {
-                this.$message.error('上传头像图片大小不能超过 2MB!')
-                return false
-            }
+    hide() {
+      this.clear()
+      this.visible = false
+    },
+    handleChangeIllness(values) {
+      this.form.illness = values.join(',')
+    },
+    handleChangeWeek(values) {
+      var selectweek = []
+      for (const index in values) {
+        var item = { id: this.weekOptions.indexOf(values[index]), name: values[index] }
+        selectweek.push(item)
+      }
 
-            var date = new Date()
-            var ext = getFileExtension(file.name)
-            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
-            this.uploading = true;
-            this.loadingText = '机构头像上传中'
+      if (selectweek.length == 0) {
+        this.form.business_week = ''
+      } else if (selectweek.length == 1) {
+        this.form.business_week = selectweek[0]
+      } else {
+        selectweek = selectweek.sort(function(a, b) {
+          return a.id - b.id
+        })
+        var blen = selectweek.length
+        if (blen == (selectweek[blen - 1].id - selectweek[0].id + 1)) {
+          this.form.business_week = selectweek[0]['name'] + ' — ' + selectweek[blen - 1]['name']
+        } else {
+          var tem = []
+          for (const index in selectweek) {
+            tem.push(selectweek[index].name)
+          }
+          this.form.business_week = tem.join('、')
+        }
+      }
+    },
+    handleChangeTime(t) {
+      if (this.form.business_time_shange.length > 0 && this.form.business_time_xia.length > 0) {
+        this.form.business_time = '上午' + this.form.business_time_shange + '—下午' + this.form.business_time_xia
+      } else if (this.form.business_time_shange.length > 0) {
+        this.form.business_time = '上午' + this.form.business_time_shange
+      } else if (this.form.business_time_xia.length > 0) {
+        this.form.business_time = '下午' + this.form.business_time_xia
+      } else {
+        this.form.business_time = ''
+      }
+    },
+    handleAvatarError(err, file, fileList) {
+      this.$message.error(err)
+      this.uploading = false
+      return false
+    },
+    handleAvatarSuccess(res, file) {
+      this.form.org_logo = this.qiniuDomain + res.url
+      this.uploading = false
+    },
+    beforeAvatarUpload(file) {
+      var fileType = file.type
+      const isJPG = fileType.indexOf('image') > -1
+      const isLt2M = file.size / 1024 / 1024 < 2
 
-            const _self = this
-            return new Promise((resolve, reject) => {
-                getToken().then(response => {
-                    const token = response.data.data.uptoken
-                    _self._data.uploadData.token = token
-                    _self._data.uploadData.key = key
-                    resolve(true)
-                }).catch(err => {
-                    reject(false)
-                    this.uploading = false;
-                })
-            })
-        },
-        handleGalleryError(err, file, fileList) {
-            this.$message.error(err);
-            this.guploading = false;
-            return false
-        },
-        handleGallerySuccess(res, file) {
-            var data = {type:1, url: this.qiniuDomain + res.url};
-            SaveOrgGallery(data).then(response=>{
-                var res = response.data;
-                if (res.state==1) {
-                    this.$message.success('上传成功');
-                }else {
-                    this.$message.error('上传失败');
-                }
-            }).catch(e=>{});
-            this.guploading = false;
-        },
-        beforeGalleryUpload(file) {
-            var fileType = file.type
-            const isJPG = fileType.indexOf('image') > -1
-            const isLt100M = file.size / 1024 / 1024 < 100
+      if (!isJPG) {
+        this.$message.error('只能上传图片')
+        return false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+        return false
+      }
 
-            if (!isJPG) {
-                this.$message.error('只能上传图片')
-                return false
-            }
-            if (!isLt100M) {
-                this.$message.error('上传图片大小不能超过 100MB!')
-                return false
-            }
+      var date = new Date()
+      var ext = getFileExtension(file.name)
+      var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours() + date.getMinutes() + date.getSeconds() + '_o_' + file.uid + '.' + ext
+      this.uploading = true
+      this.loadingText = '机构头像上传中'
 
-            var date = new Date()
-            var ext = getFileExtension(file.name)
-            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_g_' + file.uid + '.' + ext;
-            this.guploading = true;
-            this.loadingText = '机构图册上传中'
+      const _self = this
+      return new Promise((resolve, reject) => {
+        getToken().then(response => {
+          const token = response.data.data.uptoken
+          _self._data.uploadData.token = token
+          _self._data.uploadData.key = key
+          resolve(true)
+        }).catch(err => {
+          reject(false)
+          this.uploading = false
+        })
+      })
+    },
+    handleGalleryError(err, file, fileList) {
+      this.$message.error(err)
+      this.guploading = false
+      return false
+    },
+    handleGallerySuccess(res, file) {
+      var data = { type: 1, url: this.qiniuDomain + res.url }
+      SaveOrgGallery(data).then(response => {
+        var res = response.data
+        if (res.state == 1) {
+          this.$message.success('上传成功')
+        } else {
+          this.$message.error('上传失败')
+        }
+      }).catch(e => {})
+      this.guploading = false
+    },
+    beforeGalleryUpload(file) {
+      var fileType = file.type
+      const isJPG = fileType.indexOf('image') > -1
+      const isLt100M = file.size / 1024 / 1024 < 100
 
-            const _self = this
-            return new Promise((resolve, reject) => {
-                getToken().then(response => {
-                    const token = response.data.data.uptoken
-                    _self._data.uploadData.token = token
-                    _self._data.uploadData.key = key
-                    resolve(true)
-                }).catch(err => {
-                    reject(false)
-                    this.guploading = false;
-                })
-            })
-        },
+      if (!isJPG) {
+        this.$message.error('只能上传图片')
+        return false
+      }
+      if (!isLt100M) {
+        this.$message.error('上传图片大小不能超过 100MB!')
+        return false
+      }
 
-        handleRemove(file, fileList) {
-            DeleteOrgGallery(file.id).then(response=>{
-                var res = response.data;
-                if(res.state==1) {
-                    this.$message.success('删除成功');
-                }else {
-                    this.$message.error('删除失败');
-                }
-            }).catch(e=>{});
-            console.log("handleRemove",file, fileList);
-        },
-        GetOrgInfo(){
-            GetOrgInfo().then(response=>{
-                var res = response.data;
-                if (res.state === 1) {
-                    this.form.org_name = res.data.orginfo.org_name;
-                    this.form.org_short_name = res.data.orginfo.org_short_name;
-                    this.form.org_introduction = res.data.orginfo.org_introduction;
-                    this.form.org_logo = res.data.orginfo.org_logo;
-                    this.form.province = res.data.orginfo.province;
-                    this.form.city = res.data.orginfo.city;
-                    this.form.district = res.data.orginfo.district;
-                    this.form.address = res.data.orginfo.address;
-                    this.form.org_type = res.data.orginfo.org_type;
-                    this.form.telephone = res.data.orginfo.telephone;
-                    this.form.operating_state = res.data.orginfo.operating_state;
-                    this.form.business_week = res.data.orginfo.business_week;
-                    this.form.business_week_select = [];
-                    this.form.business_time = res.data.orginfo.business_time;
-                    this.form.business_time_shange = '';
-                    this.form.business_time_xia = '';
-                    this.form.illness = res.data.orginfo.illness;
-                    this.form.illness_list = [];
-                    this.form.org_gallery = res.data.orginfo.org_gallery;
-                    this.fileList = [];
-                    for (const index in this.form.org_gallery) {
-                        var image = {id:this.form.org_gallery[index].id, name:this.form.org_gallery[index].id, url: this.form.org_gallery[index].type==1?this.form.org_gallery[index].url:this.form.org_gallery[index].url+'?vframe/jpg/offset/0/w/100/h/100'};
-                        this.fileList.push(image);
-                    }
+      var date = new Date()
+      var ext = getFileExtension(file.name)
+      var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours() + date.getMinutes() + date.getSeconds() + '_g_' + file.uid + '.' + ext
+      this.guploading = true
+      this.loadingText = '机构图册上传中'
 
-                    var illness = res.data.orginfo.illness.split(',');
-                    for (const index in illness) {
-                        var iid = parseInt(illness[index]);
-                        if (isNaN(iid) || iid<=0) {
-                            continue;
-                        }
-                        this.form.illness_list.push(iid);
-                    }
-                    var business_week = this.form.business_week;
-                    var business_week_tem = business_week.split(" — ");
-                    if(business_week_tem.length==2) {
-                        var fromIndex = this.weekOptions.indexOf(business_week_tem[0]);
-                        var toIndex = this.weekOptions.indexOf(business_week_tem[1]);
-                        if(fromIndex>=0 && toIndex>=0) {
-                            for (const index in this.weekOptions) {
-                                if(index>=fromIndex && index <= toIndex) {
-                                    this.form.business_week_select.push(this.weekOptions[index]);
-                                }
-                            }
-                        }
-                    }else {
-                        business_week_tem = business_week.split("、");
-                        for (const index in business_week_tem) {
-                            if(business_week_tem[index].length>0) {
-                                this.form.business_week_select.push(business_week_tem[index]);
-                            }
-                        }
-                    }
-                    var business_time = this.form.business_time;
-                    var business_time_tem = business_time.split("—");
-                    if(business_time_tem.length==2) {
-                        this.form.business_time_shange = business_time_tem[0].substring(2);
-                        this.form.business_time_xia = business_time_tem[1].substring(2);
-                    }else {
-                        var selectTime = business_time_tem[0].substring(2);
-                        if(this.shangOptions.indexOf(selectTime)>-1) {
-                            this.form.business_time_shange = selectTime;
-                        }else if(this.xiaOptions.indexOf(selectTime)>-1) {
-                            this.form.business_time_xia = selectTime;
-                        }
-                    }
-
-                    this.provinces = res.data.provinces;
-                    this.citys = res.data.citys?res.data.citys:[];
-                    this.districts = res.data.districts?res.data.districts:[];
+      const _self = this
+      return new Promise((resolve, reject) => {
+        getToken().then(response => {
+          const token = response.data.data.uptoken
+          _self._data.uploadData.token = token
+          _self._data.uploadData.key = key
+          resolve(true)
+        }).catch(err => {
+          reject(false)
+          this.guploading = false
+        })
+      })
+    },
 
-                    this.orgtypes = [];
-                    this.orgtypesMap ={},
-                    this.childtypes = [];
-                    var orgtypes = res.data.orgtypes;
-                    for (const index in orgtypes) {
-                        if(orgtypes[index].pid>0) {
-                            if(!(orgtypes[index].pid in this.orgtypesMap)) {
-                                this.orgtypesMap[orgtypes[index].pid] = [];
-                            }
-                            this.orgtypesMap[orgtypes[index].pid].push(orgtypes[index]);
-                            if(orgtypes[index].id == this.form.org_type) {
-                                this.form.child_type = orgtypes[index].id;
-                                this.form.parent_type = orgtypes[index].pid;
-                            }
-                        }else {
-                            this.orgtypes.push(orgtypes[index]);
-                            if(orgtypes[index].id == this.form.org_type) {
-                                this.form.parent_type = orgtypes[index].id;
-                            }
-                        }
-                    }
-                    if (this.form.parent_type in this.orgtypesMap) {
-                        this.childtypes = this.orgtypesMap[this.form.parent_type];
-                    }else {
-                        this.childtypes = [];
-                    }
-                    this.illnessOptions = res.data.illness?res.data.illness:[];
-                        
-                } else {
-                    this.$message.error(resp.msg)
-                }
-            }).catch(e=>{
+    handleRemove(file, fileList) {
+      DeleteOrgGallery(file.id).then(response => {
+        var res = response.data
+        if (res.state == 1) {
+          this.$message.success('删除成功')
+        } else {
+          this.$message.error('删除失败')
+        }
+      }).catch(e => {})
+      console.log('handleRemove', file, fileList)
+    },
+    GetOrgInfo() {
+      GetOrgInfo().then(response => {
+        var res = response.data
+        if (res.state === 1) {
+          this.form.org_name = res.data.orginfo.org_name
+          this.form.org_short_name = res.data.orginfo.org_short_name
+          this.form.org_introduction = res.data.orginfo.org_introduction
+          this.form.org_logo = res.data.orginfo.org_logo
+          this.form.province = res.data.orginfo.province
+          this.form.city = res.data.orginfo.city
+          this.form.district = res.data.orginfo.district
+          this.form.address = res.data.orginfo.address
+          this.form.org_type = res.data.orginfo.org_type
+          this.form.telephone = res.data.orginfo.telephone
+          this.form.operating_state = res.data.orginfo.operating_state
+          this.form.business_week = res.data.orginfo.business_week
+          this.form.business_week_select = []
+          this.form.business_time = res.data.orginfo.business_time
+          this.form.business_time_shange = ''
+          this.form.business_time_xia = ''
+          this.form.illness = res.data.orginfo.illness
+          this.form.illness_list = []
+          this.form.org_gallery = res.data.orginfo.org_gallery
+          this.fileList = []
+          for (const index in this.form.org_gallery) {
+            var image = { id: this.form.org_gallery[index].id, name: this.form.org_gallery[index].id, url: this.form.org_gallery[index].type == 1 ? this.form.org_gallery[index].url : this.form.org_gallery[index].url + '?vframe/jpg/offset/0/w/100/h/100' }
+            this.fileList.push(image)
+          }
 
-            })
-        },
-         myTrim(x) {
-            return x.replace(/^\s+|\s+$/gm,'');
-        },
-        changeProvince(id) {
-            this.citys = [];
-            this.districts = [];
-            this.form.city = '';
-            this.form.district = '';
-            var upid = parseInt(id);
-            if (isNaN(upid) || upid<=0) {
-                return false;
+          var illness = res.data.orginfo.illness.split(',')
+          for (const index in illness) {
+            var iid = parseInt(illness[index])
+            if (isNaN(iid) || iid <= 0) {
+              continue
             }
-            GetDistrictsByUpid({id:upid}).then(response=>{
-                var res = response.data;
-                if(res.state===1) {
-                    this.citys = res.data.citys?res.data.citys:[];
+            this.form.illness_list.push(iid)
+          }
+          var business_week = this.form.business_week
+          var business_week_tem = business_week.split(' — ')
+          if (business_week_tem.length == 2) {
+            var fromIndex = this.weekOptions.indexOf(business_week_tem[0])
+            var toIndex = this.weekOptions.indexOf(business_week_tem[1])
+            if (fromIndex >= 0 && toIndex >= 0) {
+              for (const index in this.weekOptions) {
+                if (index >= fromIndex && index <= toIndex) {
+                  this.form.business_week_select.push(this.weekOptions[index])
                 }
-            }).catch(e=>{
-
-            })
-        },
-        changeCity(id) {
-            this.districts = [];
-            this.form.district = '';
-            var upid = parseInt(id);
-            if (isNaN(upid) || upid<=0) {
-                return false;
+              }
             }
-            GetDistrictsByUpid({id:upid}).then(response=>{
-                var res = response.data;
-                if(res.state===1) {
-                    this.districts = res.data.citys?res.data.citys:[];
-                }
-            }).catch(e=>{
+          } else {
+            business_week_tem = business_week.split('、')
+            for (const index in business_week_tem) {
+              if (business_week_tem[index].length > 0) {
+                this.form.business_week_select.push(business_week_tem[index])
+              }
+            }
+          }
+          var business_time = this.form.business_time
+          var business_time_tem = business_time.split('—')
+          if (business_time_tem.length == 2) {
+            this.form.business_time_shange = business_time_tem[0].substring(2)
+            this.form.business_time_xia = business_time_tem[1].substring(2)
+          } else {
+            var selectTime = business_time_tem[0].substring(2)
+            if (this.shangOptions.indexOf(selectTime) > -1) {
+              this.form.business_time_shange = selectTime
+            } else if (this.xiaOptions.indexOf(selectTime) > -1) {
+              this.form.business_time_xia = selectTime
+            }
+          }
 
-            })
-        },
-        changeParentType(id) {
-            id = parseInt(id);
-            this.childtypes = [];
-            this.form.child_type = '';
-            this.form.org_type = 0;
+          this.provinces = res.data.provinces
+          this.citys = res.data.citys ? res.data.citys : []
+          this.districts = res.data.districts ? res.data.districts : []
 
-            if (isNaN(id) || id<=0) {
-                return false;
-            }
-            if(id in this.orgtypesMap) {
-                this.childtypes = this.orgtypesMap[id];
-            }else{
-                this.childtypes = [];
+          this.orgtypes = []
+          this.orgtypesMap = {},
+          this.childtypes = []
+          var orgtypes = res.data.orgtypes
+          for (const index in orgtypes) {
+            if (orgtypes[index].pid > 0) {
+              if (!(orgtypes[index].pid in this.orgtypesMap)) {
+                this.orgtypesMap[orgtypes[index].pid] = []
+              }
+              this.orgtypesMap[orgtypes[index].pid].push(orgtypes[index])
+              if (orgtypes[index].id == this.form.org_type) {
+                this.form.child_type = orgtypes[index].id
+                this.form.parent_type = orgtypes[index].pid
+              }
+            } else {
+              this.orgtypes.push(orgtypes[index])
+              if (orgtypes[index].id == this.form.org_type) {
+                this.form.parent_type = orgtypes[index].id
+              }
             }
-            
-            this.form.org_type = id;
+          }
+          if (this.form.parent_type in this.orgtypesMap) {
+            this.childtypes = this.orgtypesMap[this.form.parent_type]
+          } else {
+            this.childtypes = []
+          }
+          this.illnessOptions = res.data.illness ? res.data.illness : []
+        } else {
+          this.$message.error(resp.msg)
+        }
+      }).catch(e => {
 
-        },
-        changeChildType(id) {
-            this.form.org_type = id;
-        },
-        submitForm(){
-            this.form.org_introduction = this.$refs.neditor.content;
-            this.formloading = true;
-            this.formsubmit = true;
-            EditOrgInfo(this.form).then(response=>{
-                var res = response.data;
-                if(res.state==1) {
-                    this.$message.success("修改成功");
-                }else {
-                    this.$message.error(res.msg);
-                }
-                
-                this.formloading = false;
-                this.formsubmit = false;
-            }).catch(e=>{
+      })
+    },
+    myTrim(x) {
+      return x.replace(/^\s+|\s+$/gm, '')
+    },
+    changeProvince(id) {
+      this.citys = []
+      this.districts = []
+      this.form.city = ''
+      this.form.district = ''
+      var upid = parseInt(id)
+      if (isNaN(upid) || upid <= 0) {
+        return false
+      }
+      GetDistrictsByUpid({ id: upid }).then(response => {
+        var res = response.data
+        if (res.state === 1) {
+          this.citys = res.data.citys ? res.data.citys : []
+        }
+      }).catch(e => {
+
+      })
+    },
+    changeCity(id) {
+      this.districts = []
+      this.form.district = ''
+      var upid = parseInt(id)
+      if (isNaN(upid) || upid <= 0) {
+        return false
+      }
+      GetDistrictsByUpid({ id: upid }).then(response => {
+        var res = response.data
+        if (res.state === 1) {
+          this.districts = res.data.citys ? res.data.citys : []
+        }
+      }).catch(e => {
+
+      })
+    },
+    changeParentType(id) {
+      id = parseInt(id)
+      this.childtypes = []
+      this.form.child_type = ''
+      this.form.org_type = 0
 
-                this.formloading = false;
-                this.formsubmit = false;
-            })
-        },
+      if (isNaN(id) || id <= 0) {
+        return false
+      }
+      if (id in this.orgtypesMap) {
+        this.childtypes = this.orgtypesMap[id]
+      } else {
+        this.childtypes = []
+      }
+
+      this.form.org_type = id
+    },
+    changeChildType(id) {
+      this.form.org_type = id
+    },
+    submitForm() {
+      this.form.org_introduction = this.$refs.neditor.content
+      this.formloading = true
+      this.formsubmit = true
+      EditOrgInfo(this.form).then(response => {
+        var res = response.data
+        if (res.state == 1) {
+          this.$message.success('修改成功')
+        } else {
+          this.$message.error(res.msg)
+        }
+
+        this.formloading = false
+        this.formsubmit = false
+      }).catch(e => {
+        this.formloading = false
+        this.formsubmit = false
+      })
     }
+  }
 }
 </script>
 
@@ -618,4 +613,4 @@ export default {
     height: 178px;
     display: block;
   }
-</style>
+</style>

src/xt_pages/role/admin.vue

@@ -136,7 +136,7 @@ export default {
     disableAdminAction: function(row) {
       this.$msgbox({
         title: '提示',
-        message: '是否确定要移除该管理员',
+        message: '是否确定要移除该用户',
         showCancelButton: true,
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -171,6 +171,7 @@ export default {
       })
     },
     recoverAdminAction: function(row) {
+    
       const loading = this.$loading({
         lock: true,
         text: '正在恢复管理员...',

src/xt_pages/role/components/AdminInfoForm.vue

@@ -39,200 +39,192 @@
 
 <script>
 import Tinymce from '@/components/Tinymce'
-import {getAddAdminInitData, addAdmin, getModifyAdminInitData, modifyAdmin} from '@/api/role/admin'
+import { getAddAdminInitData, addAdmin, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
 export default {
-    name:"AdminInfoForm",
-    components: {
-        Tinymce
-    },
-    // props: {
-    //     admin_id: {
-    //         type: Number,
-    //         require: true
-    //     }
-    // },
-    data() {
-        var checkMobile = (rule, value, callback) => {
-            if (!value || value.length == 0) {
-                return callback(new Error('手机号不能为空'))
-            }
-            if (/^1\d{10}$/.test(value) == false) {
-                return callback(new Error('手机号格式错误'))
-            } else {
-                callback()
-            }
-        }
-        var checkName = (rule, value, callback) => {
-            if (!value || value.length == 0) {
-                return callback(new Error('姓名不能为空'))
-            } else {
-                callback()
-            }
-        }
-        return {
-            admin_id:0,
-            dialogFormVisible:false,
-            user_types: [
-                { index: 2, name: '医生' },
-                { index: 3, name: '护士' },
-            ],
-            user_titles: [
-                { index: 1, name: '医士' },
-                { index: 2, name: '医师' },
-                { index: 3, name: '住院医师' },
-                { index: 4, name: '主治医师' },
-                { index: 5, name: '副主任医师' },
-                { index: 6, name: '主任医师' },
-                { index: 7, name: '护士' },
-                { index: 8, name: '护师' },
-                { index: 9, name: '主管护师' },
-                { index: 10, name: '副主任护师' },
-                { index: 11, name: '主任护师' },
-                { index: 12, name: '运营专员' },
-                { index: 13, name: '运营主管' },
-            ],
-            roles: [], // [{id, name, intro, status}]
-            loading: true,
-            qntoken: '',
-            formTitle:'',
-            form: {
-                id: 0,
-                mobile: '',
-                name: '',
-                user_type: '',
-                user_title: '',
-                role: '', // 其实应该是 int 类型
-                intro: '',
-            },
-            rules: {
-                mobile: [
-                    {validator: checkMobile, trigger: 'blur'}
-                ],
-                name: [
-                    {validator: checkName, trigger: 'blur'}
-                ]
-            }
-        }
-    },
-    methods: {
-        open:function(adminId){
-            this.admin_id = adminId;
-            if (this.admin_id < 0) {
-                this.$message.error("参数错误")
-                this.loading = false
-                return
-            }
+  name: 'AdminInfoForm',
+  components: {
+    Tinymce
+  },
+  // props: {
+  //     admin_id: {
+  //         type: Number,
+  //         require: true
+  //     }
+  // },
+  data() {
+    var checkMobile = (rule, value, callback) => {
+      if (!value || value.length == 0) {
+        return callback(new Error('手机号不能为空'))
+      }
+      if (/^1\d{10}$/.test(value) == false) {
+        return callback(new Error('手机号格式错误'))
+      } else {
+        callback()
+      }
+    }
+    var checkName = (rule, value, callback) => {
+      if (!value || value.length == 0) {
+        return callback(new Error('姓名不能为空'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      admin_id: 0,
+      dialogFormVisible: false,
 
-            this.form.id = this.admin_id
-            if (this.admin_id === 0) {
-                this.formTitle = '新增用户';
-                this.form.user_type = this.user_types[0].index
-                this.form.user_title = this.user_titles[0].index
-                getAddAdminInitData().then(rs => {
-                    this.loading = false
-                    var resp = rs.data
-                    if (resp.state === 1) {
-                        this.roles.push(...resp.data.roles)
-                        this.qntoken = resp.data.qntoken
-                        if (this.roles.length > 0) {
-                            this.form.role = this.roles[0].id
-                        }
+      user_types: [
+        { index: 2, name: '医生' },
+        { index: 3, name: '护士' }
+      ],
+      user_titles: [
+        { index: 1, name: '医士' },
+        { index: 2, name: '医师' },
+        { index: 3, name: '住院医师' },
+        { index: 4, name: '主治医师' },
+        { index: 5, name: '副主任医师' },
+        { index: 6, name: '主任医师' },
+        { index: 7, name: '护士' },
+        { index: 8, name: '护师' },
+        { index: 9, name: '主管护师' },
+        { index: 10, name: '副主任护师' },
+        { index: 11, name: '主任护师' },
+        { index: 12, name: '运营专员' },
+        { index: 13, name: '运营主管' }
+      ],
+      roles: [], // [{id, name, intro, status}]
+      loading: true,
+      qntoken: '',
+      formTitle: '',
+      form: {
+        id: 0,
+        mobile: '',
+        name: '',
+        user_type: '',
+        user_title: '',
+        role: '', // 其实应该是 int 类型
+        intro: ''
+      },
+      rules: {
+        mobile: [
+          { validator: checkMobile, trigger: 'blur' }
+        ],
+        name: [
+          { validator: checkName, trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open: function(adminId) {
+      this.admin_id = adminId
+      if (this.admin_id < 0) {
+        this.$message.error('参数错误')
+        this.loading = false
+        return
+      }
 
-                    } else {
-                        this.$message.error(resp.msg)
-                    }
+      this.form.id = this.admin_id
+      if (this.admin_id === 0) {
+        this.formTitle = '新增用户'
+        this.form.user_type = this.user_types[0].index
+        this.form.user_title = this.user_titles[0].index
+        getAddAdminInitData().then(rs => {
+          this.loading = false
+          var resp = rs.data
+          if (resp.state === 1) {
+            // this.roles.push(...resp.data.roles)
+            this.roles =  resp.data.roles
+            this.qntoken = resp.data.qntoken
+            // if (this.roles.length > 0) {
+            //   this.form.role = this.roles[0].id;
+            //   console.log("国庆快乐",this.form.role)
+            // }
+          } else {
+            this.$message.error(resp.msg)
+          }
+        }).catch(err => {
+          this.loading = false
+          this.$message.error(err)
+        })
+      } else {
+        this.formTitle = '编辑用户'
+        getModifyAdminInitData(this.form.id).then(rs => {
+          this.loading = false
+          var resp = rs.data
+          if (resp.state === 1) {
+            this.roles.push(...resp.data.roles)
+            this.qntoken = resp.data.qntoken
 
-                }).catch(err => {
-                    this.loading = false
-                    this.$message.error(err)
-                })
-                
-            } else {
-                this.formTitle = '编辑用户';
-                getModifyAdminInitData(this.form.id).then(rs => {
-                    this.loading = false
-                    var resp = rs.data
-                    if (resp.state === 1) {
-                        this.roles.push(...resp.data.roles)
-                        this.qntoken = resp.data.qntoken
-                        
-                        var admin = resp.data.admin
-                        this.form.name = admin.user_name
-                        this.form.mobile = admin.mobile
-                        this.form.user_type = admin.user_type
-                        this.form.user_title = admin.user_title
-                        this.form.role = admin.role_id
-                        this.form.intro = admin.intro
-                        
-                    } else {
-                        this.$message.error(resp.msg)
-                    }
+            var admin = resp.data.admin
+            this.form.name = admin.user_name
+            this.form.mobile = admin.mobile
+            this.form.user_type = admin.user_type
+            this.form.user_title = admin.user_title
+            this.form.role = admin.role_id
+            this.form.intro = admin.intro
+          } else {
+            this.$message.error("该用户不存在")
+          }
+        }).catch(err => {
+          this.loading = false
+          this.$message.error("该用户不存在")
+        })
+      }
 
-                }).catch(err => {
-                    this.loading = false
-                    this.$message.error(err)
-                })
-            }
-            
-            this.dialogFormVisible = true;
-        },
-        submitAction: function() {
-            if (this.admin_id < 0) {
-                return
-            }
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.loading = true
-                    if (this.form.id === 0) {
-                        addAdmin(this.form.mobile, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
-                            this.loading = false
-                            var resp = rs.data
-                            if (resp.state === 1) {
-                                this.$store.dispatch('DidChangeAdmins')
-                                var _this = this
-                                setTimeout(() => {
-                                    _this.$store.dispatch('RecoverAdminsChangeState')
-                                }, 500)
-                                this.dialogFormVisible = false;
-                                
-                            } else {
-                                this.$message.error(resp.msg)
-                            }
-
-                        }).catch(err => {
-                            this.loading = false
-                            this.$message.error(err)
-                        })
-                        
-                    } else {
-                        modifyAdmin(this.form.id, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
-                            this.loading = false
-                            var resp = rs.data
-                            if (resp.state === 1) {
-                                this.$store.dispatch('DidChangeAdmins')
-                                var _this = this
-                                setTimeout(() => {
-                                    _this.$store.dispatch('RecoverAdminsChangeState')
-                                }, 500)
-
-                                this.dialogFormVisible = false;
-                                
-                            } else {
-                                this.$message.error(resp.msg)
-                            }
+      this.dialogFormVisible = true
+    },
+    submitAction: function() {
+      if (this.admin_id < 0) {
+        return
+      }
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          if (this.form.id === 0) {
+            addAdmin(this.form.mobile, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
+              this.loading = false
+              var resp = rs.data
+              if (resp.state === 1) {
+                this.$store.dispatch('DidChangeAdmins')
+                var _this = this
+                setTimeout(() => {
+                  _this.$store.dispatch('RecoverAdminsChangeState')
+                }, 500)
+                this.dialogFormVisible = false
+              } else {
+                this.$message.error(resp.msg)
+              }
+            }).catch(err => {
+              this.loading = false
+              this.$message.error(err)
+            })
+          } else {
+            modifyAdmin(this.form.id, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
+              this.loading = false
+              var resp = rs.data
+              if (resp.state === 1) {
+                this.$store.dispatch('DidChangeAdmins')
+                var _this = this
+                setTimeout(() => {
+                  _this.$store.dispatch('RecoverAdminsChangeState')
+                }, 500)
 
-                        }).catch(err => {
-                            this.loading = false
-                            this.$message.error(err)
-                        })
-                    }
-                    
-                } else {
-                    return false
-                }
+                this.dialogFormVisible = false
+              } else {
+                this.$message.error(resp.msg)
+              }
+            }).catch(err => {
+              this.loading = false
+              this.$message.error(err)
             })
+          }
+        } else {
+          return false
         }
-    },
+      })
+    }
+  }
 
 }
 </script>

src/xt_pages/sign/index.vue

@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, updateSignweight,sighdata} from '@/api/signandweigh'
+import { fetchSignPatients, getPatientSign, getDialysisInforInfomation, getDialysisAfterInfomation, updateSignweight, sighdata } from '@/api/signandweigh'
 import BreadCrumb from '../components/bread-crumb'
 export default {
   name: 'sign',
@@ -142,7 +142,7 @@ export default {
 
       },
       weigh_list: {
-        id:'',
+        id: '',
         weight_before: '', // 透前体重
         temperature: '', // 体温
         pulse_frequency: '', // 脉搏
@@ -201,10 +201,10 @@ export default {
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
           // console.log('病人信息', this.patients[0].schedule)
-          console.log("病人信息:",this.patients)
+          console.log('病人信息:', this.patients)
           // 将没有排班的信息排除
           for (let i = this.patients.length - 1; i >= 0; i--) {
-            if (this.patients[i].schedule.id == 0) {
+            if (this.patients[i].schedule.id === 0) {
               this.patients.splice(i, 1)
             }
           }
@@ -228,37 +228,37 @@ export default {
         }
       })
     },
-    //  getPatientSign(){
-    //      getPatientSign(this.querySignParams).then(response=>{
-    //          if (response.data.state==1) {
-    //             if (response.data.data.sign != null) {
-    //                  var sign = response.data.data.sign;
-    //                  this.weigh_form.dry_weight = sign.dry_weight;
-    //                 this.weigh_form.clothes_weight = sign.clothes_weight;
-    //                   // 透前
-    //                  this.weigh_form.weigh_before = sign.weigh_before;
-    //                  this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
-    //                  this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
-    //                  this.weigh_form.weight_before = sign.weight_before;
-    //                  this.weigh_form.temperature_before = sign.temperature_before;
-    //                 this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
-    //                  this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
-    //                  this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
-    //                  this.weigh_form.SBP_before = sign.SBP_before // 收缩压
-    //                    // 透后
-    //                  this.weigh_form.weigh_after = sign.weigh_after;
-    //                  this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
-    //                  this.weigh_form.weight_after = sign.weight_after
-    //                  this.weigh_form.temperature_after = sign.temperature_after;
-    //                  this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
-    //                  this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
-    //                  this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
-    //                  this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
-    //                 this.weigh_form.id=sign.id;
-    //              }
-    //          }
-    //      });
-    // },
+    getPatientSign() {
+      getPatientSign(this.querySignParams).then(response => {
+        if (response.data.state == 1) {
+          if (response.data.data.sign != null) {
+            var sign = response.data.data.sign
+            this.weigh_form.dry_weight = sign.dry_weight
+            this.weigh_form.clothes_weight = sign.clothes_weight
+            // 透前
+            this.weigh_form.weigh_before = sign.weigh_before
+            this.weigh_form.dehydrated_weight = sign.dehydrated_weight
+            this.weigh_form.dehydrated_percent = sign.dehydrated_percent
+            this.weigh_form.weight_before = sign.weight_before
+            this.weigh_form.temperature_before = sign.temperature_before
+            this.weigh_form.pulse_rate_before = sign.pulse_rate_before // P 脉率
+            this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before // R 呼吸频率
+            this.weigh_form.DBP_before = sign.DBP_before // 舒张压
+            this.weigh_form.SBP_before = sign.SBP_before // 收缩压
+            // 透后
+            this.weigh_form.weigh_after = sign.weigh_after
+            this.weigh_form.weight_reduce_after = sign.weight_reduce_after
+            this.weigh_form.weight_after = sign.weight_after
+            this.weigh_form.temperature_after = sign.temperature_after
+            this.weigh_form.pulse_rate_after = sign.pulse_rate_after // P 脉率
+            this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after // R 呼吸频率
+            this.weigh_form.DBP_after = sign.DBP_after // 舒张压
+            this.weigh_form.SBP_after = sign.SBP_after // 收缩压
+            this.weigh_form.id = sign.id
+          }
+        }
+      })
+    },
     changeSearch() {
       this.queryParams.need_schedule_type = 0
       this.fetchSignPatients()
@@ -272,47 +272,47 @@ export default {
       this.weigh_form.patient_id = row.id
       this.querySignParams.patient_id = row.id
       this.dialysis_stege = row.dialysis_order.stage
-      console.log("呵呵呵",this.dialysis_stege)
+      console.log('呵呵呵', this.dialysis_stege)
       this.getDialysisInforInfomation(row.id)
       this.getDialysisAfterInfomation(row.id)
-      this.weigh_list.id=row.signin.id
-      //console.log("是否有数据",this.weigh_list.id)
+      this.weigh_list.id = row.signin.id
+      // console.log("是否有数据",this.weigh_list.id)
       // this.getsignweigh(row.id)
     },
     getDialysisInforInfomation(id) {
       getDialysisInforInfomation(id).then(response => {
         if (response.data.data.patientlist != null) {
           var patientlist = response.data.data.patientlist
-          console.log("patientlist是什么?",patientlist)
+          console.log('patientlist是什么?', patientlist)
           this.weigh_list.id = patientlist.id
           console.log(this.weigh_list.id)
           this.weigh_list.dry_weight = patientlist.dry_weight
           console.log('干体重:' + this.weigh_list.dry_weight)
-          if (this.weigh_list.dry_weight == 0) {
+          if (this.weigh_list.dry_weight === 0) {
             this.weigh_list.dry_weight = ''
           }
           this.weigh_list.weight_before = patientlist.weight_before
-          if (this.weigh_list.weight_before == 0) {
+          if (this.weigh_list.weight_before === 0) {
             this.weigh_list.weight_before = ''
           }
           this.weigh_list.temperature = patientlist.temperature
-          if (this.weigh_list.temperature == 0) {
+          if (this.weigh_list.temperature === 0) {
             this.weigh_list.temperature = ''
           }
           this.weigh_list.pulse_frequency = patientlist.pulse_frequency
-          if (this.weigh_list.pulse_frequency == 0) {
+          if (this.weigh_list.pulse_frequency === 0) {
             this.weigh_list.pulse_frequency = ''
           }
           this.weigh_list.breathing_rate = patientlist.breathing_rate
-          if (this.weigh_list.breathing_rate == 0) {
+          if (this.weigh_list.breathing_rate === 0) {
             this.weigh_list.breathing_rate = ''
           }
           this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
-          if (this.weigh_list.systolic_blood_pressure == 0) {
+          if (this.weigh_list.systolic_blood_pressure === 0) {
             this.weigh_list.systolic_blood_pressure = ''
           }
           this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
-          if (this.weigh_list.diastolic_blood_pressure == 0) {
+          if (this.weigh_list.diastolic_blood_pressure === 0) {
             this.weigh_list.diastolic_blood_pressure = ''
           }
         }
@@ -325,34 +325,34 @@ export default {
           var patientinfor = response.data.data.patientinfor
           console.log(patientinfor)
           this.weigh_infor.dry_weight = patientinfor.dry_weight
-          if (this.weigh_infor.dry_weight == 0) {
+          if (this.weigh_infor.dry_weight === 0) {
             this.weigh_infor.dry_weight = ''
           }
 
           this.weigh_infor.weight_after = patientinfor.weight_after
-          if (this.weigh_infor.weight_after == 0) {
+          if (this.weigh_infor.weight_after === 0) {
             this.weigh_infor.weight_after = ''
           }
 
           this.weigh_infor.temperature = patientinfor.temperature
-          if (this.weigh_infor.temperature == 0) {
+          if (this.weigh_infor.temperature === 0) {
             this.weigh_infor.temperature = ''
           }
           this.weigh_infor.pulse_frequency = patientinfor.pulse_frequency
-          if (this.weigh_infor.pulse_frequency == 0) {
+          if (this.weigh_infor.pulse_frequency === 0) {
             this.weigh_infor.pulse_frequency = ''
           }
           this.weigh_infor.breathing_rate = patientinfor.breathing_rate
-          if (this.weigh_infor.breathing_rate == 0) {
+          if (this.weigh_infor.breathing_rate === 0) {
             this.weigh_infor.breathing_rate = ''
           }
           this.weigh_infor.systolic_blood_pressure = patientinfor.systolic_blood_pressure
-          if (this.weigh_infor.systolic_blood_pressure == 0) {
+          if (this.weigh_infor.systolic_blood_pressure === 0) {
             this.weigh_infor.systolic_blood_pressure = ''
           }
 
           this.weigh_infor.diastolic_blood_pressure = patientinfor.diastolic_blood_pressure
-          if (this.weigh_infor.diastolic_blood_pressure == 0) {
+          if (this.weigh_infor.diastolic_blood_pressure === 0) {
             this.weigh_infor.diastolic_blood_pressure = ''
           }
         }
@@ -381,21 +381,21 @@ export default {
       params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
-      console.log("干体重:"+ params.dry_weight)
-      updateSignweight(params).then(response =>{
-         if(response.data.state ===1){
-            this.$message({
+
+      updateSignweight(params).then(response => {
+        if (response.data.state === 1) {
+          this.$message({
             type: 'success',
             message: '成功!'
-           })
-         }
+          })
+        }
       })
-       console.log("params数据",params)
+      console.log('params数据', params)
     },
     hide() {
       this.show = false
     },
-  
+
     sighdata() {
       // 透前数据
       var params = new Object()
@@ -419,7 +419,7 @@ export default {
       console.log('params是什么?', params)
       sighdata(params).then(response => {
         var signs = response.data.data.signs
-        console.log("signs是什么?",signs)
+        console.log('signs是什么?', signs)
         if (response.data.state === 1) {
           this.$message({
             type: 'success',
@@ -428,21 +428,21 @@ export default {
           var tlen = this.patients.length
 
           for (let index = 0; index < tlen; index++) {
-            if (this.patients[index].id == params.patient_id) {
+            if (this.patients[index].id === params.patient_id) {
               var signin = this.patients[index].signin
               this.patients[index].signin = response.data.data.signs
 
               if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
                 var sl = this.schedules.length
                 for (let j = 0; j < sl; j++) {
-                  if (this.schedules[j].type == this.patients[index].schedule.schedule_type) {
-                    if ((signin.weigh_before_time == 0 && response.data.data.signs.weigh_before_time > 0) || (signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)) {
+                  if (this.schedules[j].type === this.patients[index].schedule.schedule_type) {
+                    if ((signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0) || (signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)) {
                       this.schedules[j].sign++
                     }
                     if (signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0) {
                       this.schedules[j].before++
                     }
-                    if (signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0) {
+                    if (signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0) {
                       this.schedules[j].after++
                     }
                   }

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

src/xt_pages/user/patients.vue

@@ -247,21 +247,21 @@
   import { fetchList, EditLapseto, OpenView, code } from '@/api/patient'
   import QRCode from 'qrcodejs2'
   import Vue from 'vue'
-  import  print from 'print-js'
+  import print from 'print-js'
   import { Base64 } from 'js-base64'
-  import { uParseTime} from '@/utils/tools'
+  import { uParseTime } from '@/utils/tools'
   import { log } from 'util'
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-  export default {
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+export default {
     name: 'Patient',
-    components:{
+    components: {
       BreadCrumb
     },
     data() {
       return {
         crumbs: [
           { path: false, name: '病人管理' },
-          { path: '/patients/patients', name: '病人管理' },
+          { path: '/patients/patients', name: '病人管理' }
         ],
         lapsetoRules: {
           lapseto_type: [
@@ -385,8 +385,8 @@
 
     methods: {
       EditLapseto() {
-        if (this.lapsetoForm.lapseto_time == ''){
-          this.$message.error("请选择时间")
+        if (this.lapsetoForm.lapseto_time == '') {
+          this.$message.error('请选择时间')
           return
         }
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm).then(response => {
@@ -506,6 +506,7 @@
             return false
           } else {
             var patient = response.data.data.patient
+            console.log('二维码病人信息', patient)
             this.id = patient.id
             this.name = patient.name
             this.gender = patient.gender