Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

.gitignore

@@ -8,3 +8,4 @@ dist/
 .idea/modules.xml
 .idea/vcs.xml
 .idea/workspace.xml
+.DS_Store

config/dev.env.js

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

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // 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.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
     host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package-lock.json

@@ -4737,7 +4737,7 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
           "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
           "dev": true,
           "optional": true
@@ -4749,14 +4749,14 @@
         },
         "aproba": {
           "version": "1.2.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
           "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
           "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
           "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
           "dev": true,
           "optional": true,
@@ -4772,7 +4772,7 @@
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
           "requires": {
@@ -4782,7 +4782,7 @@
         },
         "chownr": {
           "version": "1.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
           "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
           "dev": true,
           "optional": true
@@ -4794,26 +4794,26 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "dev": true,
           "optional": true
         },
         "debug": {
           "version": "2.6.9",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "optional": true,
@@ -4823,28 +4823,28 @@
         },
         "deep-extend": {
           "version": "0.6.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
           "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
           "dev": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "dev": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "dev": true,
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
           "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
           "dev": true,
           "optional": true,
@@ -4854,14 +4854,14 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "dev": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
           "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "dev": true,
           "optional": true,
@@ -4878,7 +4878,7 @@
         },
         "glob": {
           "version": "7.1.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "dev": true,
           "optional": true,
@@ -4893,14 +4893,14 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
           "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "dev": true,
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.24",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "dev": true,
           "optional": true,
@@ -4910,7 +4910,7 @@
         },
         "ignore-walk": {
           "version": "3.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
           "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
           "dev": true,
           "optional": true,
@@ -4920,7 +4920,7 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "optional": true,
@@ -4936,14 +4936,14 @@
         },
         "ini": {
           "version": "1.3.5",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
           "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
           "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
@@ -4952,14 +4952,14 @@
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
           "requires": {
@@ -4973,7 +4973,7 @@
         },
         "minipass": {
           "version": "2.3.5",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
           "requires": {
@@ -4983,7 +4983,7 @@
         },
         "minizlib": {
           "version": "1.2.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
           "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
           "dev": true,
           "optional": true,
@@ -4993,7 +4993,7 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
           "requires": {
@@ -5002,14 +5002,14 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true,
           "optional": true
         },
         "needle": {
           "version": "2.2.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
           "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
           "dev": true,
           "optional": true,
@@ -5021,7 +5021,7 @@
         },
         "node-pre-gyp": {
           "version": "0.10.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
           "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
           "dev": true,
           "optional": true,
@@ -5040,7 +5040,7 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "dev": true,
           "optional": true,
@@ -5051,14 +5051,14 @@
         },
         "npm-bundled": {
           "version": "1.0.5",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
           "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
           "version": "1.2.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
           "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
           "dev": true,
           "optional": true,
@@ -5069,7 +5069,7 @@
         },
         "npmlog": {
           "version": "4.1.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
           "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
           "dev": true,
           "optional": true,
@@ -5087,14 +5087,14 @@
         },
         "object-assign": {
           "version": "4.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "requires": {
@@ -5103,21 +5103,21 @@
         },
         "os-homedir": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
           "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
           "dev": true,
           "optional": true,
@@ -5128,21 +5128,21 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "dev": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
           "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
           "dev": true,
           "optional": true,
@@ -5155,7 +5155,7 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-              "resolved": false,
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
               "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
               "dev": true,
               "optional": true
@@ -5164,7 +5164,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "optional": true,
@@ -5180,7 +5180,7 @@
         },
         "rimraf": {
           "version": "2.6.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "dev": true,
           "optional": true,
@@ -5195,42 +5195,42 @@
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
           "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "dev": true,
           "optional": true
         },
         "semver": {
           "version": "5.6.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
           "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
           "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "dev": true,
           "optional": true
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
@@ -5241,7 +5241,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "optional": true,
@@ -5251,7 +5251,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -5260,14 +5260,14 @@
         },
         "strip-json-comments": {
           "version": "2.0.1",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
           "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "dev": true,
           "optional": true
         },
         "tar": {
           "version": "4.4.8",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
           "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
           "dev": true,
           "optional": true,
@@ -5283,14 +5283,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "dev": true,
           "optional": true
         },
         "wide-align": {
           "version": "1.1.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
           "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
           "dev": true,
           "optional": true,
@@ -5305,7 +5305,7 @@
         },
         "yallist": {
           "version": "3.0.3",
-          "resolved": false,
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
           "dev": true
         }

src/App.vue

@@ -9,6 +9,11 @@ import axios from 'axios'
 import { getOrgs, changeOrg } from "@/api/config";
 export default {
   name: "App",
+  provide() {
+    return {
+      reload: this.reload
+    };
+  },
   data () {
     return {
       isRouterAlive: true,
@@ -19,6 +24,7 @@ export default {
   },
 
   created(){
+
     // getOrgs().then(response => {
     //   if (response.data.state === 1) {
     //     var creator = response.data.data.creator;

src/api/advice.js

@@ -363,6 +363,7 @@ export function EditNewDoctorAdvice(patient, id, advice, mode) {
 }
 
 export function CreateNewDoctorAdvice(id, advice, mode) {
+
   return request({
     url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
     method: "post",
@@ -498,6 +499,7 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors (params) {
+  
   return request({
     url: '/api/schedule/advices',
     method: 'get',
@@ -505,6 +507,15 @@ export function getSchedualDoctors (params) {
   })
 }
 
+export function getDoctorAdviceCount(params){
+  
+  return request({
+    url:"/api/schedule/getdoctoradvicecount",
+    method:"get",
+    params:params
+  })
+}
+
 
 
 

src/api/dialysis.js

@@ -290,5 +290,3 @@ export function GetDialysisGoodStatistics(params) {
 
   })
 }
-
-

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse,change_nurse,difficult_puncture_nurse,new_fistula_nurse) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -58,8 +58,12 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     lood_drawing: lood_drawing,
     schedual_type: schedual_type,
     mode: mode,
-    washpipe_nurse:washpipe_nurse
+    washpipe_nurse:washpipe_nurse,
+    change_nurse:change_nurse,
+    difficult_puncture_nurse:difficult_puncture_nurse,
+    new_fistula_nurse:new_fistula_nurse
   }
+  console.log("params",params)
   return request({
     url: '/api/dialysis/start_record',
     method: 'post',

src/api/drug/drug.js

@@ -276,11 +276,11 @@ export function getPatientDetail(id,params){
    })
 }
 
-// export function toSeachPatient(params){
+export function getSelfStockQuery(params){
    
-//    return request({
-//       url:"/api/drug/toseachpatient",
-//       methods:"Get",
-//       params:params
-//    })
-// }
+   return request({
+      url:"/api/drug/getselfstockquery",
+      methods:"get",
+      params:params
+   })
+}

src/api/drug/drug_stock.js

@@ -385,9 +385,41 @@ export function getDrugStockAutomaticReduceConfig() {
 }
 
 
+export function getDrugIndetail(params){
+  return request({
+    url:"/api/drugstock/getdrugindetail",
+    method:"Get",
+    params:params
+  })
+}
+
+
+export function getDrugCancelOrder(params){
+  
+   return request({
+     url:"/api/drugstock/getdrugcancelorder",
+     method:"get",
+     params:params
+   })
+}
 
+export function getDrugOutDetail(params){
+  
+  return request({
+    url:"/api/drugstock/getdrugoutdetail",
+    method:"get",
+    params:params
+  })
+}
 
+export function getDrugCancelDetail(params){
 
+  return request({
+    url:"/api/drugstock/getdrugcanceldetail",
+    method:"Get",
+    params:params
+  })
+}
 
 
 

src/api/his/his.js

@@ -279,10 +279,69 @@ export function getCallHisPrescription (params) {
 
 
 
+export function getDayOrMonthHisPrescription (params) {
+  return request({
+    url: '/api/dayprescription/get',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
+
+
+export function editHisPrescription(data, params) {
+  return request({
+    url: "/api/hisprescription/edit",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
 
 
+export function getChargeHisPatientList (params) {
+  return request({
+    url: '/api/charge/list',
+    method: 'get',
+    params:params,
+  })
+}
+
 
 
+export function getChargeHisPatientInfo (params) {
+  return request({
+    url: '/api/charge/info',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+export function getHisOrderDetail (params) {
+  return request({
+    url: '/api/orderdetail/get',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
+
+
+export function getHisOrderDetailCollect (params) {
+  return request({
+    url: '/api/orderdetaicollect/get',
+    method: 'get',
+    params:params,
+  })
+}
 
 
 

src/api/patient.js

@@ -70,6 +70,7 @@ export function createPatientDialysisSolution(id, solution, mode) {
 }
 
 export function editPatientDialysisSolution(patient, id, solution, mode) {
+  
   return request({
     url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id + '&mode=' + mode,
     method: 'put',
@@ -380,3 +381,94 @@ export function deleteDryWeight(id, data) {
     data: data
   })
 }
+
+
+export function saveVasularAccess(params){
+   
+  return request({
+    url:"/api/patient/savevasularaccess",
+    method:"Get",
+    params:params
+  })
+} 
+
+export function getAllVascularAccessList(params){
+  
+  return request({
+    url:"/api/patient/getallvascualraccesslist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getVascularAccessByDetail(id,params){
+  
+  return request({
+    url:"/api/patient/getvascularaccessbydetial?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function updatedVasularAccess(params){
+  
+  return request({
+    url:"/api/patient/updatevasularaccess",
+    method:"get",
+    params:params
+  })
+}
+
+export function DeleteVascularAccess(id,params){
+  
+  return request({
+    url:"/api/patient/deletevascularaccess?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function savePasswayAssessment(params){
+  
+  return request({
+    url:"/api/patient/savepasswayassessment",
+    method:"get",
+    params:params
+  })
+}
+
+export function getAllPassWayAssessmentList(params){
+  
+  return request({
+    url:"/api/patient/getallpasswayassessment",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPassWayAssessmentById(id,params){
+  
+  return request({
+    url:"/api/patient/getpasswayassmentbyid?id="+id,
+    method:"Get",
+    params:params,
+  })
+}
+
+export function updatePasswayAssessment(params){
+  
+  return request({
+    url:"/api/patient/updatepasswayassesment",
+    method:"get",
+    params:params
+  })
+}
+
+export function DeletePassWayAssessMent(id,params){
+  
+  return request({
+    url:"/api/patient/deletepasswayassessment?id="+id,
+    method:"get",
+    params:params
+  })
+}

src/api/project/project.js

@@ -3,516 +3,524 @@ import url from "postcss-url";
 
 export function saveProject(params){
 
-    return request({
-        url:"/api/his/saveproject",
-        methods:"get",
-        params:params,
-    })
+  return request({
+    url:"/api/his/saveproject",
+    methods:"get",
+    params:params,
+  })
 }
 
 
 export function getProjectList(params){
-   
-    return request({
-       url:"/api/his/getprojectlist",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getProjectDetail(id,params){
-  
-    return request({
-       url:"/api/his/getprojectdetail?id="+id,
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectdetail?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function updatedProject(params){
-   
-   return request({
-      url:"/api/his/updatedproject",
-      methods:"get",
-      params:params
-   })
+
+  return request({
+    url:"/api/his/updatedproject",
+    methods:"get",
+    params:params
+  })
 }
 
 export function deleteHisProject(id,params){
-   
-    return request({
-      url:"/api/his/deletehisproject?id="+id,
-      methods:"get",
-      params:params
-    })
+
+  return request({
+    url:"/api/his/deletehisproject?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function saveProjectTeam(params){
-  
-   return request({
-     url:"/api/his/saveprojectteam",
-     methods:"Get",
-     params:params
-   })
+
+  return request({
+    url:"/api/his/saveprojectteam",
+    methods:"Get",
+    params:params
+  })
 }
 
 export function getProjectTeamList(params){
-  
-    return request({
-       url:"/api/his/getprojectteamlist",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectteamlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getProjectTeamDetail(id,params){
-   
-    return request({
-       url:"/api/his/getprojectteamdetail?id="+id,
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectteamdetail?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function updatedProjectTeam(params){
-  
-    return request({
-       url:"/api/his/updateprojectteam",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/updateprojectteam",
+    methods:"get",
+    params:params
+  })
 }
 
 export function DeleteProjectTeam(id,params){
-   
+
   return request({
-      url:"/api/his/deleteprojectteam?id="+id,
-      methods:"get",
-      params:params
+    url:"/api/his/deleteprojectteam?id="+id,
+    methods:"get",
+    params:params
   })
 }
 
 export function SaveDepartment(params){
-  
-    return request({
-       url:"/api/his/savedepartment",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/savedepartment",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getDePartmentList(params){
-  
-    return request({
-       url:"/api/his/getdepartmentlist",
-       methods:"Get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getdepartmentlist",
+    methods:"Get",
+    params:params
+  })
 }
 
 export function getDepartMentDetail(id,params){
-  
-    return request({
-        url:"/api/his/getdepartmentdetail?id="+id,
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/getdepartmentdetail?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function UpdatedDepartment(params){
-   
-    return request({
-        url:"/api/his/updagtedepartment",
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/updagtedepartment",
+    methods:"get",
+    params:params
+  })
 }
 
 export function DeleteDepartment(id,params){
-    return request({
-       url:"/api/his/deletedeparment?id="+id,
-       methods:"get",
-       params:params
-    })
+  return request({
+    url:"/api/his/deletedeparment?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 
 export function getPatientList(params){
-   return request({
-       url:"/api/his/getbloodpatient",
-       methods:"get",
-       params:params
-   })
+  return request({
+    url:"/api/his/getbloodpatient",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getHisPrescription(id,params){
-   
-    return request({
-       url:"/api/his/gethisprescription?id="+id,
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/gethisprescription?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function saveCharges(data){
-    
-    return request({
-       url:"/api/his/additionalcharge",
-       method:"post",
-       data:data
-    })
+
+  return request({
+    url:"/api/his/additionalcharge",
+    method:"post",
+    data:data
+  })
 }
 
 
 export function getAllProjectList(params){
-    return request({
-       url:"/api/his/getallprojectlist",
-       methods:"get",
-       params:params
-    })
+  return request({
+    url:"/api/his/getallprojectlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function addProjectList(params){
-  
-    return request({
-       url:"/api/his/addprojectlist",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/addprojectlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getPatientInformation(id,params){
-   
-   return request({
-     url:"/api/his/getpatientinformation?id="+id,
-     methods:"Get",
-     params:params
-   })
+
+  return request({
+    url:"/api/his/getpatientinformation?id="+id,
+    methods:"Get",
+    params:params
+  })
 }
 
 export function DeleteProject(id,params){
-   
-    return request({
-       url:"/api/his/deleteproject?id="+id,
-       methods:"Get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/deleteproject?id="+id,
+    methods:"Get",
+    params:params
+  })
 }
 
 
 export function getHisProject(params){
-  
-    return request({
-       url:"/api/his/gethisproject",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/gethisproject",
+    methods:"get",
+    params:params
+  })
 }
 
 export function addProjectTeam(params){
-   
+
   return request({
-      url:"/api/his/getprojectteam",
-      methods:"Get",
-      params:params
+    url:"/api/his/getprojectteam",
+    methods:"Get",
+    params:params
   })
 }
 
 export function getAllDoctorList(params){
-   
+
   return request({
-      url:"/api/his/getalldoctorlist",
-      methods:"Get",
-      params:params
+    url:"/api/his/getalldoctorlist",
+    methods:"Get",
+    params:params
   })
-} 
+}
 
 export function saveHisPatient(params){
-   
-    return request({
-        url:"/api/his/savehispatient",
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/savehispatient",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getAllProjectTeam(params){
-  
+
   return request({
-     url:"/api/hist/getallprojecteam",
-     methods:"get",
-     params:params
+    url:"/api/hist/getallprojecteam",
+    methods:"get",
+    params:params
   })
 }
 
 export function getPojectListById(params){
-  
+
   return request({
     url:"/api/his/getprojectlistbyid",
     methods:"get",
-    params:params 
+    params:params
   })
 }
 
 export function getHisPatientHistory(params){
-  
-    return request({
-        url:"/api/his/gethispatienthistory",
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/gethispatienthistory",
+    methods:"get",
+    params:params
+  })
 }
 
 
 export function changePatient(id,params){
-   
-    return request({
-      url:"/api/patient/changepatient?id="+id,
-      method:"get",
-      params:params
-    })
-  }
-
-
-  export function getPatientCaseHistory(params){
-     
-    return request({
-        url:"/api/patient/getpatientcasehistory",
-        method:"get",
-        params:params
-    })
-  }
-
-  export function SaveHisPatientCaseHistoryTemplate(params){
-      
-    return request({
-       url:"/api/doctorworkstation/casehistorytemplate/create",
-       method:"get",
-       params:params
-    })
-  }
-
-  export function getHistoryTemplate(params){
-   
-    return request({
-      url:"/api/doctorworkstation/casehistorytemplate/get",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getTemplateDetail(id,params){
-     
-     return request({
-        url:"/api/doctorworkstation/gettemplatedetail?id="+id,
-        method:"get",
-        params:params
-     })
-  }
-
-  export function updateRecordTemplate(params){
-    
-    return request({
-        url:"/api/doctorworkstation/updaterecordtemplate",
-        method:"get",
-        params:params  
-    })
-  } 
-
-  export function getHisPatient(params){
-    
-    return request({
-      url:"/api/hispatient/gehispatient",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function postPrintHisTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/postprinthistemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getHisPrintTemplate(params){
-    
-    return request({
-      url:"/api/gethisprinttemplate",
-      method:"get",
-      params:params
-    })
-  } 
-
-  export function postPrescriptionPrintTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/postprescriptiontemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getPrescriptionTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/getprescriptiontemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function postTreatPrintTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/posttreatprinttemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getTreatPrintTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/gettreatprinttemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function postChargePrintTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/postchargeprinttemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getChargePrintTemplate(params){
-     
-    return request({
-       url:"/api/hispatient/getchargeprinttemplate",
-       method:"get",
-       params:params
-    })
-  }
-
-  export function getAllHisPatientList(params){
-    
-    return request({
-      url:"/api/hispatient/getallhispatient",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getPrescriptionPrint(params){
-    
-    return request({
-      url:"/api/hispatient/getprescriptionprint",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getChargePrint(params){
-     
-    return request({
-      url:"/api/hispatient/getchargeprint",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getTodaySchedulePatient(params){
-     
-    return request({
-      url:"/api/hispatient/gettodayschedulepatient",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getHisPatientDetail(params){
-    console.log("params99999",params)
-    return request({
-      url:"/api/hispatient/gethispatientdetail",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getAllDePartmentList(params){
-   
-    return request({
-      url:"/api/hispatient/getalldepartmentlist",
-      method:"Get",
-      params:params
-    })
-  } 
-
-  export function getPrescriptionList(id,params){
-     
-    return request({
-      url:"/api/hispatient/getprescription?patient_id="+id,
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getPatientDetail(id,params){
-    
-     return request({
-       url:"/api/histpatient/getpatientdetail?id="+id,
-       method:"Get",
-       params:params
-     })
-  }
-
-  export function saveMainTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/savemaintemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getMedicalTemplateList(params){
-    
-    return request({
-      url:"/api/hispatient/getmedicaltemplatelist",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getMainTemplateById(id,params){
-    
-    return request({
-      url:"/api/hispatient/getmaintemplatebyid?id="+id,
-      method:"get",
-      params:params
-    })
-  }
-
-  export function UpdateMainTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/updatemaintemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function deleteMainTemplate(id,params){
-  
-     return request({
-       url:"/api/hispatient/deletemaintemplate?id="+id,
-       method:"Get",
-       params:params
-     })
-  }
+
+  return request({
+    url:"/api/patient/changepatient?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+
+export function getPatientCaseHistory(params){
+
+  return request({
+    url:"/api/patient/getpatientcasehistory",
+    method:"get",
+    params:params
+  })
+}
+
+export function SaveHisPatientCaseHistoryTemplate(params){
+
+  return request({
+    url:"/api/doctorworkstation/casehistorytemplate/create",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHistoryTemplate(params){
+
+  return request({
+    url:"/api/doctorworkstation/casehistorytemplate/get",
+    method:"get",
+    params:params
+  })
+}
+
+export function getTemplateDetail(id,params){
+
+  return request({
+    url:"/api/doctorworkstation/gettemplatedetail?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function updateRecordTemplate(params){
+
+  return request({
+    url:"/api/doctorworkstation/updaterecordtemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHisPatient(params){
+
+  return request({
+    url:"/api/hispatient/gehispatient",
+    method:"get",
+    params:params
+  })
+}
+
+export function postPrintHisTemplate(params){
+
+  return request({
+    url:"/api/hispatient/postprinthistemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHisPrintTemplate(params){
+
+  return request({
+    url:"/api/gethisprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function postPrescriptionPrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/postprescriptiontemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getPrescriptionTemplate(params){
+
+  return request({
+    url:"/api/hispatient/getprescriptiontemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function postTreatPrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/posttreatprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getTreatPrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/gettreatprinttemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function postChargePrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/postchargeprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getChargePrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/getchargeprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getAllHisPatientList(params){
+
+  return request({
+    url:"/api/hispatient/getallhispatient",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPrescriptionPrint(params){
+
+  return request({
+    url:"/api/hispatient/getprescriptionprint",
+    method:"get",
+    params:params
+  })
+}
+
+export function getChargePrint(params){
+
+  return request({
+    url:"/api/hispatient/getchargeprint",
+    method:"get",
+    params:params
+  })
+}
+
+export function getTodaySchedulePatient(params){
+
+  return request({
+    url:"/api/hispatient/gettodayschedulepatient",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHisPatientDetail(params){
+  console.log("params99999",params)
+  return request({
+    url:"/api/hispatient/gethispatientdetail",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getAllDePartmentList(params){
+
+  return request({
+    url:"/api/hispatient/getalldepartmentlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getPrescriptionList(id,params){
+
+  return request({
+    url:"/api/hispatient/getprescription?patient_id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getPatientDetail(id,params){
+
+  return request({
+    url:"/api/histpatient/getpatientdetail?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function saveMainTemplate(params){
+
+  return request({
+    url:"/api/hispatient/savemaintemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getMedicalTemplateList(params){
+
+  return request({
+    url:"/api/hispatient/getmedicaltemplatelist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getMainTemplateById(id,params){
+
+  return request({
+    url:"/api/hispatient/getmaintemplatebyid?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function UpdateMainTemplate(params){
+
+  return request({
+    url:"/api/hispatient/updatemaintemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function deleteMainTemplate(id,params){
+
+  return request({
+    url:"/api/hispatient/deletemaintemplate?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getUnRegisterHisPatientList (params) {
+  return request({
+    url: '/api/unregister/list',
+    method: 'get',
+    params:params,
+  })
+}

src/api/schedule.js

@@ -1,16 +1,18 @@
 import request from '@/utils/request'
 
-export function getWeekPanels(t) {
+export function getWeekPanels(t,patitionId) {
+  console.log("params33333",t,patitionId)
   return request({
-    url: '/api/schedule/weekpanel?data=' + t,
+    url: '/api/schedule/weekpanel?data=' + t+"&patitionid="+patitionId,
     method: 'get'
   })
 }
 
-export function getSchedules(week) {
+export function getSchedules(params) {
   return request({
-    url: '/api/schedule/schedules?weekTime=' + week,
-    method: 'get'
+    url: '/api/schedule/schedules',
+    method: 'get',
+    params:params,
   })
 }
 
@@ -122,3 +124,22 @@ export function getNextScheduleWeekDay(params){
     params:params
   })
 }
+
+
+export function getThreeWeekList(params){
+  
+  return request({
+    url:"/api/schedule/getthreeweeklist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getAllZones(params){
+  
+  return request({
+    url:"/api/schedule/getallzones",
+    method:"get",
+    params:params
+  })
+}

src/api/stock.js

@@ -121,6 +121,7 @@ export function GetGoodType(params) {
 }
 
 export function createGoodInfo(params) {
+  console.log("prams",params)
   return request({
     url: '/api/stock/good/info/create',
     method: 'post',
@@ -574,4 +575,13 @@ export function PostSearchStock(keyword,params){
     method:"get",
     params:params
   })
+}
+
+export function GetOutStockTotalCount(params){
+  
+  return request({
+    url:"/api/warehouseout/getoutstocktotalcount",
+    method:"get",
+    params:params
+  })
 }

src/lang/zh.js

@@ -204,6 +204,7 @@ export default {
     scrm: 'SCRM',
     shop: '分销商城',
 
+    costComparison:'医保费用对照',
     incomeStatistics:'收入统计',
     outpatientRegistration:'门诊挂号',
     outpatientRegistrationIndex:'门诊挂号',
@@ -231,7 +232,7 @@ export default {
     dictionaryManagement:'字典管理',
     templateManagement:'模板管理',
     drugStockUserDetail:"出库人明细",
-    DepartManage:"部门管理",
+    DepartManage:"科室管理",
     basicConfig:'基础配置',
 
     histemplate:'处方模版',

src/router/index_路由未分离前.js

@@ -604,6 +604,7 @@ export const xt_asyncRouterMap = [
         name: 'weight',
         meta: { title: 'weight', noCache: true }
       },
+   
       {
         path: '/patients/patient/:id/dialysisRecord',
         component: () => import('@/xt_pages/user/dialysisRecord'),
@@ -886,7 +887,8 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/index'),
         name: 'config',
         meta: { title: 'config' }
-      }
+      },
+     
     ]
   },
   {

src/router/modules/dialysis.js

@@ -67,50 +67,50 @@ export default {
         noCache: true
       }
     },
-    // {
-    //   path: '/dialysis/consumableDrugs_print',
-    //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'consumableDrugs_print',
-    //   meta: {
-    //     title: 'consumableDrugs_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/dialysisDrugs_print',
-    //   component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysisDrugs_print',
-    //   meta: {
-    //     title: 'dialysisDrugs_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/dialysisParameters_print',
-    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysisParameters_print',
-    //   meta: {
-    //     title: 'dialysisParameters_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/allSummary_print',
-    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'allSummary_print',
-    //   meta: {
-    //     title: 'allSummary_print',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/dialysis/consumableDrugs_print',
+      component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'consumableDrugs_print',
+      meta: {
+        title: 'consumableDrugs_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/dialysisDrugs_print',
+      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisDrugs_print',
+      meta: {
+        title: 'dialysisDrugs_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/dialysisParameters_print',
+      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisParameters_print',
+      meta: {
+        title: 'dialysisParameters_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/allSummary_print',
+      component: () => import('@/xt_pages/dialysis/allSummary_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'allSummary_print',
+      meta: {
+        title: 'allSummary_print',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),
@@ -316,6 +316,90 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/twentyFive',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyFive'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyFive',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/twentyEight',
+      component: () =>
+      import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyEight'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyFive',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/thirty',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirty'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_thirty',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/thirtyTwo',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_thirtyTwo',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/thirtyThree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtyThree'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_thirtyThree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/thirtyThree_one',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtyThree_one'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_print_thirtyThree_one',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/thirtyThree_two',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtyThree_two'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_print_thirtyThree_two',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twentyTwo_one',
       component: () =>

src/router/modules/drugs.js

@@ -42,6 +42,12 @@ export default {
         name: 'drugsStockCancel',
         meta: { title: 'drugsStockCancel', noCache: true }
     },
+    {
+      path:'/stock/drugs/stock/detail',
+      component:()=>import('@/xt_pages/stock/drugs/drugIndex'),
+      name:'drugDetail',
+      meta:{title:'明细查询',noCache:true}
+    },
     // {
     //     path: '/stock/drugs/stock/adjustPrice',
     //     component: () => import('@/xt_pages/stock/drugs/adjustPrice'),

src/router/modules/outpatientCharges.js

@@ -48,6 +48,12 @@ export default {
         name: 'incomeStatistics',
         meta: { title: 'incomeStatistics', noCache: true }
     },
+    {
+        path: '/outpatientCharges/costComparison',
+        component: () => import('@/xt_pages/outpatientCharges/costComparison'),
+        name: 'costComparison',
+        meta: { title: 'costComparison', noCache: true }
+    },
     {
         path: '/outpatientCharges/summaryDetail',
         component: () => import('@/xt_pages/outpatientCharges/summaryDetail'),

src/router/modules/patient.js

@@ -62,6 +62,29 @@ export default {
       noCache: true
     }
   },
+
+  {
+    path: '/patients/patient/:id/vascularAccess',
+    component: () => import('@/xt_pages/user/vascularAccess'),
+    hidden: true,
+    is_menu: false,
+    name: 'vascularAccess',
+    meta: {
+      title: 'vascularAccess',
+      noCache: true
+    }
+  },
+  {
+    path: '/patients/patient/:mid/vascularAccessDetail/:pid',
+    component: () => import('@/xt_pages/user/vascularAccessDetail'),
+    hidden: true,
+    is_menu: false,
+    name: 'vascularAccessDetail',
+    meta: {
+      title: 'vascularAccessDetail',
+      noCache: true
+    }
+  },
   {
     path: '/patients/patient/:id/dialysisRecord',
     component: () => import('@/xt_pages/user/dialysisRecord'),

src/router/modules/qcd.js

@@ -233,8 +233,8 @@ export default {
       }
     },
     {
-      path: '/qcd/workAnalysis/doctor',
-      component: () => import('@/xt_pages/qcd/workAnalysis/doctor'),
+      path: '/qcd/workAnalysis/index',
+      component: () => import('@/xt_pages/qcd/workAnalysis/index'),
       name: 'workAnalysisDoctor',
       meta: {
         title: '工作量分析统计',

src/router/modules/selfPreparedMedicine.js

@@ -12,6 +12,14 @@ export default {
     isChild: true
   },
   children: [
+    {
+      path: '/stock/selfstockquery',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),
+      name: 'stockquery',
+      meta: { title: '库存查询', noCache: true }
+
+    },
+
     {
         path: '/stock/selfPreparedMedicineIndex',
         component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
@@ -46,5 +54,39 @@ export default {
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
      },
+     {
+       path:"/stock/selfstockprint",
+       component:()=>import('@/xt_pages/stock/selfStockPrint'),
+       name:'selfStockQuery',
+       hidden:true,
+       is_menu:false,
+       meta:{title:'selfStockPrint',noCache:true}
+     },
+
+     {
+      path: '/stock/stockprint',
+      component: () => import('@/xt_pages/stock/stockPrint'),
+      name: 'stockqueryprint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockprint', noCache: true }
+     },
+
+     {
+      path: '/stock/in/detail/print',
+      component: () => import('@/xt_pages/stock/stockInOrderDetailPrint'),
+      name: 'stockInDetailPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInDetailPrint',noCache: true }
+    },
+    {
+      path: '/stock/out/detail',
+      component: () => import('@/xt_pages/stock/stockOutOrderDetailPrint'),
+      name: 'stockOutDetailPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutDetailPrint',noCache: true }
+    },
   ]
 }

src/router/modules/stock.js

@@ -189,5 +189,85 @@ export default {
       is_menu: false,
       meta: { title: 'user_detail', noCache: true }
     },
+
+    {
+      path: '/stock/drugprint',
+      component: () => import('@/xt_pages/stock/drugs/drugPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    },
+    {
+      path:"/stock/drugcancelprint",
+      component:()=>import('@/xt_pages/stock/drugs/drugCancelOurderPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    },
+    {
+      path:"/stock/drugoutorderprint",
+      component:()=>import('@/xt_pages/stock/drugs/drugOutOrderPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '出库打印',
+        noCache: true
+      }
+    },
+    {
+      path:"/stock/drugcanceldetaiprint",
+      component:()=>import('@/xt_pages/stock/drugs/drugCancelDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '出库打印',
+        noCache: true
+      }
+    },
+
+    {
+      path: '/stock/drugStockInOrderDetailPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugInOrderDetailPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/stock/drugStockOutOrderDetailPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugOutOrderDetailPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
+
+    {
+      path: '/stock/drugQueryPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugQueryPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugQueryPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
   ]
 }

src/store/getters.js

@@ -28,6 +28,8 @@ const getters = {
   patient_state_selected: state => state.xt_user.patient_state_selected,
   treat_state_selected: state => state.xt_user.treat_state_selected,
   selected_date: state => state.xt_user.selected_date,
+  search_mode: state => state.xt_user.search_mode,
+  search_value: state => state.xt_user.search_value,
 
   xt_role_temps: state => state.xt_role_temps,
 

src/store/modules/globalConfig.js

@@ -495,7 +495,7 @@ const global_config = {
       // 16: { id: 16, name: 'HD后置换', dialysis_duration: 1, replacement_way: 2, hemodialysis_machine: 1, blood_filter: 2, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 17: { id: 17, name: 'HDF前置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 18: { id: 18, name: 'HDF后置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 }
-      19: {
+      20: {
         id: 19,
         name: 'UF',
         dialysis_duration: 1,
@@ -1796,7 +1796,32 @@ const global_config = {
     {
       id: 21,
       name: '人份'
-    }
+    },
+    {
+      id: 22,
+      name: 'kg'
+    },
+    {
+      id: 23,
+      name: 'g'
+    },
+    {
+      id: 24,
+      name: 'mg'
+    },
+    {
+      id: 25,
+      name: 'u'
+    },
+    {
+      id: 26,
+      name: 'ml'
+    },
+    {
+      id: 27,
+      name: '万u'
+    },
+
     ],
     body_fluid: [{
       id: 1,

src/store/modules/xt_user.js

@@ -53,10 +53,21 @@ const xt_user = {
 
     // 示例: ['', '',]
     urlfors: [],
-    fileds: []
+    fileds: [],
+
+    //监测的搜索状态
+    search_mode: 1,
+    //监测的搜索值
+    search_value:''
   },
 
   mutations: {
+    SET_SEARCH_VALUE:(state, search_value) => {
+      state.search_value = search_value
+    },
+    SET_SEARCH_MODE:(state, search_mode) => {
+      state.search_mode = search_mode
+    },
     SET_SCHEDULE_TYPE_SELECTED: (state, schedule_type_selected) => {
       state.schedule_type_selected = schedule_type_selected
     },
@@ -180,6 +191,12 @@ const xt_user = {
   },
 
   actions: {
+    SetSearchValue({ commit }, search_value) {
+      commit('SET_SEARCH_VALUE', search_value)
+    },
+    SetSearchMode({ commit }, search_mode) {
+      commit('SET_SEARCH_MODE', search_mode)
+    },
     SetScheduleTypeSelected({ commit }, schedule_type_selected) {
       commit('SET_SCHEDULE_TYPE_SELECTED', schedule_type_selected)
     },

src/utils/tools.js

@@ -153,11 +153,7 @@ export function uParseTime(time, cFormat) {
 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
-  // console.log(type)
-  // console.log('首剂', shouji)
-  // console.log('总量', shichang)
-  // console.log('维持', weichi)
-
+ 
   var t = 0.5
   if (type == 1) {
     t = 0.5
@@ -172,11 +168,14 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   if (isNaN(shouji) || isNaN(shichang) || isNaN(weichi)) {
     return 0
   }
-  // console.log((shouji + (shichang - t) * weichi).toFixed(1))
+ console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }
 
 
+
+
+
 export function formatDate (date, format) {
   if (/(y+)/.test(format)) {
       format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));

src/views/layout/components/Navbar.vue

@@ -305,6 +305,12 @@ export default {
               this.showWsErr = true;
               this.wsErrMsg = "网络已断开，请检查网络后重新打开页面";
               console.log('navigator',navigator)
+              let http = 'wss://socket.sgjyun.com?token=' 
+              // let http = 'ws://socket.szjkhd.com?token=' //测试
+              let token = localStorage.getItem("token")
+              this.$store.state.user.websocket = new ReconnectingWebSocket(
+                http + token
+              );
             } else if (
               navigator.onLine == true &&
               this.websocket.readyState == 1
@@ -312,7 +318,7 @@ export default {
               this.showWsErr = false;
             }
             this.websocket.send("1");
-          }, 55000);
+          }, 30000);
         }
         
       }).catch(error => {

src/xt_pages/data/components/addDrugs.vue

@@ -146,14 +146,24 @@
               <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商 : " prop="manufacturer" >
-              <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
+              <!-- <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
                 <el-option
                   v-for="item,index in manufacturers"
                   :key="index"
                   :label="item.manufacturer_name"
                   :value="item.id">
                 </el-option>
-              </el-select>
+              </el-select> -->
+
+            <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
+                  <el-option
+                    v-for="item in manufacturerList"
+                    :key="item.id"
+                    :label="item.manufacturer_name"
+                    :value="item.id">
+                  </el-option>
+            </el-select>
+
             </el-form-item>
             <el-form-item label="药理分类 : " prop="pharmacology_category">
               <el-select v-model="form.pharmacology_category" style="width:160px;" placeholder="请选择">
@@ -333,6 +343,7 @@
   import {
     getAdviceConfig,
   } from '@/api/advice'
+ import { getManufacturerList } from "@/api/stock";
   export default {
     data() {
       return {
@@ -422,7 +433,10 @@
           drug_classify: [{ required: true, message: '请选择药物分类',trigger: 'change'  }],
           drug_dose: [{ required: true, message: '请填写剂量',trigger: 'blur'  }],
           manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }]
-        }
+        },
+        page:1,
+        limit:500,
+        manufacturerList:[]
       }
     },
     props: {
@@ -440,7 +454,7 @@
         type: Number,
         default: 1
       }
-
+      
     },
     methods: {
       cancle: function(formName) {
@@ -574,11 +588,26 @@
 
         return form
       },
+      getlist(){
+         var params = {
+             page:this.page,
+             limit:this.limit
+          }
+          console.log("params2222222",params)
+        getManufacturerList(params).then(response=>{
+           var manufacturerList =   response.data.data.manufacturer
+           console.log("列表2222222",manufacturerList)
+           this.manufacturerList = manufacturerList
+        })
+      }
     }, watch: {
       visible(val) {
         // this.form = this.formValue
 
       }
+    },
+    created(){
+      this.getlist()
     }
   }
 </script>

src/xt_pages/data/components/consumables.vue

@@ -500,6 +500,7 @@
           good_kind:this.good_kind,
           is_charge: this.is_charge,
         }
+        console.log("222222",params)
         getGoodInfoList(params).then(response => {
           if (response.data.state == 0) {
             this.goodInfo.loading = false
@@ -550,7 +551,8 @@
 
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              // this.$message.error(response.data.msg)
+              this.$message.error("同一耗材类型同一规格名称不能重复录入!")
               return false
             } else {
               this.$refs.addConsumable.hide()
@@ -581,8 +583,9 @@
           //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              // this.$message.error(response.data.msg)
+              // return false
+              this.$message.error("同一耗材类型同一规格名称不能重复录入!")
             } else {
               this.$refs.addConsumable.hide()
               this.getList()

src/xt_pages/data/components/drugs.vue

@@ -372,10 +372,9 @@
         // this.$refs.maintain.show();
       },
       openForm(id) {
-
+        this.current_id = id
         this.getAllManufacturer()
         if (id > 0) {
-          this.current_id = id
           let params = {
             id: this.current_id
           }
@@ -462,7 +461,7 @@
           }
           this.$refs.addDrugs.show(0, this.formValue)
         }
-      }, 
+      },
 
        deleteDurg(id,index){
          console.log("id",id)

src/xt_pages/data/components/project.vue

@@ -107,7 +107,7 @@ export default {
               {value:2,label:'否'}
             ],
             value: '',
-            limit:20,
+            limit:10,
             page:1,
             total:0,
             tableData: [],
@@ -177,6 +177,7 @@ export default {
                console.log('projectlist',projecList)
                this.tableData = projecList
                var total = response.data.data.total
+               console.log("total-----",total)
                this.total = total
              }
           })  

src/xt_pages/dialysis/PatientBox.vue

@@ -28,26 +28,37 @@
             <span class="num"
               >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
             >
+            <div style="margin-left:10px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
           </div>
           <div style="margin-top:5px;text-align:left;height:24px;">
-              <span class="tip1" v-if="schedule.prescription == null || schedule.prescription.creater == 0" @click.stop="open(schedule)">
-                开处方
-              </span>
-              <span class="tip2" v-if="schedule.treatment_summary == null || schedule.treatment_summary.dialysis_summary == ''" @click.stop="open1(schedule)">
-                开小结
-              </span>
-            </div>
+            <span class="tip1" v-if="schedule.prescription == null || schedule.prescription.creater == 0" @click.stop="open(schedule)">
+              开处方
+            </span>
+            <span class="tip2" v-if="schedule.treatment_summary == null || schedule.treatment_summary.dialysis_summary == ''" @click.stop="open1(schedule)">
+              开小结
+            </span>
+            <span class="online" v-show="computeState(schedule) != 4">
+              <span :class="stateColor(schedule)">{{ stateText(schedule) }}</span>
+            </span>
+          </div>
         </div>
         </div>
         <div>
-          <div style="height:24px;margin-right: 10px;">
+          <!-- <div style="height:24px;margin-right: 10px;">
             <div class="online" v-show="computeState(schedule) != 4">
               <p :class="stateColor(schedule)">{{ stateText(schedule) }}</p>
             </div>
-          </div>
-          <div style="margin-top:13px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
+          </div> -->
+          <!-- <div style="margin-top:13px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div> -->
         </div>
       </div>
+      <div class="dislysisInfo">
+        <p>体重(前/后kg):{{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</p>
+        <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
+       
+        </p>
+        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}</p>
+      </div>
       <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
         <ul>
           <li>
@@ -116,6 +127,7 @@
 </template>
 
 <script>
+
 import { parseTime } from "@/utils";
 import { jsGetAge } from "@/utils/tools";
 import dialysisPrescriptionDialog from "../dialysis/details/dialog/dialysisPrescriptionDialog";
@@ -675,12 +687,12 @@ export default {
     // @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    border-bottom: 1px #e5e5e5 solid;
+    // border-bottom: 1px #e5e5e5 solid;
     padding: 0 0 10px 20px;
     .tx {
       @include display-flex;
       // @include align-items-center;
-      width: 60%;
+      width: 90%;
       img {
         width: 45px;
         height: 45px;
@@ -749,7 +761,7 @@ export default {
       text-align: center;
       width: 30%;
       // border-left: 1px #e5e5e5 solid;
-      p {
+      span {
         background: #c6cdd2;
         color: #fff;
         width: 65px;
@@ -759,6 +771,7 @@ export default {
         margin: 0 auto;
         font-size: 12px;
         margin-top:4px;
+        display: inline-block;
       }
       .blue {
         background: $main-color;
@@ -781,6 +794,17 @@ export default {
       }
     }
   }
+  .dislysisInfo{
+    color: rgb(123, 138, 151);
+    border-bottom: 1px solid rgb(229, 229, 229);
+    padding-left: 80px;
+    >p{
+      margin-bottom: 5px;
+      overflow:hidden;
+      text-overflow:ellipsis;
+      white-space:nowrap;
+    }
+  }
 }
 .red {
   border: 1px #ff7979 solid;

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -249,6 +249,17 @@
                         <!--"-->
                         <!--&gt;</check-box>-->
                       </div>
+                      <div v-if="org_id == 9987" class="inline_block" style="width:200px;margin-left: 30px;">
+                          透前血压:
+                          <span class="under_line" style="width:50px;">
+                              &nbsp;{{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : ""}}
+                          </span>
+                          <span style='width:10px'>/</span>
+                          <span class="under_line" style="width:50px;">
+                              &nbsp;{{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : "" }}
+                          </span>
+                          <span style='width:30px'>mmHg</span>
+                        </div>
                     </div>
                     <div class="row" style="padding: 2px 0;">
                       <div class="inline_block">
@@ -1399,6 +1410,17 @@
                             )
                           "
                         ></check-box>
+                        <check-box
+                          v-if="org_id == 9987"
+                          text="低血糖"
+                          :checked="
+                            isValueIndexOfCheck(
+                              record.assessment_after_dislysis,
+                              'complication',
+                              '低血糖'
+                            )
+                          "
+                        ></check-box>
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;">
@@ -1960,6 +1982,7 @@ export default {
   },
   created() {
     var xtuser = this.$store.getters.xt_user;
+    this.org_id = xtuser.org.id
     this.orgname = xtuser.org.org_name;
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -1301,7 +1301,7 @@
 
             this.records = this.records.concat(resp.data.schedules)
 
-              console.log('记录', this.records)
+              // console.log('记录', this.records)
 
             for (const recordIndex in this.records) {
               var dlegh = 0

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -979,6 +979,8 @@
                           <td width="50">血流量<br />(ml/min)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
+                          <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
+                          <td width="60" v-if="org_id == 9836">体温(°C)</td>
                           <td width="60">透析液温度(°C)</td>
                           <td width="50">电导度<br />(ms/cm)</td>
                           <td width="50">超滤量<br />(ml)</td>
@@ -1049,13 +1051,20 @@
                                 : ""
                             }}
                           </td>
-                          <td>
+                          <td v-if="org_id != 9836">
                             {{
                               monitor_record.dialysate_temperature
                                 ? monitor_record.dialysate_temperature
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id == 9836">
+                            {{
+                              monitor_record.temperature
+                                ? monitor_record.temperature
+                                : ""
+                            }}
+                          </td>
                           <td>
                             {{
                               monitor_record.sodium_concentration
@@ -2023,7 +2032,8 @@ export default {
         "出血",
         "心衰",
         "腹痛"
-      ]
+      ],
+      org_id:''
     };
   },
   created() {
@@ -2037,6 +2047,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.org.id
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;
     //   this.replacementWays = this.$store.getters.replacement_ways;

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -16,69 +16,180 @@
           <div v-for="(record, index) in records" :key="record.id" class="print_page_main_content">
               <div id="dialysis-print-box-1">
                 <div id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content">
-                <div style="width:100%;text-align:center;">
+                <!-- <div style="width:100%;text-align:center;">
                     <div
                     class="order-yy-name"
                     style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;"
                     >
                     {{ orgname }}
                     </div>
-                </div>
+                </div> -->
                 <div style="display:inline-block;width:100%;text-align:center;">
                     <div
                     class="order-title"
                     style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;"
                     >
-                    血液净化治疗记录单
+                    {{ orgname }}  血液净化治疗记录单
                     </div>
                 </div>
                 <div class="row" style="display:flex;justify-content: space-between;">
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         日期 <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{y}") }}</div>年
                         <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{m}") }}</div>月
                         <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{d}") }}</div>日
                     </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        机器编号 
-                        <div class="inline_block under_line" style="width:80px;">
-                          {{ record.device_zone.name && record.device_number.number ? getNewNumber(record.device_zone.name,record.device_number.number) : '' }}
-                        <!-- {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }} -->
-                        </div>
-                    </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        病案号 <div class="inline_block under_line" style="width:80px">{{ record.patient.dialysis_no }}</div>
-                    </div>
-                </div>
-                <div style="border-bottom: 2px solid #000;width:100%;"></div>
-                <div class="row">
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         姓名 
                         <div class="inline_block under_line" style="width:100px;text-align: center;">
                             {{ record.patient.name ? record.patient.name : "" }}
                         </div>
                     </div>
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         性别&nbsp;&nbsp;&nbsp;&nbsp;
                         <label-box :isChecked="record.patient.gender == 1" showValue="男" ></label-box>&nbsp;
                         <label-box :isChecked="record.patient.gender == 2" showValue="女" ></label-box>
                     </div>
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         年龄：
                         <div class="under_line" style="width: 50px;text-align: center">
                             {{ getNewAge(record.patient.id_card_no) }}
                         </div>
                         岁
                     </div>
+                    <div class="inline_block" style="margin-right:5px;">
+                        机器编号 
+                        <div class="inline_block under_line" style="width:80px;">
+                          {{ record.device_zone.name && record.device_number.number ? getNewNumber(record.device_zone.name,record.device_number.number) : '' }}
+                        <!-- {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }} -->
+                        </div>
+                    </div>
+                    <div class="inline_block">
+                        病案号 <div class="inline_block under_line" style="width:80px">{{ record.patient.dialysis_no }}</div>
+                    </div>
                 </div>
+                <div style="border-bottom: 2px solid #000;width:100%;"></div>
                 <div class="row">
                     <div class="inline_block" style="margin-right:30px;">
                         血液净化方式 
-                        <div class="inline_block under_line" style="width:300px;text-align: center;">
-                            <label-box :isChecked="record.prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>&nbsp;&nbsp;&nbsp;&nbsp;
-                            <label-box :isChecked="record.prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;&nbsp;&nbsp;&nbsp;
-                            <!-- <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>
-                            <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box> -->
-                            <label-box :isChecked="record.prescription.mode_id == 3 ? true : false" showValue="HD+HP"></label-box>
+                        <div
+                          class="under_line"
+                          style="width: 100px;text-align: center;font-weight:600;"
+                          v-if="!record.prescription"
+                        ></div>
+                        <div
+                          v-if="record.prescription"
+                          style="display: inline-block;"
+                        >
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="!record.prescription.mode_id"
+                          ></div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 1"
+                          >
+                            HD
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 2"
+                          >
+                            HDF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 3"
+                          >
+                            HD+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 4"
+                          >
+                            HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 5"
+                          >
+                            HF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 6"
+                          >
+                            SCUF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 7"
+                          >
+                            IUF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 8"
+                          >
+                            HFHD
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 9"
+                          >
+                            HFHD+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 10"
+                          >
+                            PHF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 11"
+                          >
+                            HFR
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 12"
+                          >
+                            HDF+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 13"
+                          >
+                            CRRT
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 14"
+                          >
+                            腹水回输
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 19"
+                          >
+                            IUF+HD
+                          </div>
                         </div>
                     </div>
                     <div class="inline_block" style="margin-right:30px;">
@@ -87,6 +198,12 @@
                             {{ record.prescription.dialyzer_perfusion_apparatus ? record.prescription.dialyzer_perfusion_apparatus : ''}}
                         </div>
                     </div>
+                    <div class="inline_block" style="margin-right:30px;">
+                        透析液配方 
+                        <div class="inline_block under_line" style="width:150px;text-align: center;">
+                            {{ record.prescription.dialysate_formulation ? dialysateFormulationName(record.prescription.dialysate_formulation) : ''}}
+                        </div>
+                    </div>
                 </div>
                 <div class="row">
                     血管通路 
@@ -118,6 +235,20 @@
                     &nbsp;
                     </div>
                 </div>
+                <div class="row">
+                  <div class="inline_block" style="margin-right:30px;">
+                      导管 
+                      <div class="inline_block under_line" style="width:200px;text-align: left;">
+                          {{ record.assessment_before_dislysis.catheter ? record.assessment_before_dislysis.catheter : ''}}
+                      </div>
+                  </div>
+                  <div class="inline_block" style="margin-right:30px;">
+                      内瘘 
+                      <div class="inline_block under_line" style="width:200px;text-align: left;">
+                          {{ record.assessment_before_dislysis.internal_fistula ? record.assessment_before_dislysis.internal_fistula : ''}}
+                      </div>
+                  </div>
+                </div>
                 <div class="row">
                     抗凝药物 
                     <div class="inline_block under_line" style="width:92%;text-align: left;">
@@ -211,29 +342,88 @@
                 </div>
                 <div class="row">
                     透前评估 
-                    <div class="inline_block under_line" style="width:92%;text-align: left;">
-                    <div class="inline_block" style="margin-right:30px;">
-                        体温
-                        <div class="inline_block" style="width:50px;text-align:center">
-                        {{ record.assessment_before_dislysis.temperature ? record.assessment_before_dislysis.temperature : "" }}
-                        </div>℃
-                    </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        血压
-                        <div class="inline_block" style="width:100px;text-align:center">
-                        {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : "" }}/
-                        {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : "" }}
-                        </div>mmHg
-                    </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        脉搏
-                        <div class="inline_block" style="width:50px;text-align:center">
-                        {{ record.assessment_before_dislysis.pulse_frequency ? record.assessment_before_dislysis.pulse_frequency : "" }}
-                        </div>次/分
-                    </div>
+                    <div class="inline_block under_line" style="width:50%;text-align: left;">
+                      <div class="inline_block" style="margin-right:30px;">
+                          体温
+                          <div class="inline_block" style="width:50px;text-align:center">
+                          {{ record.assessment_before_dislysis.temperature ? record.assessment_before_dislysis.temperature : "" }}
+                          </div>℃
+                      </div>
+                      <div class="inline_block" style="margin-right:30px;">
+                          血压
+                          <div class="inline_block" style="width:100px;text-align:center">
+                          {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : "" }}/
+                          {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : "" }}
+                          </div>mmHg
+                      </div>
+                      <div class="inline_block" style="margin-right:30px;">
+                          脉搏
+                          <div class="inline_block" style="width:50px;text-align:center">
+                          {{ record.assessment_before_dislysis.pulse_frequency ? record.assessment_before_dislysis.pulse_frequency : "" }}
+                          </div>次/分
+                      </div>
+                      入室方式
+                      <div class="inline_block under_line" style="width:80px;text-align: center;margin-right:30px;">&nbsp;
+                        <span v-if='record.receive_assessment.way == 1'>步行</span>
+                        <span v-if='record.receive_assessment.way == 2'>扶行</span>
+                        <span v-if='record.receive_assessment.way == 3'>轮椅</span>
+                        <span v-if='record.receive_assessment.way == 4'>平车</span>
+                      </div>
+                      透析频次(次/周)
+                      <div class="inline_block under_line" style="width:80px;text-align: center;">
+                        {{ record.assessment_before_dislysis.dialysis_count ? record.assessment_before_dislysis.dialysis_count : "" }}
+                      </div>
             
                     </div>
                 </div>
+                <div class="row">
+                  透析前症状
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    {{ record.assessment_before_dislysis.symptom_before_dialysis ? record.assessment_before_dislysis.symptom_before_dialysis : "" }}
+                  </div>
+                  水肿
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    {{ record.assessment_before_dislysis.edema ? record.assessment_before_dislysis.edema : "" }}
+                  </div>
+                  出血
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    {{ record.assessment_before_dislysis.is_hemorrhage == 1 && record.assessment_before_dislysis.hemorrhage ? record.assessment_before_dislysis.hemorrhage : "" }}
+                  </div>
+                  跌倒风险预防措施
+                  <div class="inline_block under_line" style="width:100px;text-align: center;">
+                    {{ record.receive_assessment.precaution ? record.receive_assessment.precaution : '' }}
+                  </div>
+                </div>
+                <div class="row">
+                  上机医生
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">{{getAdminUser(record.prescription, 'prescription_doctor')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'prescription_doctor')" />
+                    </span>
+                  </div>
+                  冲管护士
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    <span v-if="setAdminUserES(record.dialysis_order, 'washpipe_nurse') == ''">{{getAdminUser(record.dialysis_order, 'washpipe_nurse')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'washpipe_nurse')" />
+                    </span>
+                  </div>
+                  穿刺者
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    <span v-if="setAdminUserES(record.dialysis_order, 'puncture_nurse') == ''">{{getAdminUser(record.dialysis_order, 'puncture_nurse')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'puncture_nurse')" />
+                    </span>
+                  </div>
+                  上机护士
+                  <div class="inline_block under_line" style="width:100px;text-align: center;">
+                    <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" />
+                    </span>
+                  </div>
+                </div>
 
                 <table class="print-table" border="1">
                     <tr>
@@ -325,9 +515,9 @@
                         <td width="60">TMP</td>
                         <td width="60">电导率</td>
                         <td width="40">温度</td>
-                        <td width="60">透析液流量</td>
+                        <td width="40">透析液流量</td>
                         <td width="60">UF/hr</td>
-                        <td width="100">症状处理</td>
+                        <td width="200">病情变化处理方式及结果</td>
                         </tr>
 
 
@@ -349,7 +539,7 @@
                                 {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }}
                             </span>
                         </td>
-                        <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+                        <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
                         <td>
                             <span v-if="monitor.symptom || monitor.dispose || monitor.result">
                                 {{ monitor.symptom + "，" + monitor.dispose + "，" + monitor.result }}
@@ -362,14 +552,14 @@
                 <table class="print-table" border="1">
                     <tbody>
                     <tr>
-                        <td width="40" rowspan="2" style="padding-left:5px;border:none;border-right:1px solid #000;">
+                        <td width="70" rowspan="3" style="padding-left:5px;border:none;border-right:1px solid #000;">
                         透后评估
                         </td>
 
                         <td width="25" style="border:none;padding-left:5px;">
                         体温:
                         </td>
-                        <td width="30" style="text-align:left;border:none;">
+                        <td width="70" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block;">
                             {{ record.assessment_after_dislysis.temperature ? record.assessment_after_dislysis.temperature : "" }}
@@ -378,8 +568,8 @@
                         </td>
                         <!-- <td width="10" style="border:none;"></td> -->
 
-                        <td width="25" style="border:none;padding-left:5px;">血压:</td>
-                        <td width="70" style="text-align:left;border:none;line-height: 30px;">
+                        <td width="20" style="border:none;padding-left:5px;">血压:</td>
+                        <td width="60" style="text-align:left;border:none;line-height: 30px;">
                         <div>
                             <span class="under_line" style="width:100px;display:inline-block">
                             {{ record.assessment_after_dislysis.systolic_blood_pressure ? record.assessment_after_dislysis.systolic_blood_pressure : "" }}/
@@ -387,34 +577,85 @@
                             </span>mmHg
                         </div>
                         </td>
-                        <td width="25" style="border:none;padding-left:5px">脉搏:</td>
-                        <td width="55" style="text-align:left;border:none;">
+                        <td width="10" style="border:none;padding-left:5px">脉搏:</td>
+                        <td width="80" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block">
                             {{ record.assessment_after_dislysis.pulse_frequency ? record.assessment_after_dislysis.pulse_frequency : "" }}
                             </span>次/分
                         </div>
                         </td>
+                        <td width="50" style="border:none;padding-left:5px">透后症状:</td>
+                        <td width="100" style="text-align:left;border:none;">
+                          <div>
+                            <span class="under_line" style="width:100px;display:inline-block">
+                              {{ record.assessment_after_dislysis.symptom_after_dialysis ? record.assessment_after_dislysis.symptom_after_dialysis : "" }}
+                            </span>
+                          </div>
+                        </td>
                         
                     </tr>
                     <tr>
-                      <td width="50" style="border:none;padding-left:5px">实际置换量:</td>
+                      <td width="90" style="border:none;padding-left:5px">实际置换量:</td>
                         <td width="30" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block">
                             {{ record.assessment_after_dislysis.actual_displacement ? record.assessment_after_dislysis.actual_displacement : "" }}
-                            </span>次/分
+                            </span>L
                         </div>
                         </td>
-                        <td width="50" style="border:none;padding-left:5px">透析器凝血:</td>
-                        <td width="110" style="text-align:left;border:none;">
+                        <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
+                        <td width="200" style="text-align:left;border:none;">
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-0度') > -1 ? true : false) : false" showValue="0"></label-box>
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false) : false" showValue="+"></label-box>
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) : false" showValue="+ +"></label-box>
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false) : false" showValue="+ + +"></label-box>
                         </td>
-                        <td width="50" style="text-align:left;border:none;"></td>
-                        <td width="110" style="text-align:left;border:none;"></td>
+                        <!-- <td width="50" style="text-align:left;border:none;"></td>
+                        <td width="110" style="text-align:left;border:none;"></td> -->
+
+                        <td width="100" style="border:none;padding-left:5px">透析期间进食:</td>
+                        <td width="50" style="text-align:left;border:none;">
+                          <div>
+                            <span class="under_line" style="width:50px;display:inline-block">
+                              <span v-if='record.assessment_after_dislysis.is_eat == 1'>是</span>
+                              <span v-if='record.assessment_after_dislysis.is_eat == 2'>否</span>
+                            </span>
+                          </div>
+                        </td>
+                        <td width="70" style="border:none;padding-left:5px">透析进食:</td>
+                        <td width="50" style="text-align:left;border:none;">
+                          <div>
+                            <span class="under_line" style="width:50px;display:inline-block">
+                              {{ record.assessment_after_dislysis.is_eat == 1 && record.assessment_after_dislysis.dialysis_during ? record.assessment_after_dislysis.dialysis_during : '' }}
+                            </span>ml
+                          </div>
+                        </td>
+                    </tr>
+                    <tr style="height:30px;line-height:30px;">
+                      <td width="20" style="border:none;padding-left:5px;">内瘘:</td>
+                      <td width="150" colspan="3" style="text-align:left;border:none;">
+                        <div>
+                          <span class="under_line" style="width:150px;display:inline-block;">
+                            {{ record.assessment_after_dislysis.internal_fistula ? record.assessment_after_dislysis.internal_fistula : "" }}
+                          </span>
+                        </div>
+                      </td>
+                      <td width="50" style="border:none;padding-left:5px">下机护士:</td>
+                      <td width="100" style="text-align:left;border:none;">
+                        <div>
+                          <span class="under_line" style="width:100px;display:inline-block">
+                            <span v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
+                            <span v-else>
+                              <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'finish_nurse')" />
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                      <td width="10" style="text-align:left;border:none;"></td>
+                      <td width="110" style="text-align:left;border:none;"></td>
+                      <!-- <td width="110" style="text-align:left;border:none;"></td> -->
+                      <!-- <td width="110" style="text-align:left;border:none;"></td> -->
                     </tr>
                     </tbody>
                 </table>
@@ -422,7 +663,7 @@
                 <table class="print-table" border="1">
                     <tr style="height:36px;text-align:left;border:none;">
                     <td style="padding-left:5px;border:none">
-                        <p style="margin-bottom:160px">
+                        <p style="margin-bottom:30px">
                             透析小结：{{ record.summer&&record.summer.dialysis_summary.length>0 ? record.summer.dialysis_summary : "" }}
                         </p>
                     </td>
@@ -436,20 +677,28 @@
                                 <img :src="setAdminUserES(record.dialysis_order, 'start_nurse')" style="height:30px;" />
                             </span>
                         </span>
-                        校对护士
+                        二核护士
                         <span style="display: inline-block;width:100px;text-align: left;">
                         &nbsp;
-                        <span v-if="setAdminUserES(record.check, 'modifier') == ''">
-                            {{getAdminUser(record.check, 'modifier') ? getAdminUser(record.check, 'modifier') : ""}}
+                        <span v-if="record.check != null ? record.dialysis_order.start_nurse != record.check.modifier : false">
+                            <span v-if="setAdminUserES(record.check, record.check == null ? 0 : 'modifier') == ''">
+                            {{ getAdminUser(record.check, record.check == null ? 0 : 'modifier') }}
+                            </span>
+                            <img style="height:30px;" :src="setAdminUserES(record.check, record.check == null ? 0 : 'modifier')" alt srcset v-else />
+                        </span>
+                        <span v-else>
+                            <span v-if="setAdminUserES(record.check, record.check == null ? 0 : 'creater') == ''">
+                            {{ getAdminUser(record.check, "creater") }}
+                            </span>
+                            <img style="height:30px;" :src="setAdminUserES(record.check, record.check == null ? 0 : 'creater')" alt srcset v-else />
                         </span>
-                        <img style="height:30px;" :src="setAdminUserES(record.check, 'modifier')" alt srcset v-else />
                         </span>
                         医生签名
                         <span style="display: inline-block;width:100px;text-align: left;">
                         &nbsp;
-                        <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
+                        <span v-if="setAdminUserES(record.summer, record.summer ? (record.summer.modifier ? 'modifier' : 'creater') : false) == ''">{{getAdminUser(record.summer, record.summer ? (record.summer.modifier ? 'modifier' : 'creater') : false)}}</span>
                         <span v-else>
-                            <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'creater')" />
+                            <img class="es-img" style="height:30px;" :src="setAdminUserES(record.summer, record.summer ? (record.summer.modifier ? 'modifier' : 'creater') : false)" />
                         </span>
                         </span>
                         
@@ -630,9 +879,9 @@ export default {
             var delghTwo = 0
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 14
+              this.records[recordIndex].advices.length < 16
             ) {
-              delghTwo = 14 - this.records[recordIndex].advices.length
+              delghTwo = 16 - this.records[recordIndex].advices.length
             } else {
               delghTwo = 0
             }
@@ -743,6 +992,12 @@ export default {
       })
   },
   methods: {
+    dialysateFormulationName(id) {
+      if (id in this.dialysateFormulationOptions) {
+        return this.dialysateFormulationOptions[id].name
+      }
+      return ''
+    },
     getNewNumber(name, number) {
       if (name.indexOf('区') > -1) {
         return (

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -12,7 +12,7 @@
           >打印</el-button
         >
       </template>
-      <template v-if="this.template_id == 2 || this.template_id == 0">
+      <template v-if="this.template_id == 2 || this.template_id == 0 || this.template_id == 33">
         <div>
           <el-button
             :loading="loading"
@@ -199,6 +199,46 @@
           >
         </div>
       </template>
+      <template v-if="this.template_id == 25">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
+      <template v-if="this.template_id == 28">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
+      <template v-if="this.template_id == 30">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
+      <template v-if="this.template_id == 32">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -490,23 +530,52 @@ export default {
     };
   },
   created() {
-    var date = new Date();
-    this.time = date;
-    var year = date.getFullYear();
-    var month = date.getMonth() + 1;
-    var day = date.getDate();
-    if (month < 10) {
-      month = "0" + month;
-    }
-    if (day < 10) {
-      day = "0" + day;
+    var search_mode = this.$store.getters.search_mode
+    var search_value = this.$store.getters.search_value
+    console.log('search_mode',search_mode)
+    if(search_mode == 2){
+      this.search_mode = search_mode
+      if(search_value != ''){
+        this.patient_search_keyword = search_value
+        this.listQuery.keywords = search_value
+        this.getSchedualPatientList();
+        var date = new Date();
+        this.time = date;
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var day = date.getDate();
+        if (month < 10) {
+          month = "0" + month;
+        }
+        if (day < 10) {
+          day = "0" + day;
+        }
+        var nowDate = year + "-" + month + "-" + day;
+        var date = new Date(nowDate + " 00:00:00");
+        this.listQuery.schedul_time = date.getTime();
+        this.getAllZone();
+        this.getTemplateInfo();
+      }
+    }else {
+      var date = new Date();
+      this.time = date;
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var day = date.getDate();
+      if (month < 10) {
+        month = "0" + month;
+      }
+      if (day < 10) {
+        day = "0" + day;
+      }
+      var nowDate = year + "-" + month + "-" + day;
+      var date = new Date(nowDate + " 00:00:00");
+      this.listQuery.schedul_time = date.getTime();
+      this.getAllZone();
+      this.getSchedualPatientList();
+      this.getTemplateInfo();
     }
-    var nowDate = year + "-" + month + "-" + day;
-    var date = new Date(nowDate + " 00:00:00");
-    this.listQuery.schedul_time = date.getTime();
-    this.getAllZone();
-    this.getSchedualPatientList();
-    this.getTemplateInfo();
+    
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
@@ -662,10 +731,29 @@ export default {
         this.search_mode = 2;
       } else {
         this.search_mode = 1;
+        var date = new Date();
+        this.time = date;
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var day = date.getDate();
+        if (month < 10) {
+          month = "0" + month;
+        }
+        if (day < 10) {
+          day = "0" + day;
+        }
+        var nowDate = year + "-" + month + "-" + day;
+        var date = new Date(nowDate + " 00:00:00");
+        this.listQuery.schedul_time = date.getTime();
+        this.getAllZone();
+        this.getSchedualPatientList();
+        this.getTemplateInfo();
       }
+      this.$store.dispatch('SetSearchMode', this.search_mode)
     },
     searchPatientAction: function() {
       this.listQuery.keywords = this.patient_search_keyword;
+      this.$store.dispatch('SetSearchValue', this.patient_search_keyword)
       console.log(this.patient_search_keyword);
       if (this.patient_search_keyword.length == 0) {
         return;
@@ -717,6 +805,16 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
       } else if (this.template_id == 22) {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
+      } else if (this.template_id == 25) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyFive" });
+      }else if(this.template_id == 28){
+         this.$router.push({path:"/dialysis/print/batch/twentyEight"})
+      } else if (this.template_id == 30) {
+        this.$router.push({ path: "/dialysis/print/batch/thirty" });
+      } else if (this.template_id == 32) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtyTwo" });
+      } else if (this.template_id == 33) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtyThree" });
       }
     },
     batchPrintActionOne: function() {
@@ -737,6 +835,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fiveone" });
       } else if (this.template_id == 22) {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo_one" });
+      } else if(this.template_id == 33){
+        this.$router.push({ path: "/dialysis/print/batch/thirtyThree_one" });
       }
     },
     batchPrintActionTwo: function() {
@@ -757,6 +857,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fivetwo" });
       } else if (this.template_id == 22) {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo_two" });
+      } else if (this.template_id == 33) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtyThree_two" });
       }
     }
   },

src/xt_pages/dialysis/components/allSummary.vue

@@ -239,7 +239,7 @@ export default {
           this.getlist()
           this.getAllMaterial()
         },
-           search(){
+          search(){
           //  if(this.selected_date==""){
           //     this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
           //   }
@@ -438,7 +438,7 @@ export default {
 
               }
               }
-              console.log("list22222",this.list)
+              // console.log("list22222",this.list)
              }
           })
         },

src/xt_pages/dialysis/components/allSummaryDialog.vue

@@ -66,6 +66,7 @@
 const moment = require('moment')
 import { parseTime } from "@/utils";
 import {getGatherList} from "@/api/consumable"
+
 export default {
     data(){
         return{
@@ -83,7 +84,8 @@ export default {
             partitionType: 0,
             tableData: [],
             start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD")
+            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            stockTotal:[]
         }
     },
     created(){
@@ -141,6 +143,8 @@ export default {
             }
           })
         }
+
+      
     }
 }
 </script>

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -20,24 +20,24 @@
         placeholder="选择日期"
         @change="selectEndtime">
       </el-date-picker>
-      <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
+      <!-- <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button> -->
 
     </div>
     <div style="margin-top:10px;">
       <el-table :data="tableData" border style="width: 100%" height="300px">
-        <el-table-column align="center" prop="date" label="商品类型" width="180">
+        <el-table-column align="center" prop="date" label="耗材类型" width="180">
           <template slot-scope="scope">
-            {{scope.row.good_type_name}}
+            {{scope.row.good_name}}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="规格名称" width="180">
           <template slot-scope="scope">
-            {{scope.row.good_name}}
+            {{scope.row.specification_name}}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="address" label="数量">
           <template slot-scope="scope">
-            {{scope.row.count}}
+            {{getStockCount(scope.row.id)}}
           </template>
         </el-table-column>
       </el-table>
@@ -50,7 +50,7 @@
   const moment = require('moment')
   import { GetDialysisGoodStatistics } from '@/api/dialysis'
   import { parseTime } from '@/utils'
-
+  import { getPrintStockGood } from '@/api/stock'
   export default {
     props: {
       list: Array
@@ -62,7 +62,8 @@
           end_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD')
         },
         visible: false,
-        startTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        // startTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        startTime:moment().startOf('month').format("YYYY-MM-DD"),
         endTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         schedulArr: [
           { value: 0, label: '全部班' },
@@ -76,7 +77,8 @@
         partitionType: 0,
         tableData: [],
         start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
-        end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD')
+        end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        stockTotal:[]
       }
     },
     created() {
@@ -119,8 +121,8 @@
         done()
       },
       show() {
-        this.GetDialysisGoodStatistics()
-
+        // this.GetDialysisGoodStatistics()
+        this.getlist()
         this.visible = true
       },
 
@@ -136,9 +138,40 @@
         this.GetDialysisGoodStatistics()
 
       },
+       getlist(){
+          var params = {
+            start_time:this.startTime,
+            end_time:this.endTime,
+            type:3
+          }
+          console.log("param2222222",params)
+          getPrintStockGood(params).then(response=>{
+            var stockTotal = response.data.data.stockTotal
+            console.log("stocktOTl",stockTotal)
+            this.stockTotal = stockTotal
+            for (let i = 0; i < response.data.data.list.length; i++) {
+               if (response.data.data.list[i].query_warehouseout_info.length > 0) {
+                  this.tableData.push(response.data.data.list[i])
+               }
+             }
+             console.log("表哥22222222222",this.tableData) 
+          })
+       },
+
       toPrint() {
         this.$router.push('/dialysis/consumables_print?startime=' + this.start_time + '&endtime=' + this.end_time)
-      }
+      },
+      getStockCount(id){
+       
+       var count = ""
+       for(let i=0;i<this.stockTotal.length;i++){
+          if(id == this.stockTotal[i].good_id){
+             count = this.stockTotal[i].count
+          }
+       }
+       return count
+     }
+    
 
     }
   }

src/xt_pages/dialysis/components/dialysisDrugs.vue

@@ -36,34 +36,273 @@
           </ul>
           </div>
         </div>
+
+        
         <div>
             <!-- <el-button size="small" icon="el-icon-printer" type="primary">打印</el-button> -->
             <el-button size="small" type="primary" @click="statistics">统计表</el-button>
         </div>
+      </div>
+        <div class="cell clearfix" style="justify-content: space-between;">
+        <div class="cell clearfix">
+          <label class="title"> <span class="name">给药途径</span> : </label>
+          <div class="time">
+            <ul class>
+              <li
+                :class="item.id == delivery_way ? 'active' : ''"
+                @click="selectDeliveryWay(item.id)"
+                v-for="item in deliveryWay"
+                :key="item.id"
+              >
+                {{ item.name }}
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
       <div>
-          <el-table
-            :data="tableData"
-            height="350"
-            border
-            style="width: 100%">
-            <el-table-column
-            align="center"
-            type="selection"
-            width="55">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="name"
-            label="姓名"
-            width="180">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="address"
-            label="地址">
-            </el-table-column>
-        </el-table>
+        <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="show">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+      </el-table>
+         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="showOne">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+      </el-table>
       </div>
 
       <dialysis-drugs-dialog ref="dialysisDrugs"></dialysis-drugs-dialog>
@@ -72,7 +311,9 @@
 
 
 <script>
+const moment = require('moment')
 import { GetAllZone } from "@/api/dialysis";
+import { getSchedualDoctors } from '@/api/advice'
 import dialysisDrugsDialog from './dialysisDrugsDialog'
 export default {
     components:{
@@ -90,19 +331,34 @@ export default {
             selected_date:new Date(),
             partitionArr:[],
             partitionType: 0,
-            tableData: []
+            tableData: [],
+            deliveryWay:[],
+            deliver_way:0,
+            search_input:"",
+            show:true,
+            showOne:false,
+            deliveryWay:[],
+            delivery_way:0,
+            scheduleMap:[],
+            selecting_schs: [],
         }
     },
     created(){
         this.getAllZone()
-        
+        this.getlist()
     },
     methods:{
         selectSchedulType(scheduleType) {
-            this.schedulType = scheduleType;
+           this.schedulType = scheduleType;
+           this.getlist()
         },
         selectPartitionType(partitionType) {
-            this.partitionType = partitionType;
+          this.partitionType = partitionType;
+          this.getlist()
+        },
+        selectDeliveryWay(val){
+         this.delivery_way = val
+         this.getlist()
         },
         getAllZone: function() {
             GetAllZone().then(response => {
@@ -112,13 +368,298 @@ export default {
                 } else {
                 this.partitionArr = response.data.data.zone;
                 this.partitionArr.unshift({ id: 0, name: "全部" });
+                var dics  =  response.data.data.dics
+                var obj = {id:0,name:"全部"}
+                this.deliveryWay.push(obj)
+                this.deliveryWay.push(...dics)
                 }
             });
         },
         statistics(){
             this.$refs.dialysisDrugs.show();
+        },
+        getlist(){
+          var name = ""
+         for(let i=0;i<this.deliveryWay.length;i++){
+              if(this.delivery_way == this.deliveryWay[i].id){
+                name = this.deliveryWay[i].name
+              }
         }
-    }
+        if(name == '全部'){
+          name = ""
+        }
+
+        let newTime =  moment(this.selected_date).format('YYYY-MM-DD')
+        getSchedualDoctors({ date: newTime,patient_type: 0,advice_type: 2,delivery_way:name}).then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+            this.admin_users = resp.data.adminUser
+            var schedules = resp.data.scheduals
+            console.log("数据多少2223333333",schedules)
+            var config = resp.data.config
+           if(config.is_open == 0){
+            this.show = true
+            this.showOne = false
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+           }
+           if(config.is_open == 1 || config.is_open == 2){
+             this.show = false
+             this.showOne  = true
+            var schedules =  resp.data.hisAdvices
+          
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+            console.log("过年9999999999",this.scheduleMap)
+           }
+         
+  
+         }
+         })
+      },
+      searchAction(){
+
+      },
+      handleScheduleDateChange(){
+        
+      },
+     handleSelectionChange(val) {
+      this.selecting_schs = val;
+     },
+      adviceNameShow({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 2) {
+            return 'dialysisadvicenamedisplay'
+          } else {
+            return ''
+          }
+      },
+      tableRowClassName({ row, rowIndex }) {
+     
+     },
+     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        
+        if (columnIndex === 1) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        if (columnIndex === 2) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+     },
+     getAdviceContent(row, isChild) {
+        let tempSingleDoseDesc = ''
+        let tempDrugSpecDesc = ''
+        let tempPrescribingNumberDesc = ''
+
+        if (row.prescribing_number) {
+          tempPrescribingNumberDesc =
+            row.prescribing_number + '' + row.prescribing_number_unit
+        }
+
+        if (row.single_dose) {
+          if (this.template_id != 6) {
+            tempSingleDoseDesc =
+              ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+          } else {
+            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
+          }
+        }
+
+        if (row.advice_desc) {
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+        }
+
+        if (isChild == 1) {
+          // 不是子药
+
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc +
+            ' ' +
+            row.delivery_way +
+            ' ' +
+            row.execution_frequency
+          )
+        } else {
+          // 是子药
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc
+          )
+        }
+      },
+      getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (
+          this.admin_users == null ||
+          typeof this.admin_users.length === 'undefined'
+        ) {
+          return name
+        }
+        var leng = this.admin_users.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.admin_users[index].id == id) {
+            name = this.admin_users[index].name
+            break
+          }
+        }
+        return name
+      },
+    },
+   
 }
 </script>
 

src/xt_pages/dialysis/components/dialysisDrugsDialog.vue

@@ -10,65 +10,61 @@
         style="width:140px;margin-right:10px"
         v-model="startTime"
         type="date"
-        placeholder="选择日期">
+        placeholder="选择日期"
+        @change="changeStartTime">
         </el-date-picker>
         <el-date-picker
         style="width:140px;margin-right:10px"
         v-model="endTime"
         type="date"
-        placeholder="选择日期">
+        placeholder="选择日期"
+        @change="changeEndTime">
         </el-date-picker>
-        <el-select style="width:140px;margin-right:10px" v-model="schedulType" placeholder="请选择">
+        <el-select style="width:140px;margin-right:10px" v-model="delive_way" placeholder="请选择">
             <el-option
-            v-for="item in schedulArr"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-            </el-option>
-        </el-select>
-        <el-select style="width:140px;margin-right:10px" v-model="partitionType" placeholder="请选择">
-            <el-option
-            v-for="item in partitionArr"
+            v-for="item in deliveryWay"
             :key="item.id"
             :label="item.name"
             :value="item.id">
             </el-option>
         </el-select>
-        <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
+        <!-- <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button> -->
         
     </div>
     <div style="margin-top:10px;">
         <el-table :data="tableData" border style="width: 100%" height="300">
-            <el-table-column
-            align="center"
-            prop="address"
-            label="地址">
+            <el-table-column align="center" prop="address" label="药品名称">
+              <template slot-scope="scope">
+                 {{scope.row.advice_name}}
+              </template>
+            </el-table-column>
+             <el-table-column align="center" prop="address" label="药品规格">
+               <template slot-scope="scope">
+                  {{scope.row.advice_desc}}
+               </template>
             </el-table-column>
-            <el-table-column
-            align="center"
-            prop="name"
-            label="姓名"
-            width="100">
+            <el-table-column align="center" prop="name" label="数量" width="100">
+                <template slot-scope="scope">
+                   {{scope.row.Total}}
+                </template>
             </el-table-column>
         </el-table>
     </div>
-    <!-- <div slot="footer" class="dialog-footer">
-      <el-button @click="hide">取 消</el-button>
-      <el-button type="primary" @click="submitAction()">保 存</el-button>
-    </div> -->
   </el-dialog>
 </template>
 
 
 
 <script>
+const moment = require('moment')
 import { GetAllZone } from "@/api/dialysis";
+import { getDoctorAdviceCount } from "@/api/advice"
 export default {
     data(){
         return{
             visible: false,
-            startTime:'',
-            endTime:'',
+            startTime:new Date(),
+            endTime:new Date(),
             schedulArr: [
                 {value: 0, label: '全部班'},
                 {value: 1, label: '上午'},
@@ -78,27 +74,14 @@ export default {
             schedulType: 0,
             partitionArr:[],
             partitionType: 0,
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            deliveryWay:[],
+            tableData: [],
+            delive_way:""
         }
     },
     created(){
         this.getAllZone()
+        this.getlist()
     },
     methods:{
         _close: function(done) {
@@ -115,6 +98,10 @@ export default {
                 } else {
                 this.partitionArr = response.data.data.zone;
                 this.partitionArr.unshift({ id: 0, name: "全部分区" });
+                var dics  =  response.data.data.dics
+                var obj = {id:0,name:"全部"}
+                this.deliveryWay.push(obj)
+                this.deliveryWay.push(...dics)
                 }
             });
         },
@@ -123,7 +110,35 @@ export default {
                 path: '/dialysis/dialysisDrugs_print',
                 // query: { date: date }
             })
-        }
+        },
+       getlist(){
+
+           let newTimeStart =  moment(this.startTime).format('YYYY-MM-DD')
+           let newTimeEnd = moment(this.endTime).format('YYYY-MM-DD')
+           var params = {
+              start_time:newTimeStart,
+              end_time:newTimeEnd,
+              delive_way:this.delive_way,
+           }
+         
+         getDoctorAdviceCount(params).then(response=>{
+            if(response.data.state == 1){
+              var list =  response.data.data.list
+              console.log("list",list)
+              this.tableData = list
+            }
+         })  
+       },
+      changeStartTime(val){
+       var start =  moment(val).format('YYYY-MM-DD')
+       this.startTime = start
+       this.getlist()
+      },
+      changeEndTime(val){
+       var end = moment(val).format('YYYY-MM-DD')
+       this.endTime = end
+       this.getlist()
+      }
     }
 }
 </script>

src/xt_pages/dialysis/consumableDrugs_print.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="first">
                     <consumables></consumables>
                 </el-tab-pane>
-                <el-tab-pane label="透析药品" name="second">
+                <!-- <el-tab-pane label="透析药品" name="second">
                     <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane>
+                </el-tab-pane> -->
                 <el-tab-pane label="透析参数" name="third">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -20,6 +20,13 @@
 
         </li>
 
+         <li v-if="isShow('置换速度')">
+          <label>置换速度 : </label>
+          <span class="content">{{displace_speed }}</span>
+            <span class="unit">ml/min</span>
+        </li>
+
+
         <li v-if="isShow('透析液配方')">
           <label>透析液配方 : </label>
           <span class="content">{{ dialysate_formulation }}</span>
@@ -40,6 +47,12 @@
           <span class="content">{{ anticoagulant }}</span>
         </li>
 
+        <li v-if="isShow('抗凝剂商品名称')">
+          <label>抗凝剂商品名称 : </label>
+          <span class="content">{{ antioxidant_commodity_name }}</span>
+        </li>
+
+
         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
@@ -93,8 +106,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
@@ -167,15 +180,15 @@
           }}</span>
         </li>
 
-        <li v-if="isShow('血流量')">
-          <label>血流量 : </label>
-          <span class="content">{{
-            blood_flow_volume != "0" ? blood_flow_volume : ""
-          }}</span>
-          <span class="unit">{{
-            blood_flow_volume != "0" ? "ml/min" : ""
-          }}</span>
-        </li>
+<!--        <li v-if="isShow('血流量')">-->
+<!--          <label>血流量 : </label>-->
+<!--          <span class="content">{{-->
+<!--            blood_flow_volume != "0" ? blood_flow_volume : ""-->
+<!--          }}</span>-->
+<!--          <span class="unit">{{-->
+<!--            blood_flow_volume != "0" ? "ml/min" : ""-->
+<!--          }}</span>-->
+<!--        </li>-->
       </ul>
 
       <ul>
@@ -605,6 +618,12 @@ export default {
     target_ktv: function() {
       var v = this.getValueStr('target_ktv', 'target_ktv')
       return v.length == 0 ? '0' : v
+    },
+    antioxidant_commodity_name:function(){
+      return this.getValueStr('antioxidant_commodity_name','antioxidant_commodity_name')
+    },
+    displace_speed:function(){
+      return this.getValueStr('displace_speed','displace_speed')
     }
   },
   created() {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -89,14 +89,18 @@
       :dry_weight="last_dryWeight_dislysis"
       :schedual="temp_schedual"
       :stockType="stockType"
+      :lastAssessment="lastAssessment"
     ></dialysis-prescription-dialog>
 
     <double-check-dialog
       title="双人核对"
       ref="doubleCheck"
       :patient="patient"
+      :predialysis_evaluation="predialysis_evaluation"
+      :prescription="prescription"
       :double_check="double_check"
       :admin_users="admin_users"
+
     ></double-check-dialog>
 
     <accepts-treatment-dialog
@@ -114,6 +118,7 @@
       :predialysis_evaluation="predialysis_evaluation"
       :admin_users="admin_users"
       :dry_weight="last_dryWeight_dislysis"
+      :lastAssessment="lastAssessment"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog
@@ -513,6 +518,13 @@ export default {
       default:()=>{
         return [];
       }
+    },
+    lastAssessment:{
+     // 最后一条血管通路(处理今天录的)
+     type: Object,
+      default: () => {
+        return { id: 0 };
+      }
     }
   },
   methods: {
@@ -549,7 +561,7 @@ export default {
       lastDialysisPrescribe,
       lastDryWeightDislysis,
       schedual,
-      system_prescribe
+      system_prescribe,
     ) {
 
       this.$refs.assessmentBefore.setLastRecord(
@@ -605,7 +617,7 @@ export default {
     showAssessmentBefore: function() {
       console.log(this.last_predialysis_evaluation)
 
-      this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation);
+      this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
     },
     showDoubleCheck: function() {
       this.$refs.doubleCheck.show();

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30  &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -308,6 +308,31 @@
           <span class="content">{{ this.record.special_treatment}}</span>
           <span class="unit"></span>
         </li>
+        
+        <li v-if="isShow('血栓')">
+          <label>血栓: </label>
+          <span class="content" v-if="this.record.thromubus_type == 1">有</span>
+          <span class="content" v-if="this.record.thromubus_type == 2">无</span>
+          <span class="unit"></span>
+        </li>
+
+         <li v-if="isShow('血栓')">
+          <label>导管AV端约为(cm): </label>
+          <span class="content">{{this.record.thrombus_av}}</span>
+          <span class="unit"></span>
+        </li>
+       
+        <li v-if="isShow('血栓')">
+          <label>导管A端约(cm): </label>
+          <span class="content">{{this.record.thromubus_a}}</span>
+          <span class="unit"></span>
+        </li>
+
+         <li v-if="isShow('血栓')">
+          <label>导管V端约(cm): </label>
+          <span class="content">{{this.record.thromubus_v}}</span>
+          <span class="unit"></span>
+        </li>
       </ul>
     </div>
     <div class="note">
@@ -334,7 +359,11 @@ export default {
       type: Object
     }
   },
+  created(){
+    console.log("血栓22222",this.record)
+  },
   computed: {
+   
     weight_before: function() {
       if (this.record.id == 0) {
         return '-'
@@ -382,7 +411,6 @@ export default {
         return '-'
       }
       return this.record.catheter
-      console.log('导管', this.record.catheter)
     },
 
     temperature: function() {

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

@@ -289,15 +289,6 @@
                 <el-option label="是" value="1"></el-option>
                 <el-option label="否" value="2"></el-option>
               </el-select>
-
-             <!-- <el-select v-model="assessmentBeforeDislysis.is_hemorrhage" placeholder="请选择">
-                <el-option
-                  v-for="item in hemorrhages"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select> -->
             </el-form-item>
           </el-col>
 
@@ -310,6 +301,36 @@
             </el-form-item>
           </el-col>
 
+
+
+           <el-col :span="8">
+            <el-form-item label="血栓：" v-if="isShow('血栓')">
+              <el-select v-model="assessmentBeforeDislysis.thromubus_type" @change="changeThrombus">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option label="有" value="1"></el-option>
+                <el-option label="无" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="8">
+            <el-form-item label="导管AV端约为(cm):" v-show="thrombuShow" label-width="200px">
+              <el-input v-model="assessmentBeforeDislysis.thrombus_av" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="导管A端约(cm):" v-show="thrombuShow">
+              <el-input v-model="assessmentBeforeDislysis.thromubus_a" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="导管V端约(cm):" v-show="thrombuShow">
+              <el-input v-model="assessmentBeforeDislysis.thromubus_v" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('皮肤')">
             <el-form-item label="皮肤： ">
               <!-- <el-select v-model="assessmentBeforeDislysis.skin">
@@ -525,34 +546,10 @@
             </el-form-item>
           </el-col>
 
+         
 
-
-
-
-
-
-
-
-
-
-
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
-          <!--<el-col :span="8">-->
-          <!--<el-form-item label="穿刺方法： " v-if="isShow('穿刺方法')">-->
-
-          <!--<el-select v-model="assessmentBeforeDislysis.puncture_method">-->
-          <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--<el-option v-for="item in puncture_method" :label="item.name" :value="item.name"-->
-          <!--:key="item.id"></el-option>-->
-          <!--</el-select>-->
-
-          <!--</el-form-item>-->
-          <!--</el-col>-->
-
+         
+      
         </el-row>
 
 
@@ -704,6 +701,11 @@
           edema:'',
           special_treatment:'',
           catheter_maintenance:"",
+          thromubus_type:"",
+          thrombus_av:"",
+          thromubus_a:"",
+          thromubus_v:""
+
         },
 
         InnerDialogProps: {
@@ -718,7 +720,8 @@
         puncture_ways: '',
         skins:[],
         pinholings:[],
-        catheter_maintenancelist:[]
+        catheter_maintenancelist:[],
+        thrombuShow:false
       }
     },
     props: {
@@ -740,6 +743,12 @@
         default: () => {
           return []
         }
+      },
+      lastAssessment:{
+        type:Array,
+         default: () => {
+          return []
+        }
       }
 
     },
@@ -749,6 +758,7 @@
         this.lastDryWeightDislysis = lastDryWeightDislysis
       },
       isShow(name) {
+        
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
@@ -757,9 +767,18 @@
         }
         return false
       },
+
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
         this.lastPredialysisEvaluation = last_predialysis_evaluation
+       
+       
+        console.log("获取上次数据",this.lastPredialysisEvaluation)
         if(this.lastPredialysisEvaluation != null) {
+         if(this.lastPredialysisEvaluation.thromubus_type == 1){
+          this.assessmentBeforeDislysis.thromubus_type = this.lastPredialysisEvaluation.thromubus_type.toString()
+           this.thrombuShow = true
+        }
+
           if (this.lastPredialysisEvaluation.is_hemorrhage == 1) {
             this.lastPredialysisEvaluation.is_hemorrhage = "1"
           }
@@ -801,6 +820,7 @@
 
           if (lastDryWeightDislysis != null) {
             this.weight_adjust.weight = lastDryWeightDislysis.dry_weight
+           
             this.$set(
               this.assessmentBeforeDislysis,
               'dry_weight',
@@ -814,6 +834,9 @@
             }
           }
 
+
+
+
           if (this.lastPredialysisEvaluation != null) {
             for (var key in this.lastPredialysisEvaluation){
               if (key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' && key != 'dry_weight' && key != 'weight_before'){
@@ -826,8 +849,34 @@
               }
             }
           }
+          
+         //最后一次血管通路
+
+         if(this.lastAssessment!=null){
+           var blood_id = 0
+           for(let i= 0;i<this.blood_access_part_opera.length;i++){
+              if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_part_opera[i].name){
+                 blood_id = this.blood_access_part_opera[i].id
+              }
+           }
+            this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
+            this.assessmentBeforeDislysis.blood_access_part_id = this.lastAssessment.blood_access_part_id
+          } else {
+            if (this.lastPredialysisEvaluation != null) {
+               var blood_id = 0
+                for(let i= 0;i<this.blood_access_part_opera.length;i++){
+                    if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_part_opera[i].name){
+                      blood_id = this.blood_access_part_opera[i].id
+                    }
+                }
+              this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
+              this.assessmentBeforeDislysis.blood_access_part_id = this.lastPredialysisEvaluation.blood_access_part_id
+            }
+          }
 
         } else {
+         
+     
           this.assessmentBeforeDislysis.dry_weight = this.predialysis_evaluation['dry_weight']
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']
         }
@@ -1165,7 +1214,7 @@
         }).then(res => {
           // console.log(res)
           // console.log('透前', this.patient_prop)
-           console.log('透前', this.assessment)
+          
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {
@@ -1189,6 +1238,15 @@
             }
           }
         })
+      },
+
+      changeThrombus(val){
+        if(val == 1){
+          this.thrombuShow = true
+        }
+        if(val == 2){
+         this.thrombuShow = false
+        }
       }
     },
     created() {
@@ -1222,6 +1280,7 @@
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
       console.log("导管维护",this.catheter_maintenancelist)
+     
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){
@@ -1241,6 +1300,11 @@
 
       },
       'predialysis_evaluation.id': function() {
+         
+       if(this.predialysis_evaluation.thromubus_type == 1){
+             this.predialysis_evaluation.thromubus_type = this.predialysis_evaluation.thromubus_type.toString()
+             this.thrombuShow = true
+        }
 
         if (this.predialysis_evaluation.id > 0) {
           for (var index in this.assessmentBeforeDislysis) {

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

@@ -23,14 +23,36 @@
         </el-form-item>
         <el-form-item label="穿刺者"  v-if="isShowFiled('穿刺者')">
           <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士">
-            <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
+            <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
+          </el-select>
+        </el-form-item>
+        
+        <el-form-item label="换药护士"  v-if="isShowFiled('换药护士')">
+          <el-select v-model="form.change_nurse" placeholder="换药护士">
+            <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item label="冲管护士"  v-if="isShowFiled('冲管护士')">
           <el-select v-model="form.washpipe_nurse" placeholder="请选择冲管护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
+
+
+         <el-form-item label="疑难穿刺护士"  v-if="isShowFiled('疑难穿刺护士')">
+          <el-select v-model="form.difficult_puncture_nurse" placeholder="请选择疑难穿刺护士">
+            <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="新开瘘护士"  v-if="isShowFiled('新开瘘护士')">
+            <el-select v-model="form.new_fistula_nurse" placeholder="请选择新开瘘护士">
+              <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
+            </el-select>
+        </el-form-item>
+
+     
         <el-form-item label="引血(ml/min)" v-if="template_id == 6">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
@@ -88,7 +110,10 @@
           nurse_id: '',
           start_time: '',
           puncture_nurse_id: '',
-          blood_drawing: 100
+          blood_drawing: 100,
+          change_nurse:"",
+          difficult_puncture_nurse:"",
+          new_fistula_nurse:"",
         },
         schedual_type: 0,
         schedules_type: [
@@ -96,7 +121,8 @@
           { id: 2, name: '下午' },
           { id: 3, name: '晚上' }
         ], // 该排班的区里的床位
-        isPremission: false
+        isPremission: false,
+        adminRoles:[{id:0,name:"请选择"}]
       }
     },
     props: {
@@ -126,7 +152,8 @@
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
       this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
       this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
-
+      
+     
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
@@ -141,7 +168,9 @@
         this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
         this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
         this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
-
+        this.form.change_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.change_nurse
+        this.form.difficult_puncture_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id:this.dialysis_order.difficult_puncture_nurse
+        this.form.new_fistula_nurse = this.dialysis_order.id ==0?this.$store.getters.xt_user.user.id:this.dialysis_order.new_fistula_nurse
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -157,6 +186,15 @@
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
         this.form.start_time = this.dialysis_order.id == 0 ? time : this.getTime(this.dialysis_order.start_time, '{y}-{m}-{d} {h}:{i}')
 
+      },
+      admins:function(){
+        console.log("admins",this.admins)
+        if(this.admins.length > 0 ){
+          for(let i=0;i<this.admins.length;i++){
+            this.adminRoles.push(this.admins[i])
+          } 
+        }
+        console.log("人员",this.adminRoles)
       }
     },
     computed: {},
@@ -304,7 +342,7 @@
         this.loading = true
         let mode = '1'
 
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse).then(rs => {
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -314,10 +352,10 @@
               this.$set(this_order, key, resp_dialysis_order[key])
             }
             let orgId = parseInt(sessionStorage.getItem("org_id"));
-            axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
-              console.log('res',res.data)
+            // axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
+            //   console.log('res',res.data)
 
-            }) 
+            // }) 
             this.hide()
             this.$emit('monitor', resp.data.monitor)
             this.$message.success('上机成功')
@@ -334,8 +372,9 @@
         ParamsQuery['start_time'] = this.form.start_time
         ParamsQuery['puncture_nurse'] = this.form.puncture_nurse_id
         ParamsQuery['washpipe_nurse'] = this.form.washpipe_nurse
-
-
+        ParamsQuery['change_nurse'] = this.form.change_nurse
+        ParamsQuery['difficult_puncture_nurse'] = this.form.difficult_puncture_nurse
+        ParamsQuery['new_fistula_nurse'] = this.form.new_fistula_nurse
         ParamsQuery['mode'] = "2"
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
           ParamsQuery['mode'] = "3"

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

@@ -87,7 +87,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -97,7 +97,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
@@ -141,6 +141,15 @@
           </el-col>
 
 
+         <el-col :span="8" v-if="isShows('抗凝剂商品名称')">
+            <el-form-item label="抗凝剂商品名称：">
+               <el-input
+                v-model="dialysisPrescription.antioxidant_commodity_name"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+
           <el-col :span="8" v-if="isShows('肝素钠') && dialysisPrescription.anticoagulant ==10">
             <el-form-item label="肝素钠(mg/h)：">
               <el-input
@@ -175,14 +184,14 @@
 
           <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
             </el-form-item>
 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23' :label="'首剂(mg) : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'首剂(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -192,13 +201,13 @@
 
 
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23">
+            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
             </el-form-item>
-            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23">
+            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -207,13 +216,13 @@
           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
             </el-form-item>
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23' :label="'总量(mg) : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'总量(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -244,6 +253,16 @@
             </el-form-item>
           </el-col>
 
+
+           <el-col :span="8" v-if="isShows('置换速度')" v-show="totalShow">
+            <el-form-item label="置换速度(ml/min)">
+               <el-input
+                v-model="dialysisPrescription.displace_speed"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+
           <el-col
             :span="8"
             v-if="anticoagulant.gaimingcheng != -1 && isShows('钙名称')"
@@ -341,7 +360,7 @@
             </el-form-item>
           </el-col>
 
-      
+
 
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
             <el-form-item label="透析器/灌流器">
@@ -353,14 +372,14 @@
              <el-form-item label="透析器:">
                   <el-input v-model="dialysisPrescription.dialysis_dialyszers" @focus="showInnerDialog('7')"></el-input>
              </el-form-item>
-          </el-col> 
+          </el-col>
 
 
           <el-col :span="8" v-if="isShows('灌流器')">
              <el-form-item label="灌流器:">
                   <el-input v-model="dialysisPrescription.dialysis_irrigation" @focus="showInnerDialog('8')"></el-input>
              </el-form-item>
-          </el-col> 
+          </el-col>
 
           <el-col :span="8" v-if="isShows('体液过多症状')">
             <el-form-item label="体液过多症状：">
@@ -381,7 +400,7 @@
             </el-form-item>
           </el-col>
 
-        
+
 
           <el-col :span="8" v-if="isShows('体液过多其他症状')">
             <el-form-item label="体液过多其他症状">
@@ -418,7 +437,7 @@
             </el-form-item>
           </el-col>
 
-        
+
           <el-col :span="8">
             <el-form-item
               label="置换液："
@@ -440,14 +459,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29)" v-show="totalShow">
+          <el-col :span="8" v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24)" v-show="totalShow">
             <el-form-item label="置换液总量(ml)">
               <el-input
                 v-model="dialysisPrescription.displace_liqui_value"
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29" v-show="totalShow">
+          <el-col :span="8" v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24" v-show="totalShow">
             <el-form-item label="置换液总量(L)">
               <el-input
                 v-model="dialysisPrescription.displace_liqui_value"
@@ -869,6 +888,13 @@
           return [];
         }
       }
+      scheudle_mode:Number,
+      lastAssessment: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
     },
     computed: {
       dialysis_date: function() {
@@ -990,6 +1016,9 @@
           blood:"",
           dialysis_dialyszers:"",
           dialysis_irrigation:"",
+          irrigation:"",
+          antioxidant_commodity_name:"",
+          displace_speed:"",
         },
 
         anticoagulant: {
@@ -1024,27 +1053,47 @@
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
-             var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
-             var newArr =  arr.split(",")
-            console.log("透析器/灌流器",newArr)
-            var Arr = []
-            for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
-                 var newarr = newArr[i].toUpperCase()
-
-                 var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
-
-                 if(newarr == dialy){
-                    Arr.push(this.dialyzerPerfusionApparatus[j].name)
-                 }
-              }
-            }
-            var arrtwo = Arr.join(",")
-            console.log("Arr",arrtwo)
+            // var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            // console.log("arr333333",arr)
+            // var newArr =  arr.split(",")
+            // console.log("透析器/灌流器",newArr)
+            // var Arr = []
+            // for(let i=0;i<newArr.length;i++){
+            //   for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
+            //      var newarr = newArr[i].toUpperCase()
+
+            //      var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
+
+            //      if(newarr == dialy){
+            //         Arr.push(this.dialyzerPerfusionApparatus[j].name)
+            //      }
+            //   }
+            // }
+            // var arrtwo = Arr.join(",")
+            // console.log("Arr",arrtwo)
+            //  var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            //  var newArr =  arr.split(",")
+            // console.log("透析器/灌流器",newArr)
+            // var Arr = []
+            // for(let i=0;i<newArr.length;i++){
+            //   for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
+            //      var newarr = newArr[i].toUpperCase()
+            //
+            //      var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
+            //
+            //      if(newarr == dialy){
+            //         Arr.push(this.dialyzerPerfusionApparatus[j].name)
+            //      }
+            //   }
+            // }
+            // var arrtwo = Arr.join(",")
+            // console.log("Arr",arrtwo)
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
-            this.InnerDialogProps.selected = arrtwo
+
+
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.isShowTextArea = false
             break
 
@@ -1054,9 +1103,10 @@
             this.InnerDialogProps.titles = '抽血'
             this.InnerDialogProps.type = 'blood'
             this.InnerDialogProps.selected = this.dialysisPrescription.blood
-            this.InnerDialogProps.isShowTextArea = false    
-          
+            this.InnerDialogProps.isShowTextArea = false
+
            case '7': // 透析器
+
             for(let i=0;i<this.dialyzers.length;i++){
                this.dialyzers[i].name = this.dialyzers[i].specification_name
             }
@@ -1322,7 +1372,7 @@
                 ParamsQuery['mode'] = '3'
               }
             }
-            
+
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1543,6 +1593,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
+
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -1616,6 +1667,8 @@
           last_weight_after = this.last_record.weight_after
         }
 
+
+
         if (this.predialysis == null || this.predialysis.id == 0) {
           if(last != null) {
 
@@ -1633,7 +1686,10 @@
             this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
+
             weight_before = 0
+
+
           }
 
         } else {
@@ -1641,6 +1697,30 @@
         }
 
 
+          //获取最后一次血管通路
+        //  if(this.predialysis!=null){
+        //     if(this.lastAssessment!=null){
+        //       var blood_id = 0
+        //       for(let i= 0;i<this.blood_access_option.length;i++){
+        //           if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_option[i].name){
+        //             blood_id = this.blood_access_option[i].id
+        //           }
+        //       }
+        //        console.log("中国人名职员",this.lastAssessment)
+        //        this.dialysisPrescription.blood_access = blood_id
+        //     }else{
+        //       if(this.last_prescription!=null){
+        //           var blood_id = 0
+        //           for(let i= 0;i<this.blood_access_option.length;i++){
+        //               if(this.last_prescription.blood_access_part_opera_id == this.blood_access_option[i].name){
+        //                 blood_id = this.blood_access_option[i].id
+        //               }
+        //           }
+        //            this.dialysisPrescription.blood_access = blood_id
+        //       }
+        //     }
+
+        //  }
 
         if (weight_before > 0 && last_weight_after > 0) {
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
@@ -1661,7 +1741,7 @@
         this.isVisibility = false
       },
       changeThisAnticoagulant: function(val) {
-        
+
         var thismode = val
         if (isNaN(thismode) || thismode <= 0) {
           return false
@@ -2939,9 +3019,9 @@
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
       },
-     
+
     },
-  
+
     watch: {
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0
@@ -2989,25 +3069,14 @@
           parseFloat(dialysis_duration_hour) +
           parseFloat(dialysis_duration_minute) / 60
 
-        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-          1,
-          this.dialysisPrescription.anticoagulant_shouji,
-          duration,
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1,this.dialysisPrescription.anticoagulant_shouji,duration,
           this.dialysisPrescription.anticoagulant_weichi
         )
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-        // this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-        //  1,
-        //   this.dialysisPrescription.anticoagulant_shouji,
-        //  duration,
-        //  this.dialysisPrescription.anticoagulant_weichi
-        // );
-        //  if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
-        //    this.dialysisPrescription.anticoagulant_zongliang = "";
-        //  }
+
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0
@@ -3039,15 +3108,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-        //  this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-        //   1,
-        //    this.dialysisPrescription.anticoagulant_shouji,
-        //    duration,
-        //    this.dialysisPrescription.anticoagulant_weichi
-        //  );
-        // if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
-        //    this.dialysisPrescription.anticoagulant_zongliang = "";
-        // }
+
       },
       'dialysisPrescription.anticoagulant_weichi': function() {
         let dialysis_duration_minute = 0
@@ -3073,16 +3134,10 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
+        console.log("首季",this.dialysisPrescription.anticoagulant_zongliang)
+
+
 
-        // this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-        //   1,
-        //  this.dialysisPrescription.anticoagulant_shouji,
-        //   duration,
-        //   this.dialysisPrescription.anticoagulant_weichi
-        // );
-        // if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
-        //   this.dialysisPrescription.anticoagulant_zongliang = "";
-        // }
       },
       'prescription.id': {
         immediate: true,
@@ -3439,7 +3494,7 @@
         }
       },
       stockType:function(){
-        
+
         var arr = []
         var arrTwo = []
         for(let i=0;i<this.stockType.length;i++){
@@ -3465,7 +3520,7 @@
            }
         }
         this.irrigations = irrigation
-       
+
       }
     }
   }

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

@@ -4,45 +4,94 @@
              :modal-append-to-body="false"
              width="854px">
 
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
+      
       <el-form-item label="透析物品核查 : ">
-        <el-radio v-model="doubleReview.dialysis_item_check" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.dialysis_item_check" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.dialysis_item_check" label="1" @change="changeRadio">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.dialysis_item_check" label="2">错误</el-radio> -->
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.dialysis_item_desc"></el-input>
       </el-form-item>
     </el-form>
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+   
+   <el-form :inline="true" class="demo-form-inline newCheckBox" :model="doubleReview" label-width="110px">
+       <el-checkbox-group v-model="checkList" @change="changeBox">
+          <el-checkbox :label="diazes"></el-checkbox>
+          <el-checkbox :label="puncture_needle"></el-checkbox>
+          <el-checkbox :label="dialysate_formulation"></el-checkbox>
+          <el-checkbox :label="kalium"></el-checkbox>
+          <el-checkbox :label="calcium"></el-checkbox>
+       </el-checkbox-group>
+    </el-form>
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       <el-form-item label="透析参数核查 : ">
-        <el-radio v-model="doubleReview.dialysis_parameter_check" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.dialysis_parameter_check" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.dialysis_parameter_check" label="1" @change="changeRadioTwo">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.dialysis_parameter_check" label="2">错误</el-radio> -->
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.dialysis_parameter_desc"></el-input>
       </el-form-item>
     </el-form>
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+    <el-form class="newCheckBox">
+     <el-checkbox-group v-model="checkListOne" @change="changeBoxOne" >
+        <el-checkbox :label="dialys_mode"></el-checkbox>
+        <el-checkbox :label="long_time"></el-checkbox>
+        <el-checkbox :label="target_ultrafiltration"></el-checkbox>
+        <el-checkbox :label="anticoagulant" ></el-checkbox>
+        <el-checkbox :label="anticoagulant_shouji"></el-checkbox>
+        <el-checkbox :label="anticoagulant_weichi"></el-checkbox>
+        <el-checkbox :label="anticoagulant_zongliang"></el-checkbox>
+        <el-checkbox :label="displace_liqui_part"></el-checkbox>
+        <el-checkbox :label="replacement_total"></el-checkbox>
+        <el-checkbox :label="blood_flow_volume"></el-checkbox>
+        <el-checkbox :label="dialysate_flow"></el-checkbox>
+     </el-checkbox-group>
+    </el-form>
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       <el-form-item label="血管通路核查 : ">
 
-        <el-radio v-model="doubleReview.vascular_access_verification" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.vascular_access_verification" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.vascular_access_verification" label="1" @change="changeRadioThree">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.vascular_access_verification" label="2">错误</el-radio> -->
 
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.vascular_access_desc"></el-input>
       </el-form-item>
     </el-form>
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+    <el-form class="newCheckBox">
+       <el-checkbox-group v-model="checkListTwo" @change="changeBoxTwo">
+        <el-checkbox :label="blood_access_part_opera_id">
+
+        </el-checkbox>
+        <el-checkbox label="动静脉接错"></el-checkbox>
+        <el-checkbox label="渗血"></el-checkbox>
+        <el-checkbox label="压迫" ></el-checkbox>
+        <el-checkbox label="折叠"></el-checkbox>
+        <el-checkbox label="滑脱"></el-checkbox>
+     </el-checkbox-group>
+    </el-form>
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       <el-form-item label="管道连接核查 : ">
-        <el-radio v-model="doubleReview.pipeline_connection_check" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.pipeline_connection_check" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.pipeline_connection_check" label="1" @change="changeRadioFour">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.pipeline_connection_check" label="2">错误</el-radio> -->
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.pipeline_connection_desc"></el-input>
       </el-form-item>
     </el-form>
-
+    <el-form class="newCheckBox">
+      <el-checkbox-group v-model="checkListThree" @change="changeBoxThree">
+        <el-checkbox label="泵前补液测管未夹"></el-checkbox>
+        <el-checkbox label="肝素管夹未开启"></el-checkbox>
+        <el-checkbox label="透析器连接错误"></el-checkbox>
+        <el-checkbox label="动静脉壶页面不标准" ></el-checkbox>
+        <el-checkbox label="静脉管路未卡入保护夹"></el-checkbox>
+        <el-checkbox label="压力传感器夹未打开"></el-checkbox>
+        <el-checkbox label="接口连接松动"></el-checkbox>
+        <el-checkbox label="管路打折"></el-checkbox>
+     </el-checkbox-group>
+    </el-form>
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="120px">
       <el-form-item label="第一核对时间:">
         <el-time-picker
@@ -99,7 +148,7 @@
   import { postDoubleCheck } from '@/api/dialysis'
   import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
-
+  import { getDataConfig } from '@/utils/data'
   export default {
     name: 'doubleCheckDialog',
     data() {
@@ -128,8 +177,29 @@
           check_time: 0,
           first_check_time: 0
         },
-
-        record_date: ''
+        dialysate_formulation_options:[],
+        record_date: '',
+        checkList: [],
+        checkListOne:[],
+        checkListTwo:[],
+        checkListThree:[],
+        diazes:"透析器/灌流器:",
+        puncture_needle:"穿刺针:",
+        dialysate_formulation:"透析液配方:",
+        kalium:"钾:",
+        calcium:"钙:",
+        dialys_mode:"透析模式:",
+        long_time:"透析时长:",
+        target_ultrafiltration:"目标超滤量:",
+        anticoagulant:"抗凝剂:",
+        anticoagulant_shouji:"首剂:",
+        anticoagulant_weichi:"维持:",
+        anticoagulant_zongliang:"总量:",
+        displace_liqui_part:"置换液:",
+        replacement_total:"置换总量:",
+        blood_flow_volume:"处方血流量:",
+        dialysate_flow:"透析液流量:",
+        blood_access_part_opera_id:"通路类型:"
       }
     }, methods: {
       show() {
@@ -187,7 +257,8 @@
       handleCancle: function() {
         this.isVisibility = false
 
-      }, handleComfirm: function() {
+      }, 
+      handleComfirm: function() {
 
         if (this.patient.id <= 0) {
           this.$message.error('没有选择患者')
@@ -259,6 +330,7 @@
             // }
 
             let doublecheck_resp = response.data.data.doubleCheck
+         
             var doubleCheck = this.double_check
             for (var index in doublecheck_resp) {
               // doubleCheck[index] = doublecheck_resp[index];
@@ -464,6 +536,355 @@
           }
         }
       },
+      changeBox(val){
+         
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+        if(str.indexOf('透析器/灌流器')!=-1 && this.prescription!=null){
+            arr.push("透析器/灌流器:"+(this.prescription.dialyzer_perfusion_apparatus?this.prescription.dialyzer_perfusion_apparatus:""))
+        }
+
+       if(str.indexOf('透析器/灌流器')!=-1 && this.prescription==null){
+            arr.push("透析器/灌流器:")
+        }
+       
+        if(str.indexOf('穿刺针')!=-1 && this.predialysis_evaluation.id!=0){
+           arr.push("穿刺针:"+this.predialysis_evaluation.puncture_needle)
+        }
+
+         if(str.indexOf('穿刺针')!=-1 && this.predialysis_evaluation.id==0){
+           arr.push("穿刺针:")
+        }
+        
+        if(str.indexOf('透析液配方')!=-1 && this.prescription!=null){
+           arr.push("透析液配方:"+this.GetDialysateFormulationById(this.prescription.dialysate_formulation))
+        }
+
+       if(str.indexOf('透析液配方')!=-1 && this.prescription==null){
+           arr.push("透析液配方:")
+        }
+        if(str.indexOf('钾')!=-1 && this.prescription!=null ){
+          arr.push("钾:"+(this.prescription.kalium?this.prescription.kalium:""))
+        }
+        if(str.indexOf('钾')!=-1 && this.prescription==null ){
+          arr.push("钾:")
+        }
+        if(str.indexOf('钙')!=-1 && this.prescription!=null ){
+          arr.push("钙:"+(this.prescription.calcium?this.prescription.calcium:""))
+        }
+        if(str.indexOf('钙')!=-1 && this.prescription==null ){
+          arr.push("钙:")
+        }
+        console.log("arr",arr)
+        this.doubleReview.dialysis_item_desc = arr.join(";")
+        if(val.length > 0){
+          this.doubleReview.dialysis_item_check = 2
+        }else{
+          this.doubleReview.dialysis_item_check = "1"
+        }
+      },
+      changeBoxOne(val){
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+        if(str.indexOf('透析模式')!=-1 && this.prescription!=null){
+            arr.push("透析模式:"+(this.getMode(this.prescription.mode_id)?this.getMode(this.prescription.mode_id):""))
+        }
+         if(str.indexOf('透析模式')!=-1 && this.prescription==null){
+            arr.push("透析模式:")
+         } 
+
+         if(str.indexOf('透析时长')!=-1 && this.prescription!=null){
+            arr.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysis_duration:""))
+         }
+
+        if(str.indexOf('透析时长')!=-1 && this.prescription==null){
+            arr.push("透析时长:")
+         }
+        
+        if(str.indexOf("目标超滤量")!=-1 && this.prescription!=null){
+           arr.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
+        }
+        if(str.indexOf("目标超滤量")!=-1 && this.prescription==null){
+           arr.push("目标超滤量:")
+        }
+        if(str.indexOf("抗凝剂")!=-1 && this.prescription!=null){
+           arr.push("抗凝剂:"+(this.prescription.anticoagulant?this.prescription.anticoagulant:""))
+        }
+       if(str.indexOf("抗凝剂")!=-1 && this.prescription==null){
+           arr.push("抗凝剂:")
+        }
+        if(str.indexOf("首剂")!=-1 && this.prescription!=null){
+           arr.push("首剂:"+(this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:""))
+        }
+        if(str.indexOf("首剂")!=-1 && this.prescription==null){
+           arr.push("首剂:")
+        }
+       if(str.indexOf("维持")!=-1 && this.prescription!=null){
+           arr.push("维持:"+(this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:""))
+        }
+
+        if(str.indexOf("维持")!=-1 && this.prescription==null){
+           arr.push("维持:")
+        }
+
+        if(str.indexOf("总量")!=-1 && this.prescription!=null){
+           arr.push("总量:"+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:""))
+        }
+        
+        if(str.indexOf("总量")!=-1 && this.prescription==null){
+           arr.push("总量:")
+        }
+
+       if(str.indexOf("置换液")!=-1 && this.prescription!=null){
+           arr.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+        } 
+
+       if(str.indexOf("置换液")!=-1 && this.prescription==null){
+           arr.push("置换液:")
+        } 
+      
+       if(str.indexOf("置换总量")!=-1 && this.prescription!=null){
+           arr.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+        } 
+
+        if(str.indexOf("置换总量")!=-1 && this.prescription==null){
+           arr.push("置换总量:")
+        } 
+
+       if(str.indexOf("处方血流量")!=-1 && this.prescription!=null){
+           arr.push("处方血流量:"+(this.prescription.blood_flow_volume?this.prescription.blood_flow_volume:""))
+        } 
+
+       if(str.indexOf("处方血流量")!=-1 && this.prescription==null){
+           arr.push("处方血流量:")
+        } 
+       
+       if(str.indexOf("透析液流量")!=-1 && this.prescription!=null){
+           arr.push("透析液流量:"+(this.prescription.dialysate_flow?this.prescription.dialysate_flow:""))
+        } 
+
+       if(str.indexOf("透析液流量")!=-1 && this.prescription==null){
+           arr.push("透析液流量:")
+        } 
+        console.log("arr",arr)
+        this.doubleReview.dialysis_parameter_desc = arr.join(";")
+        if(val.length>0){
+          this.doubleReview.dialysis_parameter_check = 2
+        }else{
+          this.doubleReview.dialysis_parameter_check = "1"
+        }
+      },
+      changeBoxTwo(val){
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+ 
+          if(str.indexOf('通路类型')!=-1 && this.predialysis_evaluation.id!=0){
+            arr.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
+          
+          }
+
+          if(str.indexOf('通路类型')!=-1 && this.predialysis_evaluation.id==0){
+            arr.push("通路类型:")
+          }
+          if(str.indexOf('动静脉接错')!=-1){
+             arr.push("动静脉接错:")
+          }
+          if(str.indexOf('渗血')!=-1){
+             arr.push("渗血:")
+          }
+         if(str.indexOf('压迫')!=-1){
+             arr.push("压迫:")
+          }
+          if(str.indexOf('折叠')!=-1){
+             arr.push("折叠:")
+          }
+          if(str.indexOf('滑脱')!=-1){
+             arr.push("滑脱:")
+          }
+        console.log("arr",arr)
+        this.doubleReview.vascular_access_desc = arr.join(";")
+        if(val.length>0){
+          this.doubleReview.vascular_access_verification = 2
+        }else{
+          this.doubleReview.vascular_access_verification = "1"
+        }
+      },
+      changeBoxThree(val){
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+         if(str.indexOf('泵前补液测管未夹')!=-1){
+           arr.push("泵前补液测管未夹:")
+         }
+         if(str.indexOf('肝素管夹未开启')!=-1){
+           arr.push("肝素管夹未开启:")
+         }
+         if(str.indexOf('透析器连接错误')!=-1){
+           arr.push("透析器连接错误:")
+         }
+        if(str.indexOf('动静脉壶页面不标准')!=-1){
+           arr.push("动静脉壶页面不标准:")
+         }
+          if(str.indexOf('静脉管路未卡入保护夹')!=-1){
+           arr.push("静脉管路未卡入保护夹:")
+         }
+         if(str.indexOf("压力传感器夹未打开")!=-1){
+           arr.push("压力传感器夹未打开")
+         }
+         if(str.indexOf('接口连接松动')!=-1){
+            arr.push("接口连接松动")
+         }
+         if(str.indexOf("管路打折")!=-1){
+           arr.push("管路打折")
+         }
+         this.doubleReview.pipeline_connection_desc = arr.join(";")
+         if(val.length > 0){
+          this.doubleReview.pipeline_connection_check = 2
+         }else{
+           this.doubleReview.pipeline_connection_check = "1"
+         }
+      },
+
+      changeRadio(val){
+        if(val == 1){
+         this.doubleReview.dialysis_item_desc = ""
+         this.checkList =[]
+        }
+      },
+      changeRadioTwo(val){
+        if(val == 1){
+          this.doubleReview.dialysis_parameter_desc = ""
+          this.checkListOne = []
+        }
+      },
+      changeRadioThree(val){
+         if(val == 1){
+           this.doubleReview.vascular_access_desc = ""
+           this.checkListTwo = []
+         }
+      },
+      changeRadioFour(val){
+         if(val == 1){
+           this.doubleReview.pipeline_connection_desc = ""
+           this.checkListThree = [] 
+         }
+      },
+
+      GetDialysateFormulationById(val) {
+         this.dialysate_formulation_options = getDataConfig('hemodialysis','dialysate_formulation')
+         console.log("透析液配方",this.dialysate_formulation_options)
+        let name = ''
+        let dfl = this.dialysate_formulation_options.length
+        for (let index = 0; index < dfl; index++) {
+          if (this.dialysate_formulation_options[index].id == val) {
+            name = this.dialysate_formulation_options[index].name
+            break
+          }
+        }
+        return name
+     },
+      getMode(id){
+       var name = ""
+        if(id == 1){
+          name = "HD"
+        }
+        if(id == 2){
+          name = "HDF"
+        }
+
+        if(id == 3){
+          name = "HD+HP"
+        }
+
+        if(id == 4){
+          name = "HP"
+        }
+        if(id == 5){
+          name = "HF"
+        }
+       if(id == 6){
+          name = "SCUF"
+        }
+       if(id == 7){
+          name = "IUF"
+        }
+       if(id == 8){
+          name = "HFHD"
+        }
+
+       if(id == 9){
+          name = "HFHD+HP"
+        }
+       if(id == 10){
+          name = "PHF"
+        }
+
+       if(id == 11){
+          name = "HFR"
+        }
+
+        if(id == 12){
+          name = "HDF+HP"
+        }
+
+        if(id == 13){
+          name = "CRRT"
+        }
+
+        if(id == 14){
+          name = "腹水回输"
+        }
+        if(id == 19){
+          name = "IUF+HD"
+        }
+        if(id == 20){
+          name = "UF"
+        }
+        return name
+     },
+
+     getAnticoagulant(id){
+       var name = ""
+       if(id == 1){
+         name = "无肝素"
+       }
+       if(id == 2){
+         name = "普通肝素"
+       }
+       if(id == 3){
+         name = "低分子肝素"
+       }
+       if(id == 4){
+         name = "阿加曲班"
+       }
+       if(id == 5){
+         name = "枸橼酸钠"
+       }
+       if(id == 6){
+         name ="低分子肝素钙"
+       }
+       if(id == 7){
+         name = "低分子肝素钠"
+       }
+       return name
+     },
+     getBloodAccess(id){
+       
+        let vascular_access_desc = getDataConfig(
+          'hemodialysis',
+          'vascular_access_desc'
+        )
+        var name = ""
+        for(let i=0;i<vascular_access_desc.length;i++){
+          if(vascular_access_desc[i].id == id){
+             name = vascular_access_desc[i].name
+          }
+        }
+        return name
+     }
     },
 
     props: {
@@ -485,13 +906,146 @@
         default: () => {
           return { id: 0 }
         }
-      }
+      },
+      predialysis_evaluation: { // 透前评估
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      prescription: {
+        // 透析处方
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
 
     },
     watch: {
       isVisibility(val) {
-
-      }, 'double_check.id': function() {
+      
+        if(this.prescription!=null && this.prescription.id!=0){
+          this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
+          this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
+         
+          this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
+         
+          this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
+          this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id)
+          this.long_time = this.long_time + (this.prescription.dialysis_duration?this.prescription.dialysate_formulation:"")
+          this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
+          this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
+          this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
+          this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
+          this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
+          this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+          this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
+          this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
+        }
+        if(this.predialysis_evaluation!=null && this.predialysis_evaluation.id!=0){
+          this.puncture_needle = this.puncture_needle + this.predialysis_evaluation.puncture_needle
+          this.blood_access_part_opera_id = this.blood_access_part_opera_id + this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id)
+        } 
+        if(this.double_check !=null && this.double_check.id!=0){
+           console.log("双人核对",this.double_check)
+           if(this.double_check.dialysis_item_desc.indexOf("透析器/灌流器")!=-1){
+             this.checkList.push("透析器/灌流器:"+this.prescription.dialyzer_perfusion_apparatus)
+             console.log("222222",this.checkList)
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("穿刺针")!=-1){
+              this.checkList.push("穿刺针:"+(this.predialysis_evaluation.puncture_needle?this.predialysis_evaluation.puncture_needle:""))
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("透析液配方:")!=-1){
+              this.checkList.push("透析液配方:"+this.GetDialysateFormulationById(this.prescription.dialysate_formulation))
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("钾:")!=-1){
+              this.checkList.push("钾:"+(this.prescription.kalium?this.prescription.kalium:""))
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("钙:")!=-1){
+               this.checkList.push("钙:"+(this.prescription.calcium?this.prescription.calcium:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("透析模式:")!=-1){
+              this.checkListOne.push("透析模式:"+this.getMode(this.prescription.mode_id))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("透析时长")!=-1){
+              this.checkListOne.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysate_formulation:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("目标超滤量")!=-1){
+              this.checkListOne.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("抗凝剂")!=-1){
+              this.checkListOne.push("抗凝剂:"+this.getAnticoagulant(this.prescription.anticoagulant))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("首剂")!=-1){
+              this.checkListOne.push("首剂:"+(this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("维持")!=-1){
+              this.checkListOne.push("维持:"+(this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:""))
+           }
+          if(this.double_check.dialysis_parameter_desc.indexOf("总量")!=-1){
+              this.checkListOne.push("总量:"+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:""))
+           }
+          if(this.double_check.dialysis_parameter_desc.indexOf("置换液")!=-1){
+              this.checkListOne.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("置换总量")!=-1){
+             this.checkListOne.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("处方血流量")!=-1){
+             this.checkListOne.push("处方血流量:"+(this.prescription.blood_flow_volume?this.prescription.blood_flow_volume:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("透析液流量")!=-1){
+             this.checkListOne.push("透析液流量:"+(this.prescription.dialysate_flow?this.prescription.dialysate_flow:""))
+           }
+           if(this.double_check.vascular_access_desc.indexOf("通路类型")!=-1){
+             this.checkListTwo.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
+           }
+
+           if(this.double_check.vascular_access_desc.indexOf("动静脉接错")!=-1){
+             this.checkListTwo.push("动静脉接错")
+           }
+           if(this.double_check.vascular_access_desc.indexOf("渗血")!=-1){
+             this.checkListTwo.push("渗血")
+           }
+           if(this.double_check.vascular_access_desc.indexOf("压迫")!=-1){
+             this.checkListTwo.push("压迫")
+           }
+          if(this.double_check.vascular_access_desc.indexOf("折叠")!=-1){
+             this.checkListTwo.push("折叠")
+           }
+          if(this.double_check.vascular_access_desc.indexOf("滑脱")!=-1){
+             this.checkListTwo.push("滑脱")
+           }
+
+           if(this.double_check.pipeline_connection_desc.indexOf("泵前补液测管未夹")!=-1){
+             this.checkListThree.push("泵前补液测管未夹")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("肝素管夹未开启")!=-1){
+             this.checkListThree.push("肝素管夹未开启")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("透析器连接错误")!=-1){
+             this.checkListThree.push("透析器连接错误")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("动静脉壶页面不标准")!=-1){
+             this.checkListThree.push("动静脉壶页面不标准")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("静脉管路未卡入保护夹")!=-1){
+             this.checkListThree.push("静脉管路未卡入保护夹")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("压力传感器夹未打开")){
+              this.checkListThree.push("压力传感器夹未打开")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("接口连接松动")){
+              this.checkListThree.push("接口连接松动")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("管路打折")){
+             this.checkListThree.push("管路打折")
+           }
+           console.log("hhh",this.checkListOne)
+        }
+      }, 
+      'double_check.id': function() {
         if (this.double_check.id > 0) {
           for (var index in this.doubleReview) {
             this.doubleReview[index] = this.double_check[index] + ''
@@ -558,6 +1112,7 @@
 
     },
     created() {
+     
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
 
@@ -571,12 +1126,28 @@
         this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
       }
       this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-
+     
     }
 
   }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.newInline{
+  display: flex;
+}
+.newItem{
+  flex: 1;
+  display: flex !important;
+  .el-form-item__content{
+    width: 100%;
+  }
+}
+.newCheckBox{
+  margin-bottom: 10px;
+  .el-checkbox{
+    margin-bottom: 10px;
+  }
+}
 </style>
+

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

@@ -213,10 +213,10 @@
               this.$set(this_order, key, dialysis_order[key])
             }
             let orgId = parseInt(sessionStorage.getItem("org_id"));
-            axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
-              console.log('res',res.data)
+            // axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
+            //   console.log('res',res.data)
 
-            }) 
+            // }) 
             this.hide()
             this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
 

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

@@ -160,6 +160,9 @@
                   template_id == 27 ||
                   template_id == 29 ||
                   template_id == 30 ||
+                  template_id == 31 ||
+                  template_id == 32 ||
+                  template_id == 34 ||
                   org_id == 9555)
             "
           >
@@ -196,6 +199,9 @@
                 template_id != 27 &&
                 template_id != 29 &&
                 template_id != 30 &&
+                template_id != 31 &&
+                template_id != 32 &&
+                template_id != 34 &&
                 org_id!=9555
             "
           >
@@ -213,7 +219,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -224,7 +230,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -286,7 +292,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 32)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -297,7 +303,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id !=32)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -512,12 +518,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -525,7 +531,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -533,7 +539,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -958,7 +964,10 @@ export default {
       }
 
       getTodayMonitor(params).then(rs => {
+        console.log("机构ID",this.org_id)
+        
         var resp = rs.data.data
+       
         this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
         this.form.temperature = '' // this.last_monitor_record.pulse_frequency;
 
@@ -967,11 +976,21 @@ export default {
         this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
         this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
-        this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
+        // 静脉压
+        if(this.org_id == 10060){
+          this.form.venous_pressure = resp.monitor.venous_pressure
+        }else{
+          this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
+        }
+        
         this.form.venous_pressure_type = resp.monitor.venous_pressure_type ? resp.monitor.venous_pressure_type : 1
         this.form.arterial_pressure = resp.monitor.arterial_pressure ? resp.monitor.arterial_pressure : '' // this.last_monitor_record.arterial_pressure;
         this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type ? resp.monitor.arterial_pressure_type : 1
-        this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+        if(this.org_id == 10060){
+          this.form.transmembrane_pressure = resp.monitor.transmembrane_pressure;
+        }else{
+          this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+        }
         this.form.transmembrane_pressure_type = resp.monitor.transmembrane_pressure_type ? resp.monitor.transmembrane_pressure_type : 1
         this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate ? resp.monitor.ultrafiltration_rate : ''
         this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
@@ -1097,6 +1116,7 @@ export default {
     },
 
     submitAction: function() {
+      
       // TODO loading
       var is_new = this.form.id
       this.form.operate_time = parseInt(this.form.operate_time / 1000)

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -25,6 +25,20 @@
           <label>冲管护士 : </label>
           <span class="content">{{ washpipe_nurse }}</span>
         </li>
+
+        <li v-if="isShow('换药护士')">
+          <label>换药护士 : </label>
+          <span class="content">{{ change_nurse }}</span>
+        </li>
+
+       <li v-if="isShow('疑难穿刺护士')">
+          <label>疑难穿刺护士 : </label>
+          <span class="content">{{ difficult_puncture_nurse }}</span>
+        </li>
+        <li v-if="isShow('新开瘘护士')">
+          <label>新开瘘护士 : </label>
+          <span class="content">{{ new_fistula_nurse }}</span>
+        </li>
         <li>
           <label>状态 : </label>
           <span class="content">{{ stage }}</span>
@@ -124,11 +138,30 @@
           return '-'
         }
         return this.admin_map[this.record.puncture_nurse] == null ? '' : this.admin_map[this.record.puncture_nurse].name
-      }, washpipe_nurse: function() {
+      },
+       washpipe_nurse: function() {
         if (this.record.id == 0) {
           return '-'
         }
         return this.admin_map[this.record.washpipe_nurse] == null ? '' : this.admin_map[this.record.washpipe_nurse].name
+      },
+      change_nurse:function(){
+         if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.change_nurse] == null ? '' : this.admin_map[this.record.change_nurse].name
+      },
+      difficult_puncture_nurse:function(){
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.difficult_puncture_nurse] == null ? '' : this.admin_map[this.record.difficult_puncture_nurse].name
+      },
+      new_fistula_nurse:function(){
+         if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.new_fistula_nurse] == null ? '' : this.admin_map[this.record.new_fistula_nurse].name
       }
     },
     methods: {

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,16 +14,16 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29" width="92px" > 置换率(L/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 32)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id!=32)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/details/doubleCheck.vue

@@ -7,24 +7,22 @@
           <label>透析物品核查 : </label>
           <span class="content">{{ dialysis_item_check }}</span>
         </li>
-        <li>
-          <label>透析参数核查 : </label>
-          <span class="content">{{ dialysis_parameter_check }}</span>
-        </li>
-        <li>
-          <label>血管通路核查 : </label>
-          <span class="content">{{ vascular_access_verification }}</span>
-        </li>
-      </ul>
-      <ul>
         <li>
           <label>{{ dialysis_item_desc_title }}</label>
           <span class="content">{{ dialysis_item_desc }}</span>
         </li>
+        <li>
+          <label>透析参数核查 : </label>
+          <span class="content">{{ dialysis_parameter_check }}</span>
+        </li>
         <li>
           <label>{{ dialysis_parameter_desc_title }}</label>
           <span class="content">{{ dialysis_parameter_desc }}</span>
         </li>
+        <li>
+          <label>血管通路核查 : </label>
+          <span class="content">{{ vascular_access_verification }}</span>
+        </li>
         <li>
           <label>{{ vascular_access_desc_title }}</label>
           <span class="content">{{ vascular_access_desc }}</span>
@@ -32,9 +30,13 @@
       </ul>
       <ul>
           <li>
-          <label>管道连接核查 : </label>
-          <span class="content">{{ pipeline_connection_check }}</span>
-        </li>
+            <label>管道连接核查 : </label>
+            <span class="content">{{ pipeline_connection_check }}</span>
+          </li>
+          <li>
+            <label>{{ pipeline_connection_desc_title }}</label>
+            <span class="content">{{ pipeline_connection_desc }}</span>
+          </li>
           <li>
           <label>第一次核对人员 : </label>
           <span class="content">{{getCreaterName(record.creater)}}</span>
@@ -44,12 +46,6 @@
           <span class="content">{{getCreateTime(record.first_check_time,record.creater)}}</span>
         </li>
       </ul>
-      <ul>
-          <li>
-          <label>{{ pipeline_connection_desc_title }}</label>
-          <span class="content">{{ pipeline_connection_desc }}</span>
-        </li>
-      </ul>
       <ul>
 
         <li>

src/xt_pages/dialysis/details/index.vue

@@ -217,6 +217,7 @@
         <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
         <span v-if="newTime != ''">签到时间：{{ newTime }}</span>
       </div>
+
       <nav-igation
         ref="nav"
         title="弹窗导航"
@@ -265,10 +266,13 @@
         @assessmentAfterDislysis="assessmentAfterDislysisFunc"
         :system_prescribe="system_prescribe"
         :his_is_open="his_is_open"
+        :lastAssessment="lastAssessment"
         :stockType="stockType"
       >
       </nav-igation>
 
+
+
       <basic-infor
         :patient="patient"
         :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
@@ -632,6 +636,7 @@ export default {
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
       lastDryWeightDislysis: { id: 0 },
+      lastAssessment:{id:0},
       headNurses: [],
       lastDialysisPrescribe: { id: 0 },
       //
@@ -969,25 +974,24 @@ export default {
 
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
-        
+
         var resp = rs.data
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-        
+
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
             }
           }
-          // console.log('透析处方', prescription)
+
           var solution = resp.data.solution // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
-          // console.log('receiver_treatment_access', receiver_treatment_access)
-          var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-          // console.log('透前评估22222', predialysis_evaluation)
 
+          var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
+           console.log("透器评估",predialysis_evaluation)
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
@@ -1017,20 +1021,21 @@ export default {
           var aliquid_info = resp.data.aliquid_info
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation
-          // console.log('上次透前评估', lastPredialysisEvaluation)
+
           if (lastPredialysisEvaluation != null) {
             if (lastPredialysisEvaluation.blood_access_part_id == -2) {
               lastPredialysisEvaluation.blood_access_part_id = 0
             }
           }
           var lastMonitorRecord = resp.data.lastMonitorRecord
-          var lastAssessmentAfterDislysis =
-            resp.data.lastAssessmentAfterDislysis
+          var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
-          // console.log("最后一次干体重",lastDryWeightDislysis)
+
           var system_prescribe = resp.data.system_prescribe
 
+          var lastAssessment =  resp.data.lastAssessment
+          console.log("最后一次血管通路",lastAssessment)
           this.$refs.nav.setLastRecord(
             lastPredialysisEvaluation,
             lastMonitorRecord,
@@ -1038,7 +1043,8 @@ export default {
             lastDialysisPrescribe,
             lastDryWeightDislysis,
             schedual,
-            system_prescribe
+            system_prescribe,
+            lastAssessment,
           )
 
           var headNurses = resp.data.headNurse
@@ -1049,6 +1055,7 @@ export default {
           this.lastAssessmentAfterDislysis = lastAssessmentAfterDislysis
           this.lastDialysisPrescribe = lastDialysisPrescribe
           this.lastDryWeightDislysis = lastDryWeightDislysis
+          this.lastAssessment = lastAssessment
           this.headNurses = headNurses
           this.system_prescribe = system_prescribe
 
@@ -1111,22 +1118,23 @@ export default {
           this.dialysis_order =
             dialysis_order == null ? { id: 0 } : dialysis_order
 
-          // this.$refs.stat_order.setAdvices(this.doctor_advices)
-          // this.$refs.monitoring.setRecords(this.monitor_records)
+
 
           this.admin_users = resp.data.doctors
           this.devices = resp.data.devices
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
-          
+
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-          
+
+
+
           var stockType =  resp.data.stockType
           this.stockType = stockType
           console.log("stockTYPW",stockType)
-           
+
           var prepare = resp.data.prepare
           this.preparestock = prepare
           console.log("prepare222222",prepare)
@@ -1702,13 +1710,36 @@ export default {
         // let res = re.data;
         // console.log('res3333333333',res)
         if(res.channel == 'queue/join'){
-          if(res.data.fisrtQueueInfo != null){
-            if(res.data.fisrtQueueInfo.create_time){
-              res.data.fisrtQueueInfo.create_time = moment(parseInt(res.data.fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+          let timeType = null
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
             }
           }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+          if(res.data.fisrtQueueInfo != null){
+              if(timeType == 1){
+                  fisrtQueueInfo = res.data.fisrtQueueInfo.morning
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }else if(timeType == 2){
+                  fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }
+          }
+          this.fisrtQueueInfo = fisrtQueueInfo
           this.queueConfig = res.data.queueConfig
-          this.fisrtQueueInfo = res.data.fisrtQueueInfo
+          // this.fisrtQueueInfo = res.data.fisrtQueueInfo
           let arr = res.data.patientQueueList.data
           let waitingCalledArr = []
           let calledArr = []
@@ -1743,6 +1774,34 @@ export default {
         }else if(res.channel == 'patientCallInfo'){
           res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
           this.fisrtQueueInfo = res.data.patientInfo
+        }else if(res.channel == 'fisrtQueueInfo'){
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
+            }
+          }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.patientInfo
+          if(res.data.patientInfo != null){
+              if(timeType == 1){
+                  fisrtQueueInfo = res.data.patientInfo.morning
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }else if(timeType == 2){
+                  fisrtQueueInfo = res.data.patientInfo.afternoon
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }
+          }
+          this.fisrtQueueInfo = fisrtQueueInfo
         }
       }
     },
@@ -1807,10 +1866,16 @@ export default {
       })
     },
     next(){
+      let schedule_type = null
+      if(new Date().getHours() < 11){
+        schedule_type = 1
+      }else {
+        schedule_type = 2
+      }
       console.log('patient_id',this.$route.query.date)
       let org_id =  parseInt(sessionStorage.getItem("org_id"));
       let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
-      axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+      axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
         console.log(res)
         if(res.data.data.patientInfo == null){
           this.$message.error('已经是最后一位了');

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -64,7 +64,23 @@
           </ul>
         </div>
       </div>
-
+     
+     <div class="cell clearfix">
+        <label class="title"> <span class="name">给药途径</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == delivery_way ? 'active' : ''"
+              @click="selectDeliveryWay(item.id)"
+              v-for="item in deliveryWay"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+    
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
@@ -353,7 +369,7 @@ export default {
         schedul_type: 0,
         partition_type: 0,
         schedul_time: "",
-        keywords: ""
+        keywords: "",
       },
       selecting_schs: [],
       partitionArr: [],
@@ -361,6 +377,8 @@ export default {
       scheduleMap:[],
       show:true,
       showOne:false,
+      deliveryWay:[],
+      delivery_way:0,
     };
   },
   created() {
@@ -407,17 +425,23 @@ export default {
     },
 
     selectSchedulType(scheduleType) {
-      // alert(scheduleType);/
+     
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
-      this.requestSchedualDoctors();
+      this.requestSchedualDoctors(this.time);
     },
     selectPartitionType(partitionType) {
       this.partitionType = partitionType;
       this.listQuery.partition_type = partitionType;
-      this.requestSchedualDoctors();
+      this.requestSchedualDoctors(this.time);
+    },
+    
+    selectDeliveryWay(val){
+       this.delivery_way = val
+       this.requestSchedualDoctors(this.time)
     },
 
+
     changeTime() {
       this.listQuery.schedul_time = this.time;
       this.requestSchedualDoctors(this.time)
@@ -430,16 +454,31 @@ export default {
         } else {
           this.partitionArr = response.data.data.zone;
           this.partitionArr.unshift({ id: 0, name: "全部" });
+          var dics  =  response.data.data.dics
+          var obj = {id:0,name:"全部"}
+          this.deliveryWay.push(obj)
+          this.deliveryWay.push(...dics)
         }
       });
     },
     requestSchedualDoctors (time) {
+        
+        var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+        }
+
         let newTime =  moment(time).format('YYYY-MM-DD')
         getSchedualDoctors({
         date: newTime,
         patient_type: 0,
-        advice_type: 2
-        }).then(rs => {
+        advice_type: 2,
+        delivery_way:name}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -609,7 +648,16 @@ export default {
       }
     //   console.log("sch_ids",sch_ids)
       this.$store.dispatch("SetAdviceIDs", sch_ids);
-      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime()} });
+       var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+       }
+      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
 
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -344,7 +344,7 @@
           >打印</el-button
         >
       </template>
-       <template v-if="org_template_info.template_id == 25">
+      <template v-if="org_template_info.template_id == 25">
         <el-button
           :loading="loading"
           size="small"
@@ -427,6 +427,64 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 31">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+      <template v-if="org_template_info.template_id == 32">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+      <template v-if="org_template_info.template_id == 33">
+        <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印全部</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisOnePage"
+            type="primary"
+            >打印纪录单</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+          >
+        </div>
+      </template>
+      <template v-if="org_template_info.template_id == 34">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -657,6 +715,26 @@
             v-if="org_template_info.template_id == 30"
           >
           </DialysisPrintOrderThirty>
+          <DialysisPrintOrderThirtyOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 31"
+          >
+          </DialysisPrintOrderThirtyOne>
+          <DialysisPrintOrderThirtyTwo
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 32"
+          >
+          </DialysisPrintOrderThirtyTwo>
+          <DialysisPrintOrderThirtyThree
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 33"
+          >
+          </DialysisPrintOrderThirtyThree>
+          <DialysisPrintOrderThirtyFour
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 34"
+          >
+          </DialysisPrintOrderThirtyFour>
         </div>
       </el-container>
     </div>
@@ -706,9 +784,17 @@ import DialysisPrintOrderTwentySeven from "./template/DialysisPrintOrderTwentySe
 import DialysisPrintOrderTwentyEight from "./template/DialysisPrintOrderTwentyEight";
 import DialysisPrintOrderTwentyNine from "./template/DialysisPrintOrderTwentyNine";
 import DialysisPrintOrderThirty from "./template/DialysisPrintOrderThirty";
+import DialysisPrintOrderThirtyOne from "./template/DialysisPrintOrderThirtyOne";
+import DialysisPrintOrderThirtyTwo from "./template/DialysisPrintOrderThirtyTwo";
+import DialysisPrintOrderThirtyThree from "./template/DialysisPrintOrderThirtyThree";
+import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFour";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyFour,
+    DialysisPrintOrderThirtyThree,
+    DialysisPrintOrderThirtyTwo,
+    DialysisPrintOrderThirtyOne,
     DialysisPrintOrderThirty,
     DialysisPrintOrderTwentyNine,
     DialysisPrintOrderTwentyEight,
@@ -1074,13 +1160,6 @@ export default {
           style: style,
           scanStyles: false
         });
-      }else if (this.org_template_info.template_id == 25) {
-        printJS({
-          printable: "dialysis-print-box",
-          type: "html",
-          style: style5,
-          scanStyles: false
-        });
       } else if (this.org_template_info.template_id == 26) {
         printJS({
           printable: "dialysis-print-box",
@@ -1116,6 +1195,34 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 31) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style3,
+          scanStyles: false
+        });
+      } else if (this.org_template_info.template_id == 32) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
+      } else if (this.org_template_info.template_id == 33) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false
+        });
+      } else if (this.org_template_info.template_id == 34) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {
@@ -1138,7 +1245,8 @@ export default {
         this.org_template_info.template_id == 2 ||
         this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
-        this.org_template_info.template_id == 22 
+        this.org_template_info.template_id == 22 || 
+        this.org_template_info.template_id == 33
       ) {
         printJS({
           printable: "dialysis-print-box-1-1",
@@ -1189,7 +1297,8 @@ export default {
         this.org_template_info.template_id == 2 ||
         this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
-        this.org_template_info.template_id == 22 
+        this.org_template_info.template_id == 22 ||
+        this.org_template_info.template_id == 33
       ) {
         printJS({
           printable: "dialysis-print-box-1-2",

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -258,6 +258,7 @@ export default {
             time:'',
             show:true,
             showOne:false,
+            delivery_way:""
         }
     },
     methods:{
@@ -277,7 +278,8 @@ export default {
             getSchedualDoctors({
             date: newTime,
             patient_type: 0,
-            advice_type: 2
+            advice_type: 2,
+            delivery_way:this.delivery_way,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -741,6 +743,9 @@ export default {
     },
     created(){
       var time = this.$route.query.time
+      var delivery_way = this.$route.query.delivery_way
+      console.log("delivery_Way",delivery_way)
+      this.delivery_way = delivery_way
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)

src/xt_pages/dialysis/schedualPatient.vue

@@ -279,6 +279,15 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       }
     },
     created() {
+      if(sessionStorage.getItem('signIn') != null){
+        setTimeout(() => {    
+          if(sessionStorage.getItem('signIn') == 1){
+            this.$router.replace({ path: '/signIn' })
+          }else if(sessionStorage.getItem('signIn') == 2){
+            this.$router.replace({ path: '/lineUp' })
+          }
+        },1000)
+      }
       var schedule_type_selected = this.$store.getters.schedule_type_selected
       var zone_selected = this.$store.getters.zone_selected
       var patient_state_selected = this.$store.getters.patient_state_selected
@@ -378,13 +387,36 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           // let res = re.data;
           console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
-            if(res.data.fisrtQueueInfo != null){
-              if(res.data.fisrtQueueInfo.create_time){
-                res.data.fisrtQueueInfo.create_time = moment(parseInt(res.data.fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+            let timeType = null
+            if(this.schedule_type_selected == 1){
+              timeType = 1
+            }else if(this.schedule_type_selected == 2){
+              timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
               }
             }
+            let fisrtQueueInfo = []
+            this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+            if(res.data.fisrtQueueInfo != null){
+                if(timeType == 1){
+                    fisrtQueueInfo = res.data.fisrtQueueInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(timeType == 2){
+                    fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
             this.queueConfig = res.data.queueConfig
-            this.fisrtQueueInfo = res.data.fisrtQueueInfo
+            // this.fisrtQueueInfo = res.data.fisrtQueueInfo
             let arr = res.data.patientQueueList.data
             let waitingCalledArr = []
             let calledArr = []
@@ -419,6 +451,34 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           }else if(res.channel == 'patientCallInfo'){
             res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
             this.fisrtQueueInfo = res.data.patientInfo
+          }else if(res.channel == 'fisrtQueueInfo'){
+            if(this.schedule_type_selected == 1){
+              timeType = 1
+            }else if(this.schedule_type_selected == 2){
+              timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
+              }
+            }
+            let fisrtQueueInfo = []
+            this.newFisrtQueueInfo = res.data.patientInfo
+            if(res.data.patientInfo != null){
+                if(timeType == 1){
+                    fisrtQueueInfo = res.data.patientInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(timeType == 2){
+                    fisrtQueueInfo = res.data.patientInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
           }
         }
       },
@@ -448,10 +508,23 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             this.$message.error('已经是最后一位了');
             return
           }
+          let schedule_type = null
+          if(this.schedule_type_selected == 0){
+            if(new Date().getHours() < 11){
+              schedule_type = 1
+            }else {
+              schedule_type = 2
+            }
+          }else if(this.schedule_type_selected == 1){
+            schedule_type = 1
+          }else if(this.schedule_type_selected == 2){
+            schedule_type = 2
+          }
+          
           console.log('patient_id',patient_id)
           let org_id =  parseInt(sessionStorage.getItem("org_id"));
           let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
-          axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+          axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
               console.log(res)
               // let patientArr = res.data.queue_list.data
               // this.patientArr = patientArr

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -137,6 +137,19 @@
                         <!--&nbsp;-->
                       </div>
                     </td>
+                    <td v-if="org_id == 9987" width="80">透前血压:</td>
+                    <td v-if="org_id == 9987" width="50">
+                      <div class="under-line">
+                        &nbsp;{{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : ""}}
+                      </div>
+                    </td>
+                    <td v-if="org_id == 9987" width='10'>/</td>
+                    <td v-if="org_id == 9987" width="50">
+                      <div class="under-line">
+                        &nbsp;{{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : "" }}
+                      </div>
+                    </td>
+                    <td v-if="org_id == 9987" width='30'>mmHg</td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -702,7 +715,7 @@
                 <tbody>
                   <tr>
                     <td width="55">并发症:</td>
-                    <td width="600">
+                    <td :width="org_id == 9987 ? 670 : 600">
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('低血压') > -1 ? true : false" showValue="低血压"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('高血压') > -1 ? true : false" showValue="高血压"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('心律失常') > -1 ? true : false" showValue="心律失常"></label-box>
@@ -714,6 +727,7 @@
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('心衰') > -1 ? true : false" showValue="心衰"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('腹痛') > -1 ? true : false" showValue="腹痛"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('无') > -1 ? true : false" showValue="无"></label-box>
+                      <label-box v-if="org_id == 9987" :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('低血糖') > -1 ? true : false" showValue="低血糖"></label-box>
                     </td>
                     <td></td>
                   </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -501,7 +501,8 @@
                       <td width="50">血流量<br />(ml/min)</td>
                       <td width="50">静脉压<br />({{monitors[0]&&monitors[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
                       <td width="50">跨膜压<br />({{monitors[0]&&monitors[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
-                      <td width="60">透析液温度(°C)</td>
+                      <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
+                      <td width="60" v-if="org_id == 9836">体温(°C)</td>
                       <td width="50">电导度<br />(ms/cm)</td>
                       <td width="50">超滤量<br />(ml)</td>
                       <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12" width="50">
@@ -543,7 +544,8 @@
                           {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
                         </span>
                       </td>
-                      <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+                      <td v-if="org_id != 9836">{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+                      <td v-if="org_id == 9836">{{ monitor.temperature ? monitor.temperature : "" }}</td>
                       <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
                       </td>
                       <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
@@ -1458,6 +1460,7 @@ export default {
         }
 
         this.advices = response.data.data.advices
+        console.log("医嘱数据2222222222",this.advices)
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -29,16 +29,17 @@
           </div>
           岁
         </div>
-        <div class="inline_block" v-if="patientInfo_source_1">
+        <div class="inline_block" v-if="receiverTreatmentAccess.condition == 2">
           门诊：
           <div class="under_line" style="width: 30px;text-align: center;">
-            <check-box :checked="patientInfo_source_1"></check-box>
+            <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
           </div>
         </div>
-        <div class="inline_block" v-if="patientInfo_source_2">
+        
+        <div class="inline_block" v-if="receiverTreatmentAccess.condition == 1">
           住院：
           <div class="under_line" style="width: 30px;text-align: center;">
-            <check-box :checked="patientInfo_source_2"></check-box>
+            <check-box :checked="receiverTreatmentAccess.condition == 1 ? true : false"></check-box>
           </div>
         </div>
         <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -21,31 +21,31 @@
         </div>
       </div>
       <div class="row">
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
             日期 <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(0,4) }}</div>年
             <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(5,7) }}</div>月
             <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(8,11) }}</div>日
         </div>
-        <div class="inline_block" style="margin-right:10px;">
-          姓名 
+        <div class="inline_block" style="margin-right:5px;">
+          姓名
           <div class="inline_block under_line" style="width:80px;text-align: center;">
               {{ patientInfo.name ? patientInfo.name : "" }}
           </div>
         </div>
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
           性别&nbsp;&nbsp;&nbsp;&nbsp;
           <label-box :isChecked="patientInfo.gender == '男'" showValue="男" ></label-box>&nbsp;
           <label-box :isChecked="patientInfo.gender == '女'" showValue="女" ></label-box>
         </div>
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
           年龄：
           <div class="under_line" style="width: 50px;text-align: center">
               {{ getNewAge(patientInfo.id_card_no) }}
           </div>
           岁
         </div>
-        <div class="inline_block" style="margin-right:10px;">
-            机器编号 
+        <div class="inline_block" style="margin-right:5px;">
+            机器编号
             <div class="inline_block under_line" style="width:80px;">
             {{ getNumber() }}
             </div>
@@ -57,7 +57,7 @@
       <div style="border-bottom: 2px solid #000;width:100%;"></div>
       <div class="row">
           <div class="inline_block" style="margin-right:30px;">
-            血液净化方式 
+            血液净化方式
             <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="!prescription.mode_id">
               /
             </div>
@@ -120,20 +120,20 @@
             </div>
           </div>
           <div class="inline_block" style="margin-right:30px;">
-            血液净化器类型 
+            血液净化器类型
             <div class="inline_block under_line" style="width:150px;text-align: center;">
                 {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : ''}}
             </div>
           </div>
           <div class="inline_block" style="margin-right:30px;">
-            透析液配方 
+            透析液配方
             <div class="inline_block under_line" style="width:150px;text-align: center;">
                 {{ prescription.dialysate_formulation_name ? prescription.dialysate_formulation_name : ''}}
             </div>
           </div>
       </div>
       <div class="row">
-        血管通路 
+        血管通路
         <div class="inline_block under_line" style="width:92%;text-align: left;">
           <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="内瘘"></label-box>
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
@@ -172,7 +172,7 @@
         </div>
       </div>
       <div class="row">
-        抗凝药物 
+        抗凝药物
         <div class="inline_block under_line" style="width:92%;text-align: left;">
           <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>&nbsp;
           <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="低分子肝素"></label-box>
@@ -189,7 +189,7 @@
             <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
             <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
             <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
-            <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp; 
+            <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp;
           </div>
           <div class="inline_block">
             追加
@@ -202,7 +202,7 @@
             <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
             <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
             <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
-            <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>&nbsp; 
+            <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>&nbsp;
           </div>
           <div class="inline_block">
             总量
@@ -263,7 +263,7 @@
           </div>
       </div>
       <div class="row">
-        透前评估 
+        透前评估
         <div class="inline_block under_line" style="width:50%;text-align: left;margin-right:30px;">
           <div class="inline_block" style="margin-right:30px;">
             体温
@@ -471,7 +471,7 @@
               </div>
             </td>
           </tr>
-            
+
           <tr style="height:30px;line-height:30px;">
             <td width="90" style="border:none;padding-left:5px">实际置换量:</td>
             <td width="30" style="text-align:left;border:none;">
@@ -481,7 +481,7 @@
                 </span>L
               </div>
             </td>
-            
+
             <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
             <td width="200" style="text-align:left;border:none;">
               <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false) :false" showValue="0"></label-box>
@@ -579,8 +579,8 @@
                 <img class="es-img" style="height:30px;" :src="doctorForm.url" />
               </span> -->
             </span>
-            
-            
+
+
           </td>
         </tr>
       </table>
@@ -891,15 +891,15 @@ export default {
             this.patientInfo.first_dialysis_date = ''
           }
           this.check = response.data.data.check
-          console.log('核对信息', this.check)
+          // console.log('核对信息', this.check)
           this.predialysis = response.data.data.PredialysisEvaluation
-          console.log('透前评估', this.predialysis)
+          // console.log('透前评估', this.predialysis)
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
             this.predialysis.blood_access_part_opera_id
           )
           this.assessmentafter = response.data.data.assessmentAfterDislysis
           console.log('上次透后体重', this.assessmentafter)
-          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var doctorAdevieInfo = response.data.data.advices
           var tableAdvice = doctorAdevieInfo
           console.log('医生', tableAdvice)
           if (tableAdvice.length === 0) {
@@ -1214,7 +1214,7 @@ export default {
             this.AlPanel = this.anticoagulantsConfit[thisALID]
           }
 
-          this.advices = response.data.data.advices
+          this.advices = JSON.parse(JSON.stringify(response.data.data.advices))
           this.monitors = response.data.data.monitors
           console.log('透析监测', this.monitors)
           this.summary = response.data.data.summary

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -429,7 +429,7 @@
                     <td width="10">ml</td>
                     <td width="30"></td>
                     <td width='70'>透后体重:</td>
-                    <td width="50">
+                    <td width="70">
                       <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "未称重" }}</div>
                     </td>
                     <td width="10">Kg</td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="dialysis-print-box">
     <div class="dialysis-print-order">
-      <!-- <div class="order-yy-name">{{ orgname }}</div> -->
+    
       <div class="order-title">{{ orgname }}&nbsp;&nbsp;血液净化治疗记录单</div>
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
@@ -39,12 +39,7 @@
         </tr>
         </tbody>
       </table>
-      <!-- <div style="display:flex:font-size:14px">
-        <span style="width:50px;text-align:text-algin">诊 断:</span>
-        <div class="under-line" style="text-align:left">
-          &nbsp;{{ patientInfo.diagnose }}
-        </div>
-      </div> -->
+     
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
         <tr>
@@ -63,6 +58,7 @@
         </tr>
         </tbody>
       </table>
+
       <table class="print-table" border="1">
         <tbody>
         <tr>
@@ -141,7 +137,7 @@
                     &nbsp;{{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
                   </div>
                 </td>
-                <td width="35">次/分</td>
+                <td width="40">次/分</td>
                 <td width="30"></td>
 
                 <td width="40">血压:</td>
@@ -342,7 +338,7 @@
               <tbody>
               <tr>
                 <td width="70">血管通路:</td>
-                <td width="600">
+                <td width="590">
                   <div>
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
                     &nbsp;
@@ -350,10 +346,11 @@
                     &nbsp;
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('直穿') > -1 ? true : false" showValue="直穿"></label-box>
                     &nbsp;
-                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : false" showValue="颈内静脉-左"></label-box>
+                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="颈内静脉"></label-box>
                     &nbsp;
-                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="颈内静脉-右"></label-box>
+                    （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : false" showValue="左"></label-box>
                     &nbsp;
+                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="右"></label-box>）
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="股静脉"></label-box>
                     &nbsp;
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
@@ -438,7 +435,7 @@
                 <td width="35">min</td>
                 <td></td>
                 <td width="80">透析机编号:</td>
-                <td width="100">
+                <td width="120">
                   <div class="under-line">{{ getNumber() }}</div>
                 </td>
                 <td width=""></td>
@@ -599,7 +596,7 @@
                 <td width='30'>A液:</td>
                 <td width="10">钙</td>
                 <td width="10">(</td>
-                <td width="200">
+                <td width="210">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.25mmol/L"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.5mmol/L"></label-box>
@@ -608,7 +605,7 @@
                 <td width="10">)</td>
                 <td width="10">钾</td>
                 <td width="10">(</td>
-                <td width="200">
+                <td width="210">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : false" showValue="2.0mmol/L"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="3.5mmol/L"></label-box>
@@ -776,7 +773,7 @@
             透析监测
           </td>
 
-          <td width="100">时间</td>
+          <td width="60">时间</td>
           <td width="40" style="line-height:20px">T<br />℃</td>
           <td width="80" style="line-height:20px">Bp<br />mmHg</td>
           <td width="40" style="line-height:20px">P<br />次/分</td>
@@ -795,7 +792,7 @@
         </tr>
 
         <tr v-for="monitor in monitors" :key="monitor.id">
-          <td style="height:30px;">
+          <td style="height:20px;">
             &nbsp;
             <!-- <template>
               <span v-if="monitor.monitoring_date">
@@ -859,20 +856,20 @@
                 <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
               </tr> -->
         <tr>
-          <td :rowspan="adviceLength" width="30" class="title-box">
+          <td :rowspan="doctor_advices.length + 1" width="30" class="title-box">
             医嘱内容
           </td>
-          <td style="font-size: 16px" width="10%">时间</td>
+          <td style="font-size: 16px" width="8%">时间</td>
           <td style="font-size: 16px" colspan="2">医嘱内容</td>
           <td style="font-size: 16px" width="10%">医生签名</td>
           <td style="font-size: 16px" width="10%">执行人签名</td>
           <td style="font-size: 16px" width="10%">核对人签名</td>
-          <td style="font-size: 16px" width="10%">时间</td>
+          <td style="font-size: 16px" width="8%">时间</td>
         </tr>
         <!-- <template v-for="group in doctor_advices" > -->
 
         <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index">
-          <td height="35px">
+          <td height="30px">
               <span v-if="advice.start_time">
                 {{ getTime(advice.start_time, "{h}:{i}") }}
               </span>
@@ -2013,8 +2010,8 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 13) {
-              var nl = 13 - this.monitors.length
+            if (this.monitors.length < 9) {
+              var nl = 9 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -806,7 +806,7 @@
                   <td width="20">ml</td>
                   <td width="30">V端</td>
                   <td width="30">
-                    <div class="under-line">{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
+                    <div class="under-line">&nbsp;{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
                   </td>
                   <td width="20">ml</td>
                   <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -113,7 +113,7 @@
                 <tbody>
                   <tr>
                     <td width="70">入科方式:</td>
-                    <td width="190">
+                    <td width="280">
                       <div>
                         <label-box style="margin-left:15px;" v-for="(item, index) in way_arr" :key="index" :isChecked="receiverTreatmentAccess.way == item.id ? true : false" :showValue="item.name"></label-box>
                         <!--&nbsp-->
@@ -127,7 +127,7 @@
 
                     <td width='20'></td>
                     <td width="50">意识:</td>
-                    <td width="140">
+                    <td width="300">
                       <div style="display:flex;">
                         <label-box style="margin-left:15px;" v-for="(item, index) in consciousness_arr" :key="index" :isChecked="receiverTreatmentAccess.consciousness == item.id ? true : false" :showValue="item.name"></label-box>
 
@@ -143,31 +143,7 @@
                         <!--showValue='模糊'></label-box>-->
                       </div>
                     </td>
-                    <td width="40">出血:</td>
-                    <td width="40">
-                      <div>
-                        <label-box :isChecked="predialysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
-                      </div>
-                    </td>
-                    <td width="200">
-                      <div>
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('牙龈出血') > -1 ? true : false" showValue="牙龈出血"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('瘀斑') > -1 ? true : false" showValue="瘀斑"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('经期') > -1 ? true : false" showValue="经期"></label-box>
-                        
-                        
-                      </div>
-                    </td>
-                    <td width="50">
-                      <div>
-                        <label-box :isChecked="predialysis.hemorrhage_other != '' ? true : false" showValue="其他"></label-box>
-                      </div>
-                    </td>
-                    <td width="100">
-                        <div class="under-line">&nbsp;{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
-                    </td>
+                    
                     <td></td>
                   </tr>
                 </tbody>
@@ -188,7 +164,7 @@
                     </td>
                     <td width='40'>针眼:</td>
                     <td width='10'>A</td>
-                    <td width='120'>
+                    <td width='70'>
                         <div class="under-line">&nbsp;
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A1')>-1">A1,</span>
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A2')>-1">A2,</span>
@@ -199,7 +175,7 @@
                         </div>
                     </td>
                     <td width='10'>V</td>
-                    <td width='120'>
+                    <td width='70'>
                         <div class="under-line">&nbsp;
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V1')>-1">V1,</span>
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V2')>-1">V2,</span>
@@ -209,21 +185,31 @@
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V6')>-1">V6</span>
                         </div>
                     </td>
-                    <td width='80'>内瘘位置：</td>
-                    <td width="280">
+                    <td width="40">出血:</td>
+                    <td width="40">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-左') > -1 ? true : false) : false" showValue="左"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-右') > -1 ? true : false) : false" showValue="右"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-前臂') > -1 ? true : false) : false" showValue="前臂"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-上臂') > -1 ? true : false) : false" showValue="上臂"></label-box>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
+                      </div>
+                    </td>
+                    <td width="200">
+                      <div>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('牙龈出血') > -1 ? true : false" showValue="牙龈出血"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-下肢') > -1 ? true : false) : false" showValue="下肢"></label-box>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('瘀斑') > -1 ? true : false" showValue="瘀斑"></label-box>
                         &nbsp;
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('经期') > -1 ? true : false" showValue="经期"></label-box>
+                        
+                        
                       </div>
                     </td>
+                    <td width="50">
+                      <div>
+                        <label-box :isChecked="predialysis.hemorrhage_other != '' ? true : false" showValue="其他"></label-box>
+                      </div>
+                    </td>
+                    <td width="100">
+                        <div class="under-line">&nbsp;{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
+                    </td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -254,6 +240,21 @@
                         <label-box :isChecked="predialysis.internal_fistula_skin.indexOf('红肿') > -1 ? true : false" showValue="红肿"></label-box>
                       </div>
                     </td>
+                    <td width='80'>内瘘位置：</td>
+                    <td width="280">
+                      <div>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-左') > -1 ? true : false) : false" showValue="左"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-右') > -1 ? true : false) : false" showValue="右"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-前臂') > -1 ? true : false) : false" showValue="前臂"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-上臂') > -1 ? true : false) : false" showValue="上臂"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-下肢') > -1 ? true : false) : false" showValue="下肢"></label-box>
+                        &nbsp;
+                      </div>
+                    </td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -312,15 +313,15 @@
                     <td width='40'>位置</td>
                     <td width="280">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-左') > -1 ? true : false) : false" showValue="左"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-左') > -1 ? true : false) : false" showValue="左"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-右') > -1 ? true : false) : false" showValue="右"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-右') > -1 ? true : false) : false" showValue="右"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-股V') > -1 ? true : false) : false" showValue="股V"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-股V') > -1 ? true : false) : false" showValue="股V"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -376,11 +377,11 @@
                       <div>
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量-好') > -1 ? true : false" showValue="好"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量差-A') > -1 ? true : false" showValue="A"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('A端血流量差') > -1 ? true : false" showValue="A"></label-box>
                         /
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量差-V') > -1 ? true : false" showValue="V"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('V端血流量差') > -1 ? true : false" showValue="V"></label-box>
                         差&nbsp;
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量-AV反接') > -1 ? true : false" showValue="AV反接"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('AV反接') > -1 ? true : false" showValue="AV反接"></label-box>
                       </div>
                     </td>
                   </tr>
@@ -420,7 +421,7 @@
                     <td width="35">℃</td>
                     <td width='60'>24h尿量</td>
                     <td width='50'>
-                        <div class="under-line">&nbsp;{{ predialysis.urine_volume ? predialysis.urine_volume : '' }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.urine_volume ? predialysis.urine_volume : 0 }}</div>
                     </td>
                     <td width='10'>ml</td>
                     <td width='40'>水肿</td>
@@ -428,7 +429,7 @@
                         <label-box :isChecked="predialysis.edema && predialysis.edema.indexOf('无') > -1 ? true : false" showValue="无"></label-box>
                     </td>
                     <td width='30'>
-                        <label-box :isChecked="predialysis.edema && getEdema(predialysis.edema) != '' ? true : false" showValue=""></label-box>
+                        <label-box :isChecked="predialysis.edema && predialysis.edema.indexOf('无') == -1 ? true : false" showValue=""></label-box>
                     </td>
                     <td width='80'>
                         <div class="under-line">&nbsp;{{ predialysis.edema ? getEdema(predialysis.edema) : '' }}</div>
@@ -558,7 +559,7 @@
                 <table class="table-box">
                     <tbody>
                         <tr>
-                            <td width='100'>透析频率(次/周)</td>
+                            <td width='120'>透析频率(次/周)</td>
                             <td width='50'>
                                 <div class="under-line">
                                     &nbsp;{{ predialysis.dialysis_count ? predialysis.dialysis_count : "" }}
@@ -582,12 +583,18 @@
                             </td>
                             <td width='20'></td>
                             <td width='80'>灌流器</td>
-                            <td width='120'>
+                            <td width='100'>
                                 <div class="under-line">
                                     &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? getDialyzerPerfusionApparatus(prescription.dialyzer_perfusion_apparatus,'灌流器') : '' }}
                                 </div>
                             </td>
-                            <td></td>
+                            <td width='70'>置换速度</td>
+                            <td width='90'>
+                                <div class="under-line">
+                                    &nbsp;{{ prescription.displace_speed ? prescription.displace_speed:'' }}
+                                </div>
+                            </td>
+                            
                         </tr>
                     </tbody>
                 </table>
@@ -596,26 +603,25 @@
                         <tr>
                             <td width='70'>抗凝方式</td>
                             <td width='100'>
-                                <label-box :isChecked="prescription.anticoagulant == 6 ? true:false" showValue="低分子肝素"></label-box>
+                                <label-box :isChecked="prescription.anticoagulant == 3 ? true : prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
                             </td>
-                            <td width='60'>
+                            <td width='100'>
                                 <div class="under-line">
-                                    &nbsp;<span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_zongliang }}</span>
+                                    &nbsp;{{ prescription.antioxidant_commodity_name ? prescription.antioxidant_commodity_name : '' }}
                                 </div>
                             </td>
-                            <td width='10'>IU</td>
                             <td width='10'>(</td>
                             <td width='40'>首剂</td>
                             <td width='50'>
                                 <div class="under-line">
-                                    &nbsp;<span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_shouji }}</span>
+                                    &nbsp;<span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7">{{ prescription.anticoagulant_shouji }}</span>
                                 </div>
                             </td>
                             <td width='10'>IU</td>
                             <td width='40'>追加</td>
                             <td width='50'>
                                 <div class="under-line">
-                                    &nbsp;<span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_weichi }}</span>
+                                    &nbsp;<span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7">{{ prescription.anticoagulant_weichi }}</span>
                                 </div>
                             </td>
                             <td width='20'>IU/h</td>
@@ -626,7 +632,7 @@
                             <td width='40'>其他</td>
                             <td width='100'>
                                 <div class="under-line">&nbsp;
-                                    <span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 6">
+                                    <span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 3 && prescription.anticoagulant != 6 && prescription.anticoagulant != 7">
                                         {{ prescription.anticoagulant_name }}
                                     </span>
                                 </div>
@@ -649,14 +655,14 @@
                                     &nbsp;<span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_shouji }}</span>
                                 </div>
                             </td>
-                            <td width='10'>mg</td>
+                            <td width='10'>U</td>
                             <td width='40'>追加</td>
                             <td width='50'>
                                 <div class="under-line">
                                     &nbsp;<span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi }}</span>
                                 </div>
                             </td>
-                            <td width='20'>mg/h</td>
+                            <td width='20'>U/h</td>
                             <td width='40'>提前</td>
                             <td width='50'>
                                 <div class="under-line">
@@ -682,15 +688,15 @@
                     <td width="20">钙</td>
                     <td width="180">
                       (
-                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="1.25"></label-box>
-                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="1.5"></label-box>
+                        <label-box :isChecked="false" showValue="1.25"></label-box>
+                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="1.5"></label-box>
                         <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('高钙') > -1 ? true : false" showValue="1.75"></label-box>
                       )
                     </td>
                     <td width='20'>mmol/L</td>
                     <td width="20">钾</td>
 
-                    <td width="150">
+                    <td width="160">
                       (
                         <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="2.0"></label-box>
                         <label-box :isChecked="false" showValue="3.0mmol/L"></label-box>
@@ -728,7 +734,7 @@
                     <td width='50'>
                         <div class="under-line">
                             &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('肝素')>-1">
-                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
+                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^\d.]/g,"") : '' }}
                             </span>
                         </div>
                     </td>
@@ -741,7 +747,7 @@
                     <td width='50'>
                         <div class="under-line">
                             &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('+NS')>-1">
-                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDisposetwo(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
+                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDisposetwo(afterdialysis.sealing_fluid_dispose).replace(/[^\d.]/g,"") : '' }}
                             </span>
                         </div>
                     </td>
@@ -850,10 +856,10 @@
         </tr>
       </table>
 
-      <table class="print-table" border="1">
+      <table class="print-table" border="1" v-if="monitors.length <= 8">
         <tbody>
           <tr>
-            <td :rowspan="jilurow+4" width="30px" class="title-box">
+            <td :rowspan="monitors.length + 1" width="30px" class="title-box">
               透析治疗记录
             </td>
 
@@ -898,7 +904,7 @@
             </td>
 
             <td>
-              &nbsp;{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
+              &nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.arterial_pressure ? monitor.arterial_pressure : '0' }}</span>
             </td>
             <td>
               &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
@@ -906,7 +912,7 @@
             <td>
               &nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
             </td>
-            <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
+            <td>&nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "0" }}</span></td>
             <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
 
@@ -1049,7 +1055,7 @@
                     <td width='40'>其他</td>
                     <td width='160'>
                       <div class="under-line">
-                        &nbsp;{{ afterdialysis.complication ? getComplication(afterdialysis.complication) : '' }}
+                        &nbsp;{{ afterdialysis.other_complication ? afterdialysis.other_complication : '' }}
                       </div>
                     </td>
                     <td></td>
@@ -1106,6 +1112,189 @@
       </table>
 
     </div>
+    <div style="page-break-after: always;"></div>
+    <div class="dialysis-print-order"  v-if="monitors.length > 8">
+      <div class="order-yy-name" style="font-size:28px;font-weight:bold;">{{ orgname }}</div>
+      <div class="order-title">血液净化治疗记录单</div>
+      <table class="table-box">
+        <tbody>
+          <tr>
+            <td width="50">姓 名:</td>
+            <td width="90">
+              <div class="under-line">&nbsp;{{ patientInfo.name }}</div>
+            </td>
+            <td width="30"></td>
+            <td width="50">性 别:</td>
+            <td width="100">
+              <label-box :isChecked="patientInfo_gender_1" showValue="男" ></label-box>&nbsp;
+              <label-box :isChecked="patientInfo_gender_2" showValue="女" ></label-box>
+            </td>
+            <td width="20"></td>
+
+            <td width="50">年 龄:</td>
+            <td width="50">
+              <div class="under-line">{{ getNewAge(patientInfo.id_card_no) }}</div>
+            </td>
+            <td width="20">岁</td>
+            <td width="20"></td>
+
+            <!-- <td width="40">诊 断:</td>
+            <td width="160">
+              <div class="under-line">&nbsp;{{ patientInfo.diagnose }}</div>
+            </td> -->
+            <td width="40">日 期:</td>
+            <td width="50">
+                <div class="under-line">{{ queryParams.xtdate.slice(0,4) }}</div>
+            </td>
+            <td width='10'>年</td>
+            <td width="50">
+                <div class="under-line">{{ queryParams.xtdate.slice(5,7) }}</div>
+            </td>
+            <td width='10'>月</td>
+            <td width="50">
+                <div class="under-line">{{ queryParams.xtdate.slice(8,11) }}</div>
+            </td>
+            <td width='10'>日</td>
+            <td width='30'></td>
+            <td width="20">第</td>
+            <td width="50">
+                <div class="under-line">2</div>
+            </td>
+            <td width="20">页</td>
+            <!-- <td width="60">住院号:</td>
+            <td width="80">
+              <div class="under-line">
+                &nbsp;{{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number : "" }}
+              </div>
+            </td> -->
+            <td width="20"></td>
+
+            <td></td>
+
+            
+          </tr>
+        </tbody>
+      </table>
+      <table class="table-box" style="margin-top: 10px;">
+        <tbody>
+          <tr>
+            <td width="70">透析次数:</td>
+            <td width="50">
+              <div class="under-line">&nbsp;{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+            </td>
+            <td width="30"></td>
+            <td width="40">诊 断:</td>
+            <td width="160">
+              <div class="under-line">&nbsp;{{ patientInfo.diagnose }}</div>
+            </td>
+            <td width="20"></td>
+
+            <td width="60">门诊号:</td>
+            <td width="80">
+              <div class="under-line">
+                &nbsp;{{ patientInfo.dialysis_no }}
+              </div>
+            </td>
+            <td width="20"></td>
+
+            
+            <td width="70">设备型号:</td>
+            <td width='100'>
+                <div class="under-line">&nbsp;
+                    {{ predialysis.machine_type ? predialysis.machine_type : '' }}
+                </div>
+            </td>
+            <td width='30'></td>
+            <td width="30">机位</td>
+            <td width="120">
+                <div class="under-line">&nbsp;{{ getNumber() }}</div>
+            </td>
+            <td width="20">号</td>
+
+            <td></td>
+
+            
+          </tr>
+        </tbody>
+      </table>
+      <table class="print-table" border="1">
+        <tbody>
+          <tr>
+            <td :rowspan="monitors.length + 1" width="30px" class="title-box">
+              透析治疗记录
+            </td>
+
+            <td style="line-height:20px;" width="50">时<br />间</td>
+            <td style="line-height:20px;" width="70">血<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="40">脉<br />搏<br /><span style="font-size:10px; !important">次/分</span></td>
+            <td style="line-height:20px;" width="50">血<br />流<br />量<br /><span style="font-size:10px; !important">ml/分</span></td>
+            <td style="line-height:20px;" width="50">动<br />脉<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="50">静<br />脉<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="50">跨<br />膜<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="40">超<br />滤<br />率<br /><span style="font-size:10px; !important">ml/h</span></td>
+            <td style="line-height:20px;" width="40">钠<br />浓<br />度<br /><span style="font-size:10px; !important">mmol/L</span></td>
+            <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
+            
+            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">ml</span></td>
+            <td style="line-height:20px;" width="">病情变化及处理</td>
+            <td style="line-height:20px;" width="60">签名</td>
+          </tr>
+
+          <tr v-for="monitor in monitors" :key="monitor.id">
+            <td style="height:40px;">
+              &nbsp;
+              <!-- <template>
+                <span v-if="monitor.monitoring_date">
+                    {{monitor.monitoring_date | parseTime('{y}-{m}-{d}')}}
+                </span>
+            </template>     -->
+              {{ getTime(monitor.operate_time, "{h}:{i}") }}
+            </td>
+            <td>
+              &nbsp;
+              <span v-if='monitor.operate_time'>
+              {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
+              {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+              </span>
+            </td>
+            <td>
+              &nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
+            </td>
+            <td>
+              &nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
+            </td>
+
+            <td>
+              &nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.arterial_pressure ? monitor.arterial_pressure : '0' }}</span>
+            </td>
+            <td>
+              &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
+            </td>
+            <td>
+              &nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
+            </td>
+            <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
+            <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
+            <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
+
+            <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '' }}</td>
+            <td style="text-align:left;line-height:20px;">
+              &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
+            </td>
+            <td>
+              <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+                {{ getAdminUser(monitor.monitoring_nurse) }}
+              </span>
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
+              </span>
+            </td>
+            
+            
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
 </template>
 
@@ -1283,6 +1472,7 @@ export default {
               newStr += item + ','
             }
           })
+          
           return newStr.substring(0, newStr.length - 1)
         }
       }
@@ -1363,6 +1553,27 @@ export default {
         if(arr[i] == "肝素10ml"){
           strname = "肝素10ml"
         }
+        if(arr[i] == "肝素1.1ml"){
+          strname = "肝素1.1ml"
+        }
+        if(arr[i] == "肝素1.2ml"){
+          strname = "肝素1.2ml"
+        }
+       if(arr[i] == "肝素1.3ml"){
+          strname = "肝素1.3ml"
+        }
+        if(arr[i] == "肝素1.4ml"){
+          strname = "肝素1.4ml"
+        }
+       if(arr[i] == "肝素1.5ml"){
+          strname = "肝素1.5ml"
+        }
+       if(arr[i] == "肝素1.6ml"){
+          strname = "肝素1.6ml"
+        }
+       if(arr[i] == "肝素1.7ml"){
+          strname = "肝素1.7ml"
+        }
       }
       return strname
     },
@@ -1380,6 +1591,27 @@ export default {
         if(arr[i] == "+NS10ml"){
           strname = "+NS10ml"
         }
+        if(arr[i] == "+NS1.1ml"){
+          strname = "+NS1.1ml"
+        }
+        if(arr[i] == "+NS1.2ml"){
+          strname = "+NS1.2ml"
+        }
+       if(arr[i] == "+NS1.3ml"){
+          strname = "+NS1.3ml"
+        }
+       if(arr[i] == "+NS1.4ml"){
+          strname = "+NS1.4ml"
+        }
+       if(arr[i] == "+NS1.5ml"){
+          strname = "+NS1.5ml"
+        }
+       if(arr[i] == "+NS1.6ml"){
+          strname = "+NS1.6ml"
+        }
+      if(arr[i] == "+NS1.7ml"){
+          strname = "+NS1.7ml"
+        }
       }
       return strname
     },

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -419,6 +419,56 @@
                   </tr>
                 </tbody>
               </table>
+
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="70"></td>
+                    <td width="40">血栓:</td>
+                    <td width="90">
+                      <div>
+                        <label-box :isChecked="predialysis.thromubus_type == 1?true:false" showValue="有"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.thromubus_type == 2?true:false" showValue="无"></label-box>
+                        &nbsp;
+                      </div>
+                    </td>
+                    <td width="10">（</td>
+                    <td width="90">导管AV端各约</td>
+                    <td width="50">
+                      <div class="under-line">
+                        &nbsp;
+                        <span>
+                            {{ predialysis.thrombus_av ? predialysis.thrombus_av : '' }}
+                        </span>
+                      </div>
+                    </td>
+                    <td width="10">cm</td>
+                    <td width="50">A端约</td>
+                     <td width="50">
+                      <div class="under-line">
+                        &nbsp;
+                        <span>
+                            {{ predialysis.thromubus_a ? predialysis.thromubus_a : '' }}
+                        </span>
+                      </div>
+                    </td>
+                    <td width="10">cm</td>
+                    <td width="50">V端约</td>
+                     <td width="50">
+                      <div class="under-line">
+                        &nbsp;
+                        <span>
+                            {{ predialysis.thromubus_v ? predialysis.thromubus_v : '' }}
+                        </span>
+                      </div>
+                    </td>
+                    <td width="10">cm</td>
+                    <td width="10">）</td>
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
               <table >
                 <tbody>
                   <tr class="table-box">
@@ -611,12 +661,18 @@
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}</div>
                     </td>
-                    <td width="10">ml,</td>
+                    <td width="15">
+                      <span v-if="prescription.anticoagulant =='阿加曲班'">ml,</span>
+                      <span v-if="prescription.anticoagulant =='普通肝素'">iu,</span>
+                     </td>
                     <td width="60">追加量</td>
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}</div>
                     </td>
-                    <td width="10">ml</td>
+                    <td width="10">
+                      <span v-if="prescription.anticoagulant =='阿加曲班'">ml</span>
+                      <span v-if="prescription.anticoagulant =='普通肝素'">iu/h</span>
+                    </td>
                     <td width="10">）</td>
                     <td width="100">
                         <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -789,7 +789,9 @@
               <div>
                 <span style="width:70px;display:inline-block">
                   {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
-                </span>ml
+                </span>
+
+                <span>L</span>
               </div>
             </td>
             <td width="100" style="border:none;border-left:1px solid #000;padding-left:5px">

src/xt_pages/index/verify_token.vue

@@ -11,18 +11,19 @@ export default {
     this.$store.dispatch('VerifyToken', this.$route.query.token).then(() => {
       this.$store.dispatch('xt_GenerateRoutes', this.$store.getters.current_role_urls).then(() => {
         this.$store.dispatch('VerifyConfigList').then(() => {
-          // alert('token 验证成功')
-          // console.log(this.$store.getters.xt_permission.addRouters)
-          this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
-  //          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-          if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
-            this.$router.replace({ path: '/dialysis/dialysisrecord' })
+          
+            // alert('token 验证成功')
+            // console.log(this.$store.getters.xt_permission.addRouters)
+            this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
+    //          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
+              this.$router.replace({ path: '/dialysis/dialysisrecord' })
 
-          }else{
-            this.$router.replace({ path: '/home' })
+            }else{
+              this.$router.replace({ path: '/home' })
 
 
-          }
+            }
 
         })
       })

src/xt_pages/management/components/PlanForm.vue

@@ -183,7 +183,8 @@ export default {
         { id: 1, name: "0.22%季铵盐" },
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 4, name: "1500mg/l含氯消毒剂" },
+        { id: 5,  name:"消毒湿巾"}
       ],
       // 夜路消毒方式
       sterilizeType: [

src/xt_pages/management/home.vue

@@ -2329,7 +2329,8 @@ export default {
           { id: 1, name: '0.22%季铵盐' },
           { id: 2, name: '500mg/l含氯消毒剂' },
           { id: 3, name: '1000mg/l含氯消毒剂' },
-          { id: 4, name: '1500mg/l含氯消毒剂' }
+          { id: 4, name: '1500mg/l含氯消毒剂' },
+          { id: 5,  name:  "消毒湿巾"}
         ],
         // 夜路消毒方式
         sterilizeType: [
@@ -3212,6 +3213,9 @@ export default {
               if (plan[index].machine_disinfectant === 4) {
                 plan[index].machine_disinfectant = '1500mg/l含氯消毒剂'
               }
+              if(plan[index].machine_disinfectant === 5){
+                 plan[index].machine_disinfectant = "消毒湿巾"
+              }
 
               if (plan[index].disinfectan_way === 0) {
                 plan[index].disinfectan_way = '/'
@@ -3346,6 +3350,9 @@ export default {
               if (plandetail[index].machine_disinfectant === 4) {
                 plandetail[index].machine_disinfectant = '1500mg/l含氯消毒剂'
               }
+              if(plandetail[index].machine_disinfectant === 5){
+                  plandetail[index].machine_disinfectant = "消毒湿巾"
+              }
 
               if (plandetail[index].disinfectan_way === 0) {
                 plandetail[index].disinfectan_way = '/'

src/xt_pages/medicalScheduling/index.vue

@@ -7,6 +7,7 @@
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
+                <el-button type="primary" icon="el-icon-printer" @click="exportList">导出</el-button>
             </div>
         </div>
         <div class="app-container">
@@ -312,19 +313,32 @@
                             </el-table>
                         </el-tab-pane>
                     </el-tabs>
-                    <!-- <div style="margin-top:20px;">
-                        <p style="line-height:20px;">1.默认科室所有排序在职员工账号</p>
-                        <p style="line-height:20px;">2.护士默认排序，按加入机构先后降序排序，最先加入机构的排序为1，显示在列表最下面，自定义排序，最大的序号排在最上面</p>
-                        <p style="line-height:20px;">3.职称显示与管理中旬的员工列表显示的职称一样</p>
-                        <p style="line-height:20px;">4.是否排班，默认机构所有用户是“是”，如果是否，则该用户不在医护排班列表中</p>
-                    </div> -->
+                 
                 </div>
-                <!-- <div slot="footer" class="dialog-footer">
-                <el-button @click="hide">取 消</el-button>
-                <el-button type="primary" @click="submitAction()">保 存</el-button>
-                </div> -->
-            </el-dialog>
+            </el-dialog>    
         </div>
+
+
+        <!-- <el-dialog
+            title="导出排班"
+            :visible.sync="exportDialogVisible"
+            width="30%">
+            <span>
+             <div class="block">
+               <span class="demonstration">月份：</span>
+               <el-date-picker
+                v-model="value1"
+                type="week"
+                format="yyyy 第 WW 周"
+                placeholder="选择周">
+             </el-date-picker>
+             </div>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="exportList">确 定</el-button>
+            </span>
+        </el-dialog>     -->
     </div>
 </template>
 
@@ -390,18 +404,21 @@ export default {
            arrFive:[],
            arrSix:[],
            arrSeven:[],
-
-           //
-            nurseVisible:false,
-            activeName:'nurse',
-            radio:'1',
-            nurseTableData:[],
-            doctorTableData:[],
+           nurseVisible:false,
+           activeName:'nurse',
+           radio:'1',
+           nurseTableData:[],
+           doctorTableData:[],
+           exportDialogVisible:false,
+           month_time:""
         }
     },
     methods:{
         search(){},
-        toPrint(){
+        // toPrint(){
+        //   this.exportDialogVisible = true
+        // },
+         toPrint(){
             this.$router.push({
                 path: '/medicalScheduling/schedule/print?starttime='+this.getTimestamp(this.weekDayArr[0])+"&endtime="+this.getTimestamp(this.weekDayArr[6])+"&weekArr="+ this.weekDayArr+"&typeValue="+this.typeValue,
                 // query: { date: date }
@@ -935,9 +952,10 @@ export default {
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
+                    
                     this.tableData = data
 
-
+                   console.log("表哥3333333333",this.tableData)
                 }
             })
         },
@@ -1902,7 +1920,48 @@ export default {
               this.getDoctorList()
             }
          })
-       }
+       },
+
+       toExport(){
+         this.exportDialogVisible = true
+
+       },
+
+     getTimestamp(time) { //把时间日期转成时间戳
+          return (new Date(time)).getTime() / 1000
+       },
+       exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].monday  = this.getClass(this.tableData[i].user_name,1)
+           this.tableData[i].tuesday  = this.getClass(this.tableData[i].user_name,2)
+           this.tableData[i].wednesday = this.getClass(this.tableData[i].user_name,3)
+           this.tableData[i].thursday = this.getClass(this.tableData[i].user_name,4)
+           this.tableData[i].friday = this.getClass(this.tableData[i].user_name,5)
+           this.tableData[i].saturday = this.getClass(this.tableData[i].user_name,6)
+           this.tableData[i].weekday = this.getClass(this.tableData[i].user_name,0)
+         }
+         console.log("this.table",this.tableData)
+         const tHeader = ['医护姓名', '周一'+"("+this.weekDayArr[0]+")" ,  '周二'+"("+this.weekDayArr[1]+")", '周三'+"("+this.weekDayArr[2]+")" , '周四'+"("+this.weekDayArr[3]+")" ,  '周五'+"("+this.weekDayArr[4]+")" ,  '周六'+"("+this.weekDayArr[5]+")",'周日'+"("+this.weekDayArr[6]+")"]
+         const filterVal = ['user_name', 'monday', 'tuesday','wednesday','thursday','friday','saturday','weekday'] 
+         
+         const data = this.formatJson(filterVal,this.tableData)
+         console.log("data",data)
+       
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '医护排班'
+         })
+          this.downloadLoading = false
+    
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+    
+    
     },
     created(){
         //获取医护人员
@@ -1940,8 +1999,8 @@ export default {
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
-
-
+     
+   
     }
 }
 </script>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -0,0 +1,481 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+      >打印
+      </el-button
+      >
+    </template>
+
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getHisOrderDetailCollect } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  import printOne from './allListTemplate/printOne'
+
+  export default {
+    name: 'allListPrint',
+    components: {
+      printOne
+    },
+    props: {
+      paramsObj: Object
+    },
+    data() {
+      return {
+        list: [],
+        patient: {},
+        order: {},
+        admin: {}
+      }
+    },
+
+    created() {
+      this.getInfo(this.paramsObj.id)
+
+    },
+    methods: {
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+      }, getInfo(order_id) {
+        let params = {
+          id: order_id
+        }
+        getHisOrderDetailCollect(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.order = response.data.data.order
+            this.patient = response.data.data.patient
+            this.admin = response.data.data.admin_info
+            var order_info = response.data.data.order_info
+
+            //获取所有项目类型进行去重
+            let med_chrgitm_types = []
+            for (let i = 0; i < order_info.length; i++) {
+              med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+            }
+            const obj = {}
+            med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+              obj[next] ? '' : obj[next] = true && cur.push(next)
+              return cur
+            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+            let tempOrderInfo = []
+
+            for (let i = 0; i < med_chrgitm_types.length; i++) {
+              let obj = {
+                total: 0,
+                details: []
+              }
+              let tempDetails = []
+              for (let b = 0; b < order_info.length; b++) {
+                if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                  tempDetails.push(order_info[b])
+                }
+              }
+
+              obj.details = this.setNewData(tempDetails)
+              obj.total = this.getTotal(obj.details)
+
+              obj.details.push({
+                total: obj.total,
+                is_total: 1,
+              })
+              this.list =  this.list.concat(obj.details)
+            }
+
+
+
+
+          }
+        })
+      }, getTotal:function(items){
+        let total = 0
+        for(let i = 0; i < items.length; i++){
+          total = Number(total) + Number((parseFloat(items[i].count) * parseFloat(items[i].price)).toFixed(2))
+        }
+        return total.toFixed(2)
+      },setNewData(details) {
+        let drug_ids = []
+        let project_ids = []
+
+        for (let i = 0; i < details.length; i++) {
+          if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
+            let obj = {
+              id: details[i].advice.drug_id,
+              price: details[i].advice.price
+            }
+            drug_ids.push(obj)
+          } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
+            let obj = {
+              id: details[i].project.project_id,
+              price: details[i].project.price
+
+            }
+            project_ids.push(obj)
+
+          }
+
+        }
+        //
+        // console.log('old ids')
+        // console.log(drug_ids)
+        // console.log(project_ids)
+        // console.log('old ids')
+
+        let new_drug_ids = this.unique(drug_ids)
+        let new_project_ids = this.unique(project_ids)
+        let list = []
+
+        console.log('ids')
+        console.log(new_drug_ids)
+        console.log(new_project_ids)
+        console.log('ids')
+
+        if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
+          for (let i = 0; i < new_drug_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
+                obj['name'] = details[a].advice.advice_name
+                obj['spec'] = details[a].advice.drug.drug_spec
+                obj['unit'] = details[a].advice.drug.max_unit
+
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
+          for (let i = 0; i < new_project_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
+                obj['name'] = details[a].project.project.project_name
+                obj['spec'] = '1'
+                obj['unit'] = details[a].project.project.unit
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        return list
+
+      }, unique(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      },
+
+      getType(med_chrgitm_type) {
+        switch (med_chrgitm_type) {
+          case '01':
+            return '床位费'
+            break
+          case '02':
+            return '诊察费'
+
+            break
+          case '03':
+            return '检查费'
+
+            break
+          case '04':
+            return '化验费'
+            break
+          case '05':
+            return '治疗费'
+
+            break
+          case '06':
+            return '手术费'
+
+            break
+          case '07':
+            return '护理费'
+
+            break
+          case '08':
+            return '材料费'
+
+            break
+          case '09':
+            return '西药费'
+
+            break
+          case '10':
+            return '中药饮片费'
+
+            break
+          case '11':
+            return '中成药费'
+
+            break
+          case '12':
+            return '一般诊疗费'
+
+            break
+          case '13':
+            return '挂号费'
+
+            break
+          case '14':
+            return '其他费'
+
+            break
+
+        }
+
+      },
+      printThisPage() {
+
+        const style =
+          '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+        printJS({
+          printable: 'allList-print',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+
+        // if (this.org_template_info.template_id == 1) {
+        //   printJS({
+        //     printable: "dialysis-print-box",
+        //     type: "html",
+        //     style: style,
+        //     scanStyles: false
+        //   });
+        // }
+      }
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto;
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
+
+  .dialysis-print-order .table-box {
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 30px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+
+  .table-box1 {
+    border: 1px solid #000;
+    width: 100%;
+    line-height: 30px;
+    font-size: 14px;
+    border-collapse: collapse;
+  }
+
+  .table-box1 tr {
+    border-bottom: 1px solid #000;
+  }
+</style>
+
+<style lang="scss">
+
+  .newContainer {
+
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+
+  .el-date-editor {
+
+  .el-input__inner {
+    padding-right: 0px;
+  }
+
+  }
+  .el-table td, .el-table th {
+    text-align: center;
+  }
+
+  }
+  .newContainer::-webkit-scrollbar {
+    height: 15px !important;
+  }
+</style>

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -0,0 +1,174 @@
+<template>
+    <div id="allList-print" class="allList-print">
+        <div v-for='(i,index) in pageArr.length' :key="index">
+            <div class="allListTitle">{{$store.getters.xt_user.org.org_name}}费用汇总</div>
+            <div class="allListInfo">
+            <div>患者姓名：{{patient.name}}</div>
+            <div>透析号：{{patient.dialysis_no}}</div>
+            <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
+            <div>年龄：{{patient.age}}  岁</div>
+            <div>日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
+
+            </div>
+            <table class="allListTable" border="1">
+                <tr>
+                    <td style="width:10%">类别</td>
+                    <td style="width:50%">项目名称</td>
+                    <td style="width:10%">规格</td>
+                    <td style="width:10%">单价(元)</td>
+                    <td style="width:10%">数量</td>
+                    <td style="width:10%">金额(元)</td>
+                </tr>
+                <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
+                    <tr v-if="item.is_total == 2">
+                        <td style="width:10%">{{item.med_chrgitm_type}}</td>
+                        <td style="width:50%">{{item.name}}</td>
+                        <td style="width:10%">{{item.spec}}</td>
+                        <td style="width:10%">{{(item.price).toFixed(2)}}</td>
+                        <td style="width:10%">{{item.count}}{{item.unit}}</td>
+                        <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
+                    </tr>
+                    <tr>
+                        <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{item.total}}元</td>
+                    </tr>
+                </template>
+            </table>
+            <div class="tableBottom">
+            <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
+            <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
+            <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    props: {
+      list: {
+        type: Array,
+        default: function () {
+          return [];
+        }
+      }, patient: {
+        type: Object,
+        default: function () {
+          return {};
+        }
+      }, order: {
+        type: Object,
+        default: function () {
+          return {};
+        }
+      }, admin: {
+        type: Object,
+        default: function () {
+          return {};
+        }
+      },
+    },
+    data(){
+        return{
+            page:1,
+            pageArr:[],
+        }
+    },
+    methods:{
+      getNowTime: function () {
+        let dateTime
+        let yy = new Date().getFullYear()
+        let mm = new Date().getMonth() + 1
+        let dd = new Date().getDate()
+        let hh = new Date().getHours()
+        let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+          :
+          new Date().getMinutes()
+        let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+          :
+          new Date().getSeconds()
+        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+        return dateTime
+      },
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
+      },getTotal:function(items){
+        let total = 0
+        for(let i = 0; i < items.length; i++){
+          total = total + (items[i].count * items[i].price).toFixed(2)
+        }
+        return total
+
+      },
+      getPage(){
+        if(this.list.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.list.length)
+        }else if(this.list.length > 13){
+            this.page = parseInt(this.list.length / 13)
+            let num = this.list.length % 13
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
+        }
+      }
+
+    },
+    watch:{
+        list: {
+            handler(newVal) {
+                this.getPage()
+            },
+            deep: true
+        }
+    }
+  }
+
+
+</script>
+
+<style lang="scss" scoped>
+.allList-print{
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
+.allListTitle{
+    font-size: 24px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+.allListInfo{
+    display: flex;
+    font-size: 16px;
+    justify-content: space-between;
+    margin: 10px 0;
+}
+.allListTable{
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+    text-align: left;
+}
+.allListTable tr td {
+    padding: 0 5px;
+}
+.tableBottom{
+    font-size: 16px;
+    display: flex;
+    margin-top: 20px;
+}
+.tableBottomOne{
+    margin-right: 40px;
+}
+</style>

src/xt_pages/outpatientCharges/components/chargeMonthPrescriptionTable.vue

@@ -0,0 +1,208 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称">
+        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+          <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="频率">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_frequency}}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">{{scope.row.day}}天</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="100" label="总量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+          <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="60" label="单价">
+        <template slot-scope="scope">
+          <div> {{scope.row.retail_price}}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          {{scope.row.delivery_way}}
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          {{scope.row.execution_frequency}}
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+          {{scope.row.number_days}}天
+
+        </template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="50" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+            {{scope.row.total}}
+
+            <div>{{scope.row.unit}}</div>
+
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          {{scope.row.price}}元
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          {{scope.row.remark}}
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+        次
+        <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getInitData } from '@/api/his/his'
+  import { getDictionaryDataConfig} from "@/utils/data";
+
+  export default {
+    props: {
+      prescription: Object
+    },
+    data() {
+      return {
+        drugways: [],
+        efs: []
+      }
+    }, mounted() {
+      getInitData().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.drugways = response.data.data.drugways
+          this.efs = response.data.data.efs
+        }
+      })
+    }, methods:  {
+
+
+      getGroup(id){
+        var name = ""
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        console.log("2235",statistics_category)
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable{
+  .additionalBox{
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+  .additionalOne{
+    margin-right:20px;
+    margin-bottom:10px;
+    display: flex;
+    align-items: center;
+  >span{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width:80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+  }
+  .deleteIcon{
+    color:red;
+    margin-left:5px;
+  }
+  }
+  .el-table th .cell, .el-table td .cell{
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+  .el-icon-delete{
+    color:red;
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/components/dayPrescriptionTable.vue

@@ -0,0 +1,425 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="drug_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
+            <div>{{scope.row.single_dose_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in drugways"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+            <el-option
+              v-for="item,index in efs"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.day" placeholder=""></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
+            <div> {{scope.row.prescribing_number_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="remark" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" width="40" prop="name" label="操作">
+        <template slot-scope="scope">
+          <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
+          <div>{{scope.row.unit}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+        <template slot-scope="scope">
+          <el-autocomplete
+            style="width:100%;"
+            class="inline-input"
+            v-model="scope.row.delivery_way"
+            :fetch-suggestions="querySearch2"
+            placeholder="请输入内容"
+          ></el-autocomplete>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.number_days" placeholder=""></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="70" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>
+            <div>{{scope.row.unit}}</div>
+
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" width="40" prop="name" label="操作">
+        <template slot-scope="scope">
+          <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+        次
+        <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getDictionaryDataConfig} from "@/utils/data";
+  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
+
+  export default {
+    props: {
+      preDrugs: Array,
+      activeType: Number,
+      addtions_charge:Array,
+      prescription:{
+        type:Object,
+        default: function () {
+          return {
+            name:"",
+            advices:[],
+            project:[],
+            drugways:[],
+            efs:[],
+          };
+        }
+      },
+    },
+    data() {
+      return {
+        advices:[],
+        tableData: [],
+        newoptions: [{
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }],
+        value: '1',
+        input: 1,
+      }
+    },
+    methods:{
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      querySearch2(queryString, cb) {
+        var restaurants = this.getDictionaryDataConfig("system","project_use")
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      delAddition(index, addition){
+        if(this.prescription.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          this.$nextTick(function(){
+            if(addition.id == 0){
+              this.prescription.addition.splice(index, 1)
+            }else{
+              let params = {
+                'id': addition.id,
+              }
+              delHisAddition(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.addition)
+                  temp2.splice(index, 1)
+                  this.prescription.addition = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+            }
+          });
+
+        })
+          .catch(() => {});
+
+      },
+      getInitData(){
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+          }
+        })
+
+      },deleteDrug:function(index, row){
+        if(this.prescription.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          this.$nextTick(function(){
+            if(row.advice_id == 0){
+              this.prescription.advices.splice(index, 1)
+            }else{
+              let params = {
+                'id': row.advice_id,
+              }
+              delHisAdvice(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.advices)
+                  temp2.splice(index, 1)
+                  this.prescription.advices = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+
+
+            }
+
+          });
+
+
+        })
+          .catch(() => {});
+
+
+
+
+
+      },deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+
+      setNewData:function(data){
+        this.prescription = data
+
+        // this.prescription.advices = data.advices
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getGroup(id){
+        var name = ""
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        console.log("2235",statistics_category)
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+      deleteProject(row,i){
+        if(this.prescription.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          if(row.id == 0){
+            this.prescription.project.splice(i, 1)
+
+          }else{
+            let params = {
+              'id': row.id,
+            }
+            delHisProject(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                for (let i = 0; i < this.prescription.project.length; i++){
+                  if(this.prescription.project[i].id == row.id){
+                    this.prescription.project.splice(i, 1)
+                  }
+                }
+                this.$message.success(response.data.data.msg)
+              }
+            })
+          }
+        })
+          .catch(() => {});
+
+      },
+    },mounted(){
+      this.getInitData()
+    },
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable {
+
+  .el-input__inner {
+    padding: 0 5px;
+  }
+
+  .additionalBox {
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+
+  .additionalOne {
+    margin-right: 20px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+
+  > span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+
+  .deleteIcon {
+    color: red;
+    margin-left: 5px;
+  }
+
+  }
+  .el-table th .cell, .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+
+  .el-icon-delete {
+    color: red;
+  }
+
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/components/monthPrescriptionTable.vue

@@ -0,0 +1,297 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="drug_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
+            <div>{{scope.row.single_dose_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+            <el-option
+              readonly
+              v-for="(item,index) in drugways"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+            <el-option
+              readonly
+              v-for="item,index in efs"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>
+            <div> {{scope.row.prescribing_number_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="remark" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+          <div>{{scope.row.unit}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+        <template slot-scope="scope">
+          <el-autocomplete
+            readonly
+            style="width:100%;"
+            class="inline-input"
+            v-model="scope.row.delivery_way"
+            :fetch-suggestions="querySearch2"
+            placeholder="请输入内容"
+          ></el-autocomplete>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="70" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.total" style="width:60%" placeholder="" readonly></el-input>
+            <div>{{scope.row.unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" readonly></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+        次
+        <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getDictionaryDataConfig} from "@/utils/data";
+  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
+
+  export default {
+    props: {
+      preDrugs: Array,
+      activeType: Number,
+      addtions_charge:Array,
+      prescription:{
+        type:Object,
+        default: function () {
+          return {
+            name:"",
+            advices:[],
+            project:[],
+            drugways:[],
+            efs:[],
+          };
+        }
+      },
+    },
+    data() {
+      return {
+        advices:[],
+        tableData: [],
+        newoptions: [{
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }],
+        value: '1',
+        input: 1,
+      }
+    },
+    methods:{
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      querySearch2(queryString, cb) {
+        var restaurants = this.getDictionaryDataConfig("system","project_use")
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      getInitData(){
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+          }
+        })
+      },
+      deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+      setNewData:function(data){
+        this.prescription = data
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getGroup(id){
+        var name = ""
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+    },mounted(){
+      this.getInitData()
+    },
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable {
+
+  .el-input__inner {
+    padding: 0 5px;
+  }
+
+  .additionalBox {
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+
+  .additionalOne {
+    margin-right: 20px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+
+  > span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+
+  .deleteIcon {
+    color: red;
+    margin-left: 5px;
+  }
+
+  }
+  .el-table th .cell, .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+
+  .el-icon-delete {
+    color: red;
+  }
+
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -30,7 +30,7 @@
       </el-table-column>
 
       <el-table-column align="center" prop="day" width="50" label="天数">
-        <template slot-scope="scope">{{scope.row.day}}</template>
+        <template slot-scope="scope">{{scope.row.day}}天</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
@@ -41,7 +41,7 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="单价">
         <template slot-scope="scope">
-          <div> {{scope.row.retail_price}}</div>
+          <div> {{scope.row.retail_price}}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
@@ -64,7 +64,8 @@
         <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-        <template slot-scope="scope">{{scope.row.single_dose}}</template>
+        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
+
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
@@ -83,9 +84,10 @@
       <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-          {{scope.row.number_days}}
+          {{scope.row.number_days}}天
 
         </template>
+
       </el-table-column>
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
@@ -101,7 +103,7 @@
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          {{scope.row.price}}
+          {{scope.row.price}}元
 
         </template>
       </el-table-column>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -1,10 +1,25 @@
 <template>
-  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
+             :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
-    <el-form :model="form"  :rules="rules"  ref="formValue"  label-width="100px">
-      <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
-         <el-input  v-model="form.name" :disabled="true"></el-input>
+    <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
+      <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="form.name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="false"
+          placeholder="请输入病人名字"
+          @select="handleSelect"
+          style="width:160px;"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+        </el-autocomplete>
       </el-form-item>
 
       <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
@@ -16,6 +31,8 @@
             :value="item.value">
           </el-option>
         </el-select>
+
+
       </el-form-item>
 
       <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
@@ -24,7 +41,8 @@
 
 
       <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期" style="width:100%;"></el-date-picker>
+        <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
       </el-form-item>
 
       <el-form-item label="手机号码：" prop="phone">
@@ -44,8 +62,8 @@
       </el-form-item>
 
 
-      <el-form-item label="证件类型：">
-        <el-select v-model="form.certificates" placeholder="请选择"  style="width:100%;">
+      <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+        <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in certificates"
             :key="item.value"
@@ -55,10 +73,43 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="证件号码：" prop="id_card"  :validate-event="is_Name">
+      <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
         <el-input v-model="form.id_card"></el-input>
       </el-form-item>
 
+      <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
+        <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
+                   >
+          <el-option
+            v-for="(item,index) in registers"
+            :key="index"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+        <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
+          <el-option
+            v-for="(item,index) in sick"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+        <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
+          <el-option
+            v-for="(item,index) in diagnoses"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
 
       <el-form-item label="结算类型：">
         <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
@@ -82,14 +133,30 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+
+      <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+        <el-select v-model="form.id_card_type" placeholder="请选择">
+          <el-option
+            v-for="item in IDCardTypes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item class="specialFormItem" label="医保卡号：">
         <div style="display:flex;">
           <el-input v-model="form.medical_insurance_card"></el-input>
+          <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+
         </div>
       </el-form-item>
 
-      <el-form-item label="挂号类型："  prop="register_type"  :validate-event="is_Name">
-        <el-select v-model="form.register_type"  placeholder="请选择" style="width:100%;">
+      <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+        <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
             :key="item.value"
@@ -107,49 +174,79 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-    <el-button  @click="cancel('formValue')">取 消</el-button>
-    <el-button  type="primary" @click="confirm('formValue')">挂 号</el-button>
+    <el-button @click="cancel('formValue')">取 消</el-button>
+    <el-button type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
   </el-dialog>
 
 </template>
 
 <script>
-  import { getDictionaryDataConfig } from '@/utils/data'
+  import {uParseTime} from "@/utils/tools";
+  import axios from 'axios'
+  import {PostSearch} from '@/api/patient'
+
+  import {getDictionaryDataConfig} from '@/utils/data'
+
   export default {
+
     name: 'registerDialog',
 
     data() {
 
       return {
-        form:{
+        registers: [
+          {value: 11, label: "普通门诊"},
+          {value: 12, label: '门诊挂号'},
+          {value: 13, label: "急诊"},
+          {value: 14, label: "门诊特殊病"},
+          {value: 15, label: "门诊统筹"},
+          {value: 16, label: "门诊慢性病"},
+          {value: 21, label: "普通住院"},
+
+        ],
+        form: {
+          id: '',
           settlement_value: '',
-          medical_insurance_card:'',
-          name:'',
-          gender:'',
-          certificates:'',
-          medical_care:'',
-          birthday:'',
-          age:'',
-          id_card:'',
-          register:'',
-          doctor:'',
-          department:'',
-          registration_fee:'',
-          medical_expenses:'',
-          cost:'',
-          phone:'',
-          social_type:'',
-        },
+          medical_insurance_card: '',
+          name: '',
+          gender: '',
+          certificates: 1,
+          p_type:'',
+          sick_type:'',
+          diagnosis:'',
+          medical_care: '',
+          birthday: '',
+          age: '',
+          id_card: '',
+          register: '',
+          doctor: '',
+          id_card_type: 1,
+          department: '',
+          registration_fee: '',
+          medical_expenses: '',
+          cost: '',
+          phone: '',
+          social_type: '',
+        }, IDCardTypes: [{
+          value: 1,
+          label: '社保卡'
+        }, {
+          value: 2,
+          label: "身份证"
+        }, {
+          value: 3,
+          label: "电子凭证"
+        },],
         settlement: [
-            {value: 1,label: '医保'},
-            {value: 2,label: '自费'},
-            {value: 3,label:'公费'},
-            {value: 4,label:'农保'},
-            {value: 5,label:'会员'},
-            {value: 6,label:'职工'},
-            {value: 7,label:'合同'}
-          ],
+          {value: 1, label: '医保'},
+          {value: 2, label: '自费'},
+          {value: 3, label: '公费'},
+          {value: 4, label: '农保'},
+          {value: 5, label: '会员'},
+          {value: 6, label: '职工'},
+          {value: 7, label: '合同'}
+        ],
         sex: [{
           value: 1,
           label: '男'
@@ -163,16 +260,16 @@
         }, {
           value: 2,
           label: "社保卡"
-        },{
+        }, {
           value: 3,
           label: "护照"
-        },{
+        }, {
           value: 4,
           label: "军官证"
-        },{
+        }, {
           value: 5,
           label: "台胞证"
-        },{
+        }, {
           value: 6,
           label: "港澳地区身份证"
         }],
@@ -182,16 +279,16 @@
         }, {
           value: 2,
           label: "公务员医疗补助"
-        },{
+        }, {
           value: 3,
           label: "大额医疗费用补助"
-        },{
+        }, {
           value: 4,
           label: "离休人员医疗"
-        },{
+        }, {
           value: 5,
           label: "城乡居民基本医疗保险"
-        },{
+        }, {
           value: 6,
           label: "城乡居民大病医疗保险"
         },
@@ -205,25 +302,32 @@
         }, {
           value: 2,
           label: "主治"
-        },{
+        }, {
           value: 3,
           label: "主任"
-        },{
+        }, {
           value: 4,
           label: "免收诊金"
-        },{
+        }, {
           value: 5,
           label: "专家"
         }],
         rules: {
-          name:[{ required:true,message:"患者姓名不能为空",trigger: 'blur'}],
-          gender:[{ required:true,message:"患者性别不能为空",trigger: 'blur'}],
-          id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur'  }],
-          register_type: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
-          doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
-          department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
-          age:[{ required:true,message:"患者年龄不能为空",trigger: 'blur'}],
-          birthday:[{required:true,message:"患者出生日期不能为空",trigger:'blur'}]
+          name: [{required: true, message: "患者姓名不能为空", trigger: 'blur'}],
+          gender: [{required: true, message: "患者性别不能为空", trigger: 'blur'}],
+          id_card: [{required: true, message: '证件号码不能为空', trigger: 'blur'}],
+          register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
+          doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
+          department: [{required: true, message: '请填写科室', trigger: 'blur'}],
+          age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],
+          birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
+          certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
+          id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
+
+          p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
+          sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
+          diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
+
         },
 
         visibility: false,
@@ -232,22 +336,23 @@
 
         resetForm: {
           settlement_value: '',
-          medical_insurance_card:'',
-          name:'',
-          gender:'',
-          certificates:'',
-          medical_care:'',
-          birthday:'',
-          age:'',
-          id_card:'',
-          register:'',
-          doctor:'',
-          department:'',
-          registration_fee:'',
-          medical_expenses:'',
-          cost:'',
-          phone:'',
-          social_type:'',
+          medical_insurance_card: '',
+          name: '',
+          gender: '',
+          certificates: '',
+          id_card_type: '',
+          medical_care: '',
+          birthday: '',
+          age: '',
+          id_card: '',
+          register: '',
+          doctor: '',
+          department: '',
+          registration_fee: '',
+          medical_expenses: '',
+          cost: '',
+          phone: '',
+          social_type: '',
         },
 
       }
@@ -270,44 +375,121 @@
         type: Number,
         default: 1
 
-      }
+      },
+      sick: Array,
+      diagnoses: Array,
     },
     methods: {
-      getDictionaryDataConfig(module, filed_name) {
-        return getDictionaryDataConfig(module, filed_name)
+      handleSelect(val) {
+        this.form.id = val.id
+        this.form.name = val.name
+        this.form.gender = val.gender
+        this.form.age = val.age
+        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
+        this.form.phone = val.phone
+        this.form.id_card = val.id_card_no
       },
-      show: function(patientInfo) {
-        this.form.name = patientInfo.name
-        this.form.gender = patientInfo.gender
-        this.form.age = patientInfo.age
-        this.form.birthday = patientInfo.birthday
-        this.form.phone = patientInfo.phone
-        this.form.birthday = patientInfo.birthday
-        this.form.id_card = patientInfo.id_card_no
-        this.form.social_type = patientInfo.health_care_type
-        if( this.form.social_type == 0){
-          this.form.social_type = ""
+      querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+      reading(medicalInsuranceCard) {
+        var that = this
+        if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
+          this.$message.error("请先选择读卡类型")
+          return
+        }
+        let params = {
+          'id_card_type': this.form.id_card_type,
+          'admin_user_id':this.$store.getters.xt_user.user.id,
 
         }
+        axios.get('http://127.0.0.1:9532/api/sscard', {
+          params: params
+        })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              var patient = response.data.data.patient
+
+              if (that.form.id_card_type == 1) {
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
+                that.form.medicalInsuranceCard = response.data.data.number
+
+              } else if (that.form.id_card_type == 2) {
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
+              }
+              that.$message({message: '读卡成功', type: 'success'})
+            }
+          })
+          .catch(function (error) {
+
+          });
+
+
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      show: function () {
+        this.form = Object.assign({}, this.resetForm)
+        // this.form.name = patientInfo.name
+        // this.form.gender = patientInfo.gender
+        // this.form.age = patientInfo.age
+        // this.form.birthday = patientInfo.birthday
+        // this.form.phone = patientInfo.phone
+        // this.form.birthday = patientInfo.birthday
+        // this.form.id_card = patientInfo.id_card_no
+        // this.form.social_type = patientInfo.health_care_type
+        // this.form.id_card_type = 1
+        // if( this.form.social_type == 0){
+        //   this.form.social_type = ""
+        //
+        // }
         this.visibility = true
 
-      }, hide: function() {
+      }, hide: function () {
         this.visibility = false
-      }, cancel: function(formName) {
+        this.$refs['formValue'].resetFields()
+      }, cancel: function (formName) {
         this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
       },
-      confirm: function(formName) {
+      confirm: function (formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
             let value = {}
             value = this.getValue()
             this.$emit('confirm', value)
-            this.form = Object.assign({}, this.resetForm)
           }
         })
       },
-      getValue: function() {
+      getValue: function () {
         let form = {}
         form = this.form
         return form
@@ -318,13 +500,16 @@
 </script>
 
 <style lang="scss" scoped>
-.registerDialog{
-  .el-form{
+  .registerDialog {
+
+  .el-form {
     display: flex;
     flex-wrap: wrap;
   }
-  .el-form-item{
-    width:50%;
+
+  .el-form-item {
+    width: 50%;
+  }
+
   }
-}
 </style>

src/xt_pages/outpatientCharges/costComparison.vue

@@ -0,0 +1,157 @@
+<template>
+  <div class="main-contain incomeStatistics">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+        <div>
+          <el-input size="small" style="width:150px;"  v-model="keywords"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
+            搜索
+          </el-button>
+        </div>
+        <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>
+      </div>
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column
+          prop="date"
+          label="序号"
+          width="60"
+          align="center"
+          type="index"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="操作机构">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="对账申请人">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="开始日期">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="结束日期">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="险种类型">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="对账类型">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="结算笔数">
+          <template slot-scope="scope"></template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医疗费用总数">
+          <template slot-scope="scope">
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" width="160" label="基本医疗基金总费用">
+          <template slot-scope="scope">
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人支付总费用">
+          <template slot-scope="scope">
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+
+      >
+      </el-pagination>
+      <el-dialog title="医保对账" :visible.sync="dialogFormVisible">
+        <el-form :model="form" label-width="100px">
+            <el-form-item label="时间" :label-width="formLabelWidth">
+                <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
+                    @change="handleStartTimeChange" :editable="false" :clearable="false"
+                    style="width: 200px;" type="date" placeholder="选择开始日期"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    align="right"></el-date-picker>-
+
+                <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
+                    @change="handleEndTimeChange" :editable="false" :clearable="false"
+                    style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    align="right"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="险种类型" :label-width="formLabelWidth">
+                <el-select v-model="value" placeholder="请选择" style="width: 200px;">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="对账类型" :label-width="formLabelWidth">
+                <el-select v-model="value" placeholder="请选择" style="width: 200px;">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+        </div>
+      </el-dialog>
+    </div>
+
+
+  </div>
+</template>
+
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊收费' },
+          { path: false, name: '医保费用对照' }
+        ],
+        tableData: [],
+        limit:10,
+        page:1,
+        dialogFormVisible:false
+      }
+    },
+    methods: {
+      handleSizeChange(limit){
+        this.limit = limit;
+      },
+      handleCurrentChange(page){
+        this.page = page;
+      },
+    },
+    created() {
+
+
+    }
+  }
+</script>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -0,0 +1,369 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+      >打印
+      </el-button
+      >
+    </template>
+
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+    </div>
+  </div>
+</template>
+
+<script>
+  import printOne from './listTemplate/printOne'
+  import { getHisOrderDetail } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    name: 'listPrint',
+    components: {
+      printOne
+    },
+    props: {
+      paramsObj: Object
+    },
+    data() {
+      return {
+        list: [],
+        patient:{},
+        order:{},
+        admin:{},
+      }
+    },
+    created() {
+      this.getInfo(this.paramsObj.id)
+    },
+
+    methods: {
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+      },
+      getInfo(order_id) {
+        let params = {
+          id: order_id
+        }
+        getHisOrderDetail(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.order = response.data.data.order
+            this.patient = response.data.data.patient
+            console.log(this.patient)
+            this.admin = response.data.data.admin_info
+
+
+            for (let i = 0; i < response.data.data.order_info.length; i++) {
+              var infos = response.data.data.order_info[i]
+              let obj = {
+                med_chrgitm_type: this.getType(infos.med_chrgitm_type),
+                price: infos.pric,
+                count: infos.cnt
+              }
+              if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
+                obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
+                obj['name'] = infos.project.project.project_name
+                obj['spec'] = 1
+                obj['unit'] = infos.project.project.unit
+
+              }
+
+              if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
+                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
+                obj['name'] = infos.advice.advice_name
+                obj['spec'] = infos.advice.drug.drug_spec
+                obj['unit'] = infos.advice.drug.max_unit
+
+              }
+              this.list.push(obj)
+              this.list.sort(function(a, b) {
+                return b.p_time < a.p_time ? 1 : -1
+              })
+
+            }
+          }
+        })
+      },
+      getType(med_chrgitm_type) {
+        switch (med_chrgitm_type) {
+          case '01':
+            return '床位费'
+            break
+          case '02':
+            return '诊察费'
+
+            break
+          case '03':
+            return '检查费'
+
+            break
+          case '04':
+            return '化验费'
+            break
+          case '05':
+            return '治疗费'
+
+            break
+          case '06':
+            return '手术费'
+
+            break
+          case '07':
+            return '护理费'
+
+            break
+          case '08':
+            return '材料费'
+
+            break
+          case '09':
+            return '西药费'
+
+            break
+          case '10':
+            return '中药饮片费'
+
+            break
+          case '11':
+            return '中成药费'
+
+            break
+          case '12':
+            return '一般诊疗费'
+
+            break
+          case '13':
+            return '挂号费'
+
+            break
+          case '14':
+            return '其他费'
+
+            break
+
+        }
+
+      },
+      printThisPage() {
+
+        const style =
+          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+        printJS({
+          printable: 'list-print',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+
+        // if (this.org_template_info.template_id == 1) {
+        //   printJS({
+        //     printable: "dialysis-print-box",
+        //     type: "html",
+        //     style: style,
+        //     scanStyles: false
+        //   });
+        // }
+      }
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto;
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
+
+  .dialysis-print-order .table-box {
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 30px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+
+  .table-box1 {
+    border: 1px solid #000;
+    width: 100%;
+    line-height: 30px;
+    font-size: 14px;
+    border-collapse: collapse;
+  }
+
+  .table-box1 tr {
+    border-bottom: 1px solid #000;
+  }
+</style>
+
+<style lang="scss">
+
+  .newContainer {
+
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+
+  .el-date-editor {
+
+  .el-input__inner {
+    padding-right: 0px;
+  }
+
+  }
+  .el-table td, .el-table th {
+    text-align: center;
+  }
+
+  }
+  .newContainer::-webkit-scrollbar {
+    height: 15px !important;
+  }
+</style>