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

package-lock.json

@@ -621,7 +621,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -647,7 +647,7 @@
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA=="
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
     "async-limiter": {
       "version": "1.0.0",
@@ -666,7 +666,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -691,7 +691,7 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.11.0",
@@ -1677,7 +1677,7 @@
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -2100,7 +2100,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -2461,7 +2461,7 @@
     },
     "codepage": {
       "version": "1.12.2",
-      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.12.2.tgz",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.12.2.tgz",
       "integrity": "sha512-FAN+oPs/ocaPLFvIt4vEOHgWA6UJ6t+fVbbVBoXDpTpC+4JYasomYZEEjR/Miph3qQrVnIShRwwmwu4P35JW1w==",
       "requires": {
         "commander": "~2.14.1",
@@ -2470,7 +2470,7 @@
       "dependencies": {
         "commander": {
           "version": "2.14.1",
-          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.14.1.tgz",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
           "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
         }
       }
@@ -2699,7 +2699,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "consolidate": {
       "version": "0.14.5",
@@ -2890,13 +2890,55 @@
       }
     },
     "cross-env": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.1.tgz",
-      "integrity": "sha512-Wtvr+z0Z06KO1JxjfRRsPC+df7biIOiuV4iZ73cThjFGkH+ULBZq1MkBdywEcJC4cTDbO6c8IjgRjfswx3YTBA==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
       "dev": true,
       "requires": {
-        "cross-spawn": "^5.1.0",
-        "is-windows": "^1.0.0"
+        "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "cross-spawn": {
@@ -3291,7 +3333,7 @@
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -3466,7 +3508,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegate": {
       "version": "3.2.0",
@@ -3476,7 +3518,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
       "version": "1.1.2",
@@ -3654,7 +3696,7 @@
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -4249,7 +4291,7 @@
     },
     "exit-on-epipe": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
       "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
     },
     "expand-brackets": {
@@ -4546,7 +4588,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "2.0.1",
@@ -4793,7 +4835,7 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
@@ -4832,7 +4874,7 @@
     },
     "frac": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
       "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
     },
     "fragment-cache": {
@@ -5642,7 +5684,7 @@
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -5792,7 +5834,7 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.5",
@@ -5871,7 +5913,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
       "version": "1.0.0",
@@ -6316,7 +6358,7 @@
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -6869,7 +6911,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -6908,7 +6950,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jest-get-type": {
       "version": "22.4.3",
@@ -6962,7 +7004,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsesc": {
       "version": "1.3.0",
@@ -7006,7 +7048,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.2",
@@ -9414,7 +9456,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "3.0.0",
@@ -12143,7 +12185,7 @@
     },
     "printj": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/printj/-/printj-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
       "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
     },
     "private": {
@@ -14702,7 +14744,7 @@
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -14710,7 +14752,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "type-check": {
       "version": "0.3.2",
@@ -15083,7 +15125,7 @@
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -16088,7 +16130,7 @@
     },
     "xlsx": {
       "version": "0.11.19",
-      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.11.19.tgz",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.11.19.tgz",
       "integrity": "sha512-UTfD64o5Ka/E6QHL12fzcq5wnt9MCtuwgoUdYSTDxjjDkhNmZwSfPlJH/+Yh8vE6nU/0ax3MXNrc9AP4haAmIg==",
       "requires": {
         "adler-32": "~1.2.0",
@@ -16102,7 +16144,7 @@
       "dependencies": {
         "commander": {
           "version": "2.13.0",
-          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.13.0.tgz",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
           "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
         }
       }

src/lang/en.js

@@ -87,7 +87,7 @@ export default {
     data_dictionary: 'data_dictionary',
     field_config: 'field_config',
     template: 'Template',
-    DepositManagement:'Deposit Management',
+    DepositManagement: 'Deposit Management',
     workforce: 'workforce',
     appointment: 'appointment',
     sign: 'sign',
@@ -96,19 +96,20 @@ export default {
     deviceZoneManage: 'Device Zone Manage',
     deviceGroupManage: 'Device Group Manage',
     stockManage: 'Stock Manage',
-    wareHouseManage:'Ware House Manage',
-    inventoryTransfer:'inventoryTransfer',
-    DrugDispensing:'DrugDispensing',
-    DispensingDetails:'DispensingDetails',
+    wareHouseManage: 'Ware House Manage',
+    inventoryTransfer: 'inventoryTransfer',
+    DrugDispensing: 'DrugDispensing',
+    DispensingDetails: 'DispensingDetails',
     // ConsumablesManagement:'ConsumablesManagement',
-    MedicianManagement:'MedicianManagement',
-    patiantDispensing:'patiantDispensing',
+    MedicianManagement: 'MedicianManagement',
+    patiantDispensing: 'patiantDispensing',
     supplyManage: 'Supply Manage',
     supplyQuery: 'supply query',
     baseInfo: 'base Info',
     stockIn: 'stock in',
     stockOut: 'stock out',
     stockQuery: 'stock query',
+    stockNewQuery: 'stock new query',
     manufacturer: 'manufacturer',
     dealer: 'dealer',
     AddStockIn: 'Add Stock In',

src/lang/zh.js

@@ -137,6 +137,7 @@ export default {
     stockOutRecord: '出库记录',
     addStockIn: '入库',
     stockQuery: '库存查询',
+    stockNewQuery: '库存查询',
     supplyQuery: '供应商管理',
     purchaseOrderQuery: '采购订单',
     goodOrderQuery: '采购单',

src/router/modules/stock.js

@@ -18,6 +18,12 @@ export default {
       name: 'stockQuery',
       meta: { title: 'stockQuery', noCache: true }
     },
+    {
+      path: '/stock/new/query',
+      component: () => import('@/xt_pages/stock/stockNewQuery'),
+      name: 'stockNewQuery',
+      meta: { title: 'stockNewQuery', noCache: true }
+    },
     {
       path: '/stock/in',
       component: () => import('@/xt_pages/stock/stockInOrder'),

src/views/layout/Layout.vue

@@ -12,10 +12,10 @@
           <i class="iconfont icon-s_bingli navIcon"></i>
           <p>电子病历</p>
         </div>
-        <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
+        <!-- <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
           <p>药房管理</p>
-        </div>
+        </div> -->
         <div v-if="touxiShow" :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
@@ -139,7 +139,7 @@ export default {
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
     let kuyishopping = ['kuyiShopping'];
-    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','MedicianManagement']
+    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs']
     let menzhenArr = [];
     let bingliArr = [];
     let touxiArr = [];

src/views/layout/components/Sidebar/index.vue

@@ -103,7 +103,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '药房管理'){
-          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','MedicianManagement']
+          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/Pharmacy/DispensingDetails.vue

@@ -15,7 +15,7 @@
         <div>
           <el-input
             size="small"
-            style="width: 200px; margin-left: 10px"
+            style="width: 200px;margin-right: 20px;"
             class="filter-item"
             v-model="keyword"
             placeholder="请输入患者姓名"
@@ -54,6 +54,7 @@
             class="filter-item"
             type="primary"
             icon="el-icon-search"
+            style="margin-left: 20px;"
             @click="query"
             >查询</el-button
           >
@@ -65,30 +66,30 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
-        style="width: 1651px"
+        style="width: 100%"
         :data="tableList"
         :class="signAndWeighBoxPatients"
         border
       >
-        <el-table-column type="index" label="序号" align="center" width="250">
+        <el-table-column type="index" label="序号" align="center" width="100">
         </el-table-column>
-        <el-table-column label="患者名称" align="center" width="300">
+        <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.Name  ? scope.row.Name  : ""}}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="开立医生" align="center" width="300">
+        <el-table-column label="开立医生" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.DoctorName  ? scope.row.DoctorName  : ""}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="发药时间" align="center" width="400">
+        <el-table-column label="发药时间" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.RecordDate  ? scope.row.RecordDate  : ""}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="400">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="primary" @click="views(scope.row)">查看</el-button>
           </template>
@@ -211,4 +212,25 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
 </style>

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -18,13 +18,13 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               placeholder="选择日期"
-              @change="changeTimes()"
+              :change="testsss()"
             >
             </el-date-picker>
           </div>
 
           <div class="list">
-            <el-radio-group v-model="state" @change="lala()">
+            <el-radio-group v-model="state">
               <el-radio :label="1">待发药</el-radio>
               <el-radio :label="2">已发药</el-radio>
             </el-radio-group>
@@ -46,28 +46,29 @@
             </el-button>
           </div>
 
-          <el-table v-if="state == 1"
+          <el-table
+            v-if="state == 1"
             :height="tableHeight"
-            :data="waiting_drug"
+            :data="tableData"
             border
             style="width: 100%"
             highlight-current-row
-            ref="table01"
+            ref="singleTable"
             @current-change="handleCurrentChange"
           >
             <el-table-column prop="name" label="名称" width="100">
                <template slot-scope="scope">
-                {{scope.row.name}}
+                {{scope.row.drug_name}}
               </template>
             </el-table-column>
             <el-table-column prop="specifications" label="规格" width="100">
               <template slot-scope="scope">
-                {{scope.row.specifications}}
+                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
               </template>
             </el-table-column>
             <el-table-column prop="stock" label="库存" width="100">
                <template slot-scope="scope">
-                {{scope.row.stock}}
+                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
               </template>
             </el-table-column>
           </el-table>
@@ -75,26 +76,26 @@
           <el-table
             v-if="state == 2"
             :height="tableHeight"
-            :data="issued_drug"
+            :data="tableData"
             border
             style="width: 100%"
             highlight-current-row
-            @current-change="handleCurrentChange"
-            ref="table02"
+            @current-change="handleSelectionChangeOne"
+            ref="singleTable"
           >
             <el-table-column prop="name" label="名称" width="100">
                <template slot-scope="scope">
-                {{scope.row.name}}
+                {{scope.row.drug_name}}
               </template>
             </el-table-column>
             <el-table-column prop="specifications" label="规格" width="100">
               <template slot-scope="scope">
-                {{scope.row.specifications}}
+                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
               </template>
             </el-table-column>
             <el-table-column prop="stock" label="库存" width="100">
                <template slot-scope="scope">
-                {{scope.row.stock}}
+                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
               </template>
             </el-table-column>
           </el-table>
@@ -102,116 +103,121 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-<!--          <el-button type="primary" @click="tt">调试</el-button>-->
           <el-button type="primary" @click="dispense" v-if="state == 1">发药</el-button>
           <el-button type="primary" @click="toPrint">打印</el-button>
-<!--          <el-button @click="tt">调试</el-button>-->
-<!--          <el-button type="primary" @click="toSetting">设置</el-button>-->
+          <el-button type="primary" @click="toSetting">设置</el-button>
         </div>
         <el-divider></el-divider>
         <div>
           <el-table
             :height="tableHeight"
-            :data="tableData"
+            :data="tableData_list"
             border
             style="width: 1328px"
             @selection-change="handleSelectionChange"
              v-if="state == 1"
           >
-            <el-table-column type="selection" width="55"> </el-table-column>
+            >
+            <el-table-column type="selection" width="55" align="center"> </el-table-column>
             <el-table-column type="index" label="序号" width="120" align="center">
+              <template slot-scope="scope">
+                {{scope.$index + 1}}
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="患者名称" width="180" align="center">
                 <template slot-scope="scope">
-                 {{scope.row.name}}
+                 {{getPatientName(scope.row.patient_id)}}
               </template>
             </el-table-column>
             <el-table-column prop="name" label="单次用量" width="170" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.single_dosage}}
+                 {{scope.row.single_dose}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="用法" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.usage}}
+                 {{scope.row.delivery_way}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="频率" width="160" align="center">
                 <template  slot-scope="scope">
-                 {{scope.row.frequency}}
+                 {{scope.row.execution_frequency}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="天数" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.days}}
+                 {{scope.row.day}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="总量" width="160" align="center">
                 <template  slot-scope="scope">
-                 {{scope.row.total}}
+                 {{scope.row.prescribing_number}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="数据来源" width="162" align="center">
                 <template  slot-scope="scope">
-                  {{scope.row.data_sources}}
+                 <span v-if="scope.row.type == 1">血透</span>
+                 <span v-if="scope.row.type == 2">HIS</span>
                </template>
             </el-table-column>
           </el-table>
-        </div>
-        <div>
-          <el-table
+
+
+            <el-table
             :height="tableHeight"
-            :data="tableData"
+            :data="tableList"
             border
             style="width: 1328px"
             v-if="state == 2"
           >
-<!--            <el-table-column type="selection" width="55"> </el-table-column>-->
+            >
+            <el-table-column type="selection" width="55"> </el-table-column>
             <el-table-column type="index" label="序号" width="120" align="center">
+              <template slot-scope="scope">
+                {{scope.$index + 1}}
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="患者名称" width="180" align="center">
                 <template slot-scope="scope">
-                 {{scope.row.name}}
+                 {{getPatientName(scope.row.patient_id)}}
               </template>
             </el-table-column>
             <el-table-column prop="name" label="单次用量" width="170" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.single_dosage}}
+                 {{scope.row.single_dose}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="用法" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.usage}}
+                 {{scope.row.delivery_way}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="频率" width="160" align="center">
                 <template  slot-scope="scope">
-                 {{scope.row.frequency}}
+                 {{scope.row.execution_frequency}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="天数" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.days}}
+                 {{scope.row.day}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="总量" width="160" align="center">
                 <template  slot-scope="scope">
-                 {{scope.row.total}}
+                 {{scope.row.prescribing_number}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="数据来源" width="162" align="center">
                 <template  slot-scope="scope">
-                  {{scope.row.data_sources}}
+                 <span v-if="scope.row.type == 1">血透</span>
+                 <span v-if="scope.row.type == 2">HIS</span>
                </template>
             </el-table-column>
-              <el-table-column prop="name" label="领药人" width="160" align="center">
-                <template  slot-scope="scope">
-                  {{scope.row.people}}
-                </template>
-              </el-table-column>
           </el-table>
+
+
         </div>
-        <div style="margin-top" v-if="state == 1">领药人：
+        <div style="margin-top:12px;" v-if="state == 1">领药人：
           <el-select v-model="admin_user_id" placeholder="请选择">
             <el-option
               v-for="item in doctorList"
@@ -223,21 +229,19 @@
         </div>
       </div>
 
-      <el-dialog
-        title="设置"
-        :visible.sync="dialogVisible"
-        width="30%">
-        <span>请选择药品是否要通过药房管理出库</span>
-        <span>
+      <el-dialog title="设置" :visible.sync="dialogVisible" width="30%">
+        <span style="font-size: 17px">请选择药品是否要通过药房管理出库</span>
+        <span style="display: block; padding: 18px 25px">
           <el-radio v-model="is_open" label="1">是</el-radio>
           <el-radio v-model="is_open" label="2">否</el-radio>
         </span>
-        <span>
+        <div style="height: 50px; background: #c7ebfc; border-radius: 5px;padding: 7px;">
+          <i class="el-icon-info" style="color: #3399ff;font-size: 17px;"></i>
           若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
-        </span>
+        </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="SaveSetting">确 定</el-button>
+          <el-button type="primary" @click="SaveSetting">保 存</el-button>
         </span>
       </el-dialog>
     </div>
@@ -256,13 +260,11 @@
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug,SaveSetting,getPharmacyConfig,getUserdDrugList } from "@/api/his/advice";
-import {
-  dispensemedicine,
-  waitingmedicine,
-  getpatientswithdrugs,
-  medicinedeparture,
-  getcurrentname
-} from "@/api/pharmacy"
+// import {
+//   waitingdrug,
+//   issueddrugs,
+//   getpharmacycontent
+// } from "@/api/pharmacy"
 const moment = require('moment')
 export default {
   components: {
@@ -272,7 +274,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "药房管理" },
+        { path: false, name: "药品发药" },
         { path: "/Pharmacy/DrugDispensing", name: "药品发药" },
       ],
       tableHeight: 400,
@@ -292,194 +294,86 @@ export default {
       isVisibility:"",
       propsTable:"",
       doctorList:[],
-      admin_user_id:0,
-      waiting_drug:[],//待发药列表
-      issued_drug:[],//已发药列表
-      currentRow:null,
-      tmp:0,
+      admin_user_id:this.$store.getters.xt_user.user.id,
     };
   },
 
   methods: {
-    tt(){
-      console.log("this.currentRow",this.currentRow)
-      this.$router.go(0)
-    },
-    async fun3(){
-      console.log("fun3")
-      this.fun1().then(val => {
-        this.fun2();
-      })
-    },
-    async fun4(tps){
-      console.log("fun3",tps)
-      this.fun1().then(val => {
-        console.log("this.issued_drug",this.issued_drug)
-        for(let i = 0;i < this.issued_drug.length;i++){
-          if(tps == this.issued_drug[i].id){
-            this.$refs.table02.setCurrentRow(this.issued_drug[i]);
-            this.handleCurrentChange(this.issued_drug[i])
-          }
-        }
-      })
-    },
-    async fun5(tps){
-      console.log("fun3",tps)
-      this.fun1().then(val => {
-        console.log("this.issued_drug",this.waiting_drug)
-        for(let i = 0;i < this.waiting_drug.length;i++){
-          if(tps == this.waiting_drug[i].id){
-            this.$refs.table01.setCurrentRow(this.waiting_drug[i]);
-            this.handleCurrentChange(this.waiting_drug[i])
-          }
-        }
-      })
-    },
-    changeTimes(){
-      // alert("aa")
-      // this.getdruglist();
-      this.fun3();
+    testsss(){
+      console.log("time",this.start_time);
     },
     //初始化
     init(){
-      this.state = 1
-      this.tableData = null
-      this.currentRow = null
-    },
-    lala(){
-      this.currentRow = null
-      this.tableData = null
-      this.selectedbydefault()
+
     },
      searchAction() {
-      // this.getlist();
-       this.tableData = null
-       this.currentRow = null
-       this.getdruglist();
+      this.getlist();
     },
     // 跳转打印页面
     toPrint() {
-
-      if (this.state == 1 && this.multipleSelection.length == 0){
-        this.$message.error("未选择任何数据");
-        return
-      }
-      if (this.state == 2 && this.tableData == null){
-          this.$message.error("未选择任何数据");
-          return
-      }
-      this.$refs.drugprint.show(this.tableData,this.currentRow,this.state,this.multipleSelection);
+      // this.$router.push({ path: "/Pharmacy/print/patientPrint" });
+      this.$refs.drugprint.show();
     },
-    //列表选择
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    //默认选中
-    selectedbydefault(){
-      if(this.state == 1 && this.waiting_drug.length > 0){
-        this.$refs.table01.setCurrentRow(this.waiting_drug[0]);
-        this.handleCurrentChange(this.waiting_drug[0])
-      }
-      if(this.state == 2 && this.issued_drug.length >0){
-        this.$refs.table02.setCurrentRow(this.issued_drug[0]);
-        this.handleCurrentChange(this.issued_drug[0])
-      }
-    },
-    //包装selectedbydefault
-    fun2(){
-      console.log("3333333this.waitmount_data",this.waiting_drug)
-      // return new Promise((resolve, reject) => {
-      if(this.state == 1 && this.waiting_drug.length > 0){
-        this.$refs.table01.setCurrentRow(this.waiting_drug[0]);
-        this.handleCurrentChange(this.waiting_drug[0])
-      }
-      if(this.state == 2 && this.issued_drug.length >0){
-        this.$refs.table02.setCurrentRow(this.issued_drug[0]);
-        this.handleCurrentChange(this.issued_drug[0])
-      }
-      // });
+    handleSelectionChangeOne(val){
+      this.tableList = []
+      this.getUserlist(val.id)
     },
     // 药品发药
     dispense() {
-      var tps = this.currentRow.id;
-      if(this.multipleSelection.length < 1){
-        this.$message.error("未选择任何信息")
-        return
-      }
-      var tmp = "";
-      console.log("初始值",tmp)
-      for (var i=0;i < this.multipleSelection.length;i++){
-        tmp = tmp + this.multipleSelection[i].id + ","
-      }
-      var params = {
-        creater: this.admin_user_id,
-        ids: tmp,
-      }
-      medicinedeparture(params).then((res) => {
-        if (res.data.state == 1){
-          this.$message.success("操作成功")
-          this.getdruglist();
-          //刷新列表
-          this.handleCurrentChange(this.currentRow);
-          this.fun4(tps);
-          this.state = 2;
-        }else{
-          this.$message.error("操作失败：" + res.data.msg)
-          //刷新列表
-          this.handleCurrentChange(this.currentRow);
-          this.fun5(tps);
-          this.state = 1;
+      var blood_ids = []
+      var his_ids = []
+      var bloodStr = ""
+      var hisStr = ""
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.tableData[i].type == 1){
+          blood_ids.push(this.tableData[i].id)
         }
-      })
-    },
-    //获取药品列表
-    getdruglist(){
-      var params = {
-        keyword: this.keywords,
-        time: this.start_time,
-      }
-      waitingmedicine(params).then((res) => {
-        if (res.data.state == 1){
-          this.waiting_drug = res.data.data.list
-        }
-      })
-      dispensemedicine(params).then((res) => {
-        if (res.data.state == 1){
-          this.issued_drug = res.data.data.list
+        if(this.tableData[i].type == 2){
+          his_ids.push(this.tableData[i].id)
         }
-      })
-    },
-    async fun1(){
+      }
+      bloodStr = blood_ids.join(",")
+      hisStr =  his_ids.join(",")
       var params = {
-        keyword: this.keywords,
-        time: this.start_time,
+        bloodStr:bloodStr,
+        hisStr:hisStr,
+        admin_user_id:this.admin_user_id,
       }
-      await waitingmedicine(params).then((res) => {
-        if (res.data.state == 1){
-          this.waiting_drug = res.data.data.list
-        }
-        console.log("fun1lil1111i")
-      })
-      await dispensemedicine(params).then((res) => {
-        if (res.data.state == 1){
-          this.issued_drug = res.data.data.list
-        }
-        console.log("fun122222222")
-      })
-      console.log("fun1")
+      this.$confirm("确定是否对该药品进行发药?", "患者发药", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        updatePharmacyBaseDrug(params).then(response=>{
+           if(response.data.state == 1){
+           var msg = response.data.data.msg
+           var medical =  response.data.data.medical
+           if(msg === 1){
+             this.$message.success("发药成功!")
+           }
+           if(msg == 2 || msg ===3){
+             this.$message.error("库存不足")
+           }
+         }
+        })
+      }).catch(() => {});
     },
 
-    morencreatename(){
-      var param ={}
-      getcurrentname(param).then((res) => {
-        console.log("res(药)",res)
-        if (res.data.state == 1){
-          this.admin_user_id = res.data.data.list;
-          console.log("this.admin_user_id(药)",this.admin_user_id)
-        }
-      });
+    // 药品退药
+    endispense() {
+      var params = {};
+      this.$confirm("确定是否对该药品进行退药?", "患者退药", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      })
+        .then(() => {})
+        .catch(() => {});
     },
-    //获取领药人选项
+
     getlist(){
       var params = {
         start_time:this.start_time,
@@ -487,43 +381,76 @@ export default {
       }
       getTodayAdviceList(params).then(response=>{
          if(response.data.state == 1){
-           this.doctorList = response.data.data.doctorlist
-           console.log("this.admin_user_id(药2)",this.admin_user_id)
-           // this.admin_user_id = this.doctorList[0].admin_user_id
-           // this.admin_user_id = this.tmp
+           var list =  response.data.data.list
+           this.$refs.singleTable.setCurrentRow(list[0])
+           this.tableData = list
+           var doctorlist = response.data.data.doctorlist
+           this.doctorList = doctorlist
          }
       })
     },
-   //  //获取药品的患者信息
-    informationofdrugs(val){
-      var params = {
-        // patient_id: this.currentRow.
+   getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
       }
-    },
-    handleCurrentChange(val) {
-      this.currentRow = val;
-      if(this.state == 1){
-        this.getdrugsdetails(0)
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
       }
-      if (this.state == 2){
-        this.getdrugsdetails(1)
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
       }
+      return max_str + min_str;
+    },
+
+    handleCurrentChange(row) {
+      this.getPharmacyBaseDrug(row.id)
     },
-    getdrugsdetails(val){
+    getPharmacyBaseDrug(drug_id){
       var params = {
-        drug_id:this.currentRow.id,
-        is_medicine:val,
-        time:this.start_time,
+        start_time:this.start_time,
+        drug_id:drug_id,
       }
-      getpatientswithdrugs(params).then((res) => {
-        if (res.data.state == 1){
-          this.tableData = res.data.data.list;//列表数据
-        }else {
-          this.$message.error(res.data.msg);
+      getPharmacyBaseDrug(params).then(response=>{
+        if(response.data.state == 1){
+           var advicelist = response.data.data.advicelist
+           for(let i=0;i<advicelist.length;i++){
+             advicelist[i].type = 1
+             advicelist[i].day = " "
+             this.tableData_list.push(advicelist[i])
+           }
+           var hisAdviceList = response.data.data.hisAdviceList
+           for(let i=0;i<hisAdviceList.length;i++){
+             hisAdviceList[i].type = 2
+             this.tableData_list.push(hisAdviceList[i])
+           }
+           var patient = response.data.data.patient
+           this.patientList = patient
         }
       })
     },
-
+    getPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+             name = this.patientList[i].name
+          }
+       }
+       return name
+    },
     toSetting(){
       getPharmacyConfig().then(response=>{
         if(response.data.state == 1){
@@ -571,10 +498,7 @@ export default {
   },
   created() {
     this.init();
-    this.morencreatename();
-    this.getlist();
-    // this.getdruglist();
-    this.fun3();
+    this.getlist()
   },
 };
 </script>
@@ -615,4 +539,25 @@ export default {
     justify-content: flex-end;
   }
 }
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
 </style>

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -1,4 +1,5 @@
-<template><!--患者发药-->
+<template>
+  <!--患者发药-->
   <div class="main-contain new-main-contain">
     <div class="position">
       <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
@@ -13,31 +14,30 @@
           <div class="list">
             <el-date-picker
               style="width: 200px"
-              v-model="start_time"
+              v-model="datepick"
               type="date"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
               placeholder="选择日期"
-              @change="changeTimes()"
             >
             </el-date-picker>
           </div>
-<!--          <el-button @click="testsss">调试1</el-button>-->
-<!--          <el-button @click="testsss2">调试2</el-button>-->
+          <!--          <el-button @click="testsss">调试1</el-button>-->
+          <!--          <el-button @click="testsss2">调试2</el-button>-->
           <div class="list">
             <el-radio-group v-model="state" @change="lala()">
-              <el-radio :label="1" >待发药{{ waitmount }}人</el-radio>
-              <el-radio :label="2" >已发药{{ alreadmount }}人</el-radio>
+              <el-radio :label="1">待发药{{ waitmount }}人</el-radio>
+              <el-radio :label="2">已发药{{ alreadmount }}人</el-radio>
             </el-radio-group>
           </div>
-          <div class="list">
+          <div
+            class="list"
+            style="display: flex; justify-content: space-between"
+          >
             <el-input
               size="small"
               style="width: 130px"
               v-model="keywords"
               class="filter-item"
               placeholder="请输入患者名称"
-              clearable
             />
             <el-button
               size="small"
@@ -48,27 +48,49 @@
             </el-button>
           </div>
 
-          <el-table :height="tableHeight" ref="table01" :data="waitmount_data" highlight-current-row @current-change="handleCurrentChange" border style="width: 100%" v-if="state == 1">
-            <el-table-column prop="date" label="患者姓名" width="100" >
+          <el-table
+            :height="tableHeight"
+            ref="table01"
+            :data="waitmount_data"
+            highlight-current-row
+            @current-change="handleCurrentChange"
+            border
+            style="width: 100%"
+            v-if="state == 1"
+          >
+            <el-table-column prop="date" label="患者姓名" width="100">
               <template slot-scope="scope">
-                <span >{{scope.row.Name ? scope.row.Name : ""}}</span>
+                <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="name" label="透析号" width="100">
               <template slot-scope="scope">
-                <span>{{scope.row.DialysisNo ? scope.row.DialysisNo : ""}}</span>
+                <span>{{
+                  scope.row.DialysisNo ? scope.row.DialysisNo : ""
+                }}</span>
               </template>
             </el-table-column>
           </el-table>
-          <el-table :height="tableHeight" ref="table02" :data="alreadmount_data" highlight-current-row @current-change="handleCurrentChange" border style="width: 100%" v-if="state == 2">
-            <el-table-column prop="date" label="患者姓名" width="100" >
-              <template slot-scope="scope" >
-                <span>{{scope.row.Name ? scope.row.Name : ""}}</span>
+          <el-table
+            :height="tableHeight"
+            ref="table02"
+            :data="alreadmount_data"
+            highlight-current-row
+            @current-change="handleCurrentChange"
+            border
+            style="width: 100%"
+            v-if="state == 2"
+          >
+            <el-table-column prop="date" label="患者姓名" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="name" label="透析号" width="100">
               <template slot-scope="scope">
-                <span>{{scope.row.DialysisNo ? scope.row.DialysisNo : ""}}</span>
+                <span>{{
+                  scope.row.DialysisNo ? scope.row.DialysisNo : ""
+                }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -83,83 +105,94 @@
             >退药</el-button
           >
           <el-button type="primary" @click="toPrint">打印</el-button>
-<!--          <el-button @click="tiaoshi">调试</el-button>-->
-          <el-button type="primary" v-if="state == 1" @click="toSetting">设置</el-button>
+          <!--          <el-button @click="tiaoshi">调试</el-button>-->
+          <el-button type="primary" v-if="state == 1" @click="toSetting"
+            >设置</el-button
+          >
         </div>
         <el-divider></el-divider>
         <div>
           <el-table
             :height="tableHeight"
-            :data="tableData"
+            :data="tableData_list"
             border
             style="width: 100%"
           >
-            <el-table-column type="index" label="序号" width="120" align="center">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="120"
+              align="center"
+            >
             </el-table-column>
-            <el-table-column  label="名称" width="200" align="center">
+            <el-table-column label="名称" width="200" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.Name  ? scope.row.Name  : ""}}</span>
+                <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="单次用量" width="150" align="center">
+            <el-table-column label="单次用量" width="150" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.SingleDosage  ? scope.row.SingleDosage  : ""}}</span>
+                <span>{{
+                  scope.row.SingleDosage ? scope.row.SingleDosage : ""
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="用法" width="160" align="center">
+            <el-table-column label="用法" width="160" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.Usage  ? scope.row.Usage  : ""}}</span>
+                <span>{{ scope.row.Usage ? scope.row.Usage : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="频率" width="160" align="center">
+            <el-table-column label="频率" width="160" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.Frequency  ? scope.row.Frequency  : ""}}</span>
+                <span>{{
+                  scope.row.Frequency ? scope.row.Frequency : ""
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="天数" width="140" align="center">
+            <el-table-column label="天数" width="140" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.Days  ? scope.row.Days  : ""}}</span>
+                <span>{{ scope.row.Days ? scope.row.Days : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="总量" width="140" align="center">
+            <el-table-column label="总量" width="140" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.Total  ? scope.row.Total  : ""}}</span>
+                <span>{{ scope.row.Total ? scope.row.Total : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="开立医生" width="150" align="center">
+            <el-table-column label="开立医生" width="150" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.Doctor  ? scope.row.Doctor  : ""}}</span>
+                <span>{{ scope.row.Doctor ? scope.row.Doctor : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="数据来源" width="162" align="center">
+            <el-table-column label="数据来源" width="162" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.DataSources  ? scope.row.DataSources  : ""}}</span>
+                <span>{{
+                  scope.row.DataSources ? scope.row.DataSources : ""
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column  label="备注" width="170" align="center">
+            <el-table-column label="备注" width="170" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.Remarks  ? scope.row.Remarks  : ""}}</span>
+                <span>{{ scope.row.Remarks ? scope.row.Remarks : "" }}</span>
               </template>
             </el-table-column>
           </el-table>
         </div>
-<!--        <div v-if="state == 2" style="margin-top: 25px">诊断时间：{{ timedate }}</div>-->
+        <!--        <div v-if="state == 2" style="margin-top: 25px">诊断时间：{{ timedate }}</div>-->
       </div>
-      <el-dialog
-        title="设置"
-        :visible.sync="dialogVisible"
-        width="30%">
-        <span>请选择药品是否要通过药房管理出库</span>
-        <span>
+      <el-dialog title="设置" :visible.sync="dialogVisible" width="30%">
+        <span style="font-size: 17px">请选择药品是否要通过药房管理出库</span>
+        <span style="display: block; padding: 18px 25px">
           <el-radio v-model="is_open" label="1">是</el-radio>
           <el-radio v-model="is_open" label="2">否</el-radio>
         </span>
-        <span>
+        <div style="height: 50px; background: #c7ebfc; border-radius: 5px;padding: 7px;">
+          <i class="el-icon-info" style="color: #3399ff;font-size: 17px;"></i>
           若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
-        </span>
+        </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="SaveSetting">确 定</el-button>
+          <el-button type="primary" @click="SaveSetting">保 存</el-button>
         </span>
       </el-dialog>
     </div>
@@ -176,16 +209,16 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import patientPrint from "./print/patientPrint.vue";
-import { getPharmacyConfig,SaveSetting } from "@/api/his/advice";
+import { getPharmacyConfig, SaveSetting } from "@/api/his/advice";
 import {
   waitingdrug,
   issueddrugs,
   todaynumber,
   getpharmacycontent,
   dispensingmedicine,
-  drugwithdrawal
-} from "@/api/pharmacy"
-const moment = require('moment')
+  drugwithdrawal,
+} from "@/api/pharmacy";
+const moment = require("moment");
 export default {
   components: {
     BreadCrumb,
@@ -193,30 +226,29 @@ export default {
   },
   data() {
     return {
-      patient_id:0,
+      patient_id: 0,
       crumbs: [
-        { path: false, name: "药房管理" },
+        { path: false, name: "患者发药" },
         { path: "/Pharmacy/patiantDispensing", name: "患者发药" },
       ],
       tableHeight: 400,
-      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-      state: 1,//1待发药，2已发药
-      waitmount: 0,//待发药人数
+      start_time: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      state: 1, //1待发药，2已发药
+      waitmount: 0, //待发药人数
       waitmount_data: [],
-      alreadmount: 0,//已发药人数
+      alreadmount: 0, //已发药人数
       alreadmount_data: [],
       keywords: "",
       tableData: [],
       propsTable: [],
       tableData_list: [],
       isVisibility: false,
-      currentRow:null,
-      dialogVisible:false,
-      is_open:"2",
+      currentRow: null,
+      dialogVisible: false,
+      is_open: "2",
     };
   },
-  watch: {
-  },
+  watch: {},
   created() {
     this.init();
     this.gettodaynumber();
@@ -225,270 +257,271 @@ export default {
     // this.selectedbydefault();
   },
   methods: {
-    tiaoshi(){
-      console.log("this.tableData",this.tableData)
+    tiaoshi() {
+      console.log("this.tableData", this.tableData);
     },
-    async fun3(){
-      console.log("fun3")
-        this.fun1().then(val => {
-          this.fun2();
-        })
+    async fun3() {
+      console.log("fun3");
+      this.fun1().then((val) => {
+        this.fun2();
+      });
     },
-    async fun4(tmp){
-      console.log("fun3")
-      this.fun1().then(val => {
-        console.log("this.alreadmount_data",this.alreadmount_data)
-        for (let i = 0;i < this.alreadmount_data.length;i++){
-          console.log("tmp = ",tmp)
-          if (this.alreadmount_data[i].PatientID == tmp){
-            console.log("i = ",i)
+    async fun4(tmp) {
+      console.log("fun3");
+      this.fun1().then((val) => {
+        console.log("this.alreadmount_data", this.alreadmount_data);
+        for (let i = 0; i < this.alreadmount_data.length; i++) {
+          console.log("tmp = ", tmp);
+          if (this.alreadmount_data[i].PatientID == tmp) {
+            console.log("i = ", i);
             this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
-            this.handleCurrentChange(this.alreadmount_data[i])
+            this.handleCurrentChange(this.alreadmount_data[i]);
           }
         }
-      })
+      });
     },
-    async fun5(tmp){
-      console.log("fun3")
-      this.fun1().then(val => {
-        console.log("this.alreadmount_data",this.waitmount_data)
-        for (let i = 0;i < this.waitmount_data.length;i++){
-          console.log("tmp = ",tmp)
-          if (this.waitmount_data[i].PatientID == tmp){
-            console.log("i = ",i)
+    async fun5(tmp) {
+      console.log("fun3");
+      this.fun1().then((val) => {
+        console.log("this.alreadmount_data", this.waitmount_data);
+        for (let i = 0; i < this.waitmount_data.length; i++) {
+          console.log("tmp = ", tmp);
+          if (this.waitmount_data[i].PatientID == tmp) {
+            console.log("i = ", i);
             this.$refs.table02.setCurrentRow(this.waitmount_data[i]);
-            this.handleCurrentChange(this.waitmount_data[i])
+            this.handleCurrentChange(this.waitmount_data[i]);
           }
         }
-      })
+      });
     },
 
-    lala(){
-      console.log("this.state!!!!!!",this.state)
+    lala() {
+      console.log("this.state!!!!!!", this.state);
       //初始化状态
-      this.tableData = null
-      this.currentRow = null
-      this.selectedbydefault()
+      this.tableData = null;
+      this.currentRow = null;
+      this.selectedbydefault();
     },
     //选中行数
     handleCurrentChange(val) {
       this.currentRow = val;
-      console.log("this.currentRow",this.currentRow)
-      if(this.state == 1){
-        this.getpatientdetails(0)
+      console.log("this.currentRow", this.currentRow);
+      if (this.state == 1) {
+        this.getpatientdetails(0);
       }
-      if(this.state == 2){
-        this.getpatientdetails(1)
+      if (this.state == 2) {
+        this.getpatientdetails(1);
       }
     },
-    init(){
+    init() {
       // console.log("初始化了")
-      this.state = 1
-      this.tableData = null
-      this.currentRow = null
+      this.state = 1;
+      this.tableData = null;
+      this.currentRow = null;
     },
-    testsss(){
-     this.state = 1;
+    testsss() {
+      this.state = 1;
     },
     //默认选中的
-    selectedbydefault(){
-      if(this.state == 1 && this.waitmount_data.length > 0){
+    selectedbydefault() {
+      if (this.state == 1 && this.waitmount_data.length > 0) {
         this.$refs.table01.setCurrentRow(this.waitmount_data[0]);
-        this.handleCurrentChange(this.waitmount_data[0])
+        this.handleCurrentChange(this.waitmount_data[0]);
       }
-      if(this.state == 2 && this.alreadmount_data.length >0){
+      if (this.state == 2 && this.alreadmount_data.length > 0) {
         this.$refs.table02.setCurrentRow(this.alreadmount_data[0]);
-        this.handleCurrentChange(this.alreadmount_data[0])
+        this.handleCurrentChange(this.alreadmount_data[0]);
       }
     },
     //包装selectedbydefault
-    fun2(){
-      console.log("3333333this.waitmount_data",this.waitmount_data)
+    fun2() {
+      console.log("3333333this.waitmount_data", this.waitmount_data);
       // return new Promise((resolve, reject) => {
-        if(this.state == 1 && this.waitmount_data.length > 0){
-          this.$refs.table01.setCurrentRow(this.waitmount_data[0]);
-          this.handleCurrentChange(this.waitmount_data[0])
-        }
-        if(this.state == 2 && this.alreadmount_data.length >0){
-          this.$refs.table02.setCurrentRow(this.alreadmount_data[0]);
-          this.handleCurrentChange(this.alreadmount_data[0])
-        }
+      if (this.state == 1 && this.waitmount_data.length > 0) {
+        this.$refs.table01.setCurrentRow(this.waitmount_data[0]);
+        this.handleCurrentChange(this.waitmount_data[0]);
+      }
+      if (this.state == 2 && this.alreadmount_data.length > 0) {
+        this.$refs.table02.setCurrentRow(this.alreadmount_data[0]);
+        this.handleCurrentChange(this.alreadmount_data[0]);
+      }
       // });
     },
-    changeTimes(){
+    changeTimes() {
       this.gettodaynumber();
       this.getwaitmount();
       this.fun3();
     },
     //获取当天发药的人数
-    gettodaynumber(){
-      console.log("aaa")
+    gettodaynumber() {
+      console.log("aaa");
       var params = {
         time: this.start_time,
-      }
+      };
       todaynumber(params).then((res) => {
-        if (res.data.state == 1){
+        if (res.data.state == 1) {
           this.waitmount = res.data.data.itotal;
           this.alreadmount = res.data.data.wtotal;
         }
-      })
+      });
       // console.log("2222222")
     },
     //获取发药人列表
-    getwaitmount(){
+    getwaitmount() {
       var params = {
         keyword: this.keywords,
         time: this.start_time,
-      }
+      };
       waitingdrug(params).then((res) => {
-        if (res.data.state == 1){
+        if (res.data.state == 1) {
           this.waitmount_data = res.data.data.list;
         }
-      })
+      });
       issueddrugs(params).then((res) => {
-        if (res.data.state == 1){
+        if (res.data.state == 1) {
           this.alreadmount_data = res.data.data.list;
         }
-      })
+      });
     },
     //包装getwaitmount
-    async fun1(){
+    async fun1() {
       // return new Promise((resolve, reject) => {
-        var params = {
-          keyword: this.keywords,
-          time: this.start_time,
+      var params = {
+        keyword: this.keywords,
+        time: this.start_time,
+      };
+      await waitingdrug(params).then((res) => {
+        if (res.data.state == 1) {
+          this.waitmount_data = res.data.data.list;
+          console.log("1111111");
         }
-        await waitingdrug(params).then((res) => {
-          if (res.data.state == 1){
-            this.waitmount_data = res.data.data.list;
-            console.log("1111111")
-          }
-        })
-        await issueddrugs(params).then((res) => {
-          if (res.data.state == 1){
-            this.alreadmount_data = res.data.data.list;
-            console.log("1111111s")
-          }
-        })
-        console.log("222222222")
+      });
+      await issueddrugs(params).then((res) => {
+        if (res.data.state == 1) {
+          this.alreadmount_data = res.data.data.list;
+          console.log("1111111s");
+        }
+      });
+      console.log("222222222");
 
       // })
     },
     //获取患者信息详情
-    getpatientdetails(val){
+    getpatientdetails(val) {
       var params = {
-        patient_id:this.currentRow.PatientID,
+        patient_id: this.currentRow.PatientID,
         is_medicine: val,
-        time:this.start_time,
-      }
+        time: this.start_time,
+      };
       getpharmacycontent(params).then((res) => {
-        if (res.data.state == 1){
+        if (res.data.state == 1) {
           this.tableData = res.data.data.list;
-        }else{
+        } else {
           this.$message.error(res.data.msg);
         }
-      })
+      });
     },
     // 跳转打印页面
     toPrint() {
-      if (this.tableData == null){
+      if (this.tableData == null) {
         this.$message.error("未选择任何数据");
-        return
+        return;
       }
-      this.$refs.patientprint.show(this.tableData,this.currentRow,this.state);
+      this.$refs.patientprint.show(this.tableData, this.currentRow, this.state);
     },
 
     // 搜索患者
-    searchAction() {
-      this.tableData = null;
-      this.getwaitmount();
-    },
+    searchAction() {},
 
     // 药品发药
     dispense() {
       var tmp = this.currentRow.PatientID;
       var params = {
-        patient_id:this.currentRow.PatientID,
-        time:this.start_time,
+        patient_id: this.currentRow.PatientID,
+        time: this.start_time,
       };
       this.$confirm("确定是否对该药品进行发药?", "患者发药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      }).then(() => {
-        dispensingmedicine(params).then((res) => {
-          if(res.data.state == 1){
-            this.$message.success('操作成功');
-            this.gettodaynumber();
-            this.searchAction();
-            this.tableData = null;
-            this.fun4(tmp);
-            this.state = 2;
-            // console.log("this.alreadmount_data",this.alreadmount_data)
-            // for (let i = 0;i < this.alreadmount_data.length;i++){
-            //   console.log("tmp = ",tmp)
-            //     if (this.alreadmount_data[i].PatientID == tmp){
-            //       console.log("i = ",i)
-            //       this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
-            //       this.handleCurrentChange(this.alreadmount_data[i])
-            //     }
-            // }
-          }else {
-            this.$message.error(res.data.msg);
-          }
+      })
+        .then(() => {
+          dispensingmedicine(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("操作成功");
+              this.gettodaynumber();
+              this.searchAction();
+              this.tableData = null;
+              this.fun4(tmp);
+              this.state = 2;
+              // console.log("this.alreadmount_data",this.alreadmount_data)
+              // for (let i = 0;i < this.alreadmount_data.length;i++){
+              //   console.log("tmp = ",tmp)
+              //     if (this.alreadmount_data[i].PatientID == tmp){
+              //       console.log("i = ",i)
+              //       this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
+              //       this.handleCurrentChange(this.alreadmount_data[i])
+              //     }
+              // }
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
         })
-      }).catch(() => {});
+        .catch(() => {});
     },
 
-    toSetting(){
-      getPharmacyConfig().then(response=>{
-        if(response.data.state == 1){
-          this.dialogVisible = true
-          var config = response.data.data.config
-          this.is_open = config.is_open.toString()
+    toSetting() {
+      getPharmacyConfig().then((response) => {
+        if (response.data.state == 1) {
+          this.dialogVisible = true;
+          var config = response.data.data.config;
+          this.is_open = config.is_open.toString();
         }
-      })
+      });
     },
-    SaveSetting(){
+    SaveSetting() {
       var params = {
-        is_open:parseInt(this.is_open),
-      }
-      SaveSetting(params).then(response=>{
-        if(response.data.state == 1){
-          var config = response.data.data.config
-          this.$message.success("保存成功!")
-          this.dialogVisible = false
+        is_open: parseInt(this.is_open),
+      };
+      SaveSetting(params).then((response) => {
+        if (response.data.state == 1) {
+          var config = response.data.data.config;
+          this.$message.success("保存成功!");
+          this.dialogVisible = false;
         }
-      })
+      });
     },
+
     // 药品退药
     endispense() {
       var tmp = this.currentRow.PatientID;
       var params = {
-        patient_id:this.currentRow.PatientID,
-        time:this.start_time,
+        patient_id: this.currentRow.PatientID,
+        time: this.start_time,
       };
       this.$confirm("确定是否对该药品进行退药?", "患者退药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      }).then(() => {
-        drugwithdrawal(params).then((res) => {
-          if(res.data.state == 1){
-            this.$message.success('操作成功');
-            this.gettodaynumber();
-            this.searchAction();
-            this.tableData = null;
-            this.fun4(tmp);
-            this.state = 1;
-          }else {
-            this.$message.error(res.data.msg);
-          }
+      })
+        .then(() => {
+          drugwithdrawal(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("操作成功");
+              this.gettodaynumber();
+              this.searchAction();
+              this.tableData = null;
+              this.fun4(tmp);
+              this.state = 1;
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          });
         })
-      }).catch(() => {});
+        .catch(() => {});
     },
   },
-
 };
 </script>
 
@@ -528,4 +561,29 @@ export default {
     justify-content: flex-end;
   }
 }
-</style>
+
+.el-input__inner{
+  padding-right: 15px;
+}
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 15px !important;
+  height: 15px !important;
+}
+</style>

src/xt_pages/Pharmacy/print/drugPrint.vue

@@ -9,10 +9,12 @@
       >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
+      <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} 领药单</div></div>
       <div class="list_title">
         <div>药品名称：{{name}}</div>
         <div>规格：{{specifications}}</div>
         <div>发药状态：{{state_name}}</div>
+        <div>日期：</div>
 <!--        <div v-if="state==2">领药人：</div>-->
       </div>
 
@@ -83,6 +85,7 @@ export default {
       name:"",
       specifications:"",
       state_name:"",
+      org_name: this.$store.getters.xt_user.org.org_name,
     };
   },
   props: {
@@ -147,10 +150,14 @@ export default {
       //     scanStyles: false,
       //   });
       this.printJson({
-        title: `<div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;">
+        title: `
+        <div>
+        <div style="width: 940px;text-align:center;font-size:16px;font-weight:bold;">${this.org_name} 领药单</div>
+        <div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;font-size:14px;">
         <div style="width: 230px;padding: 10px 0;">药品名称：${this.name}</div>
         <div style="width: 230px;padding: 10px 0;">规格：${this.specifications}</div>
         <div style="width: 230px;padding: 10px 0;">发药状态：${this.state_name}</div>
+        <div style="width: 230px;padding: 10px 0;">日期：</div>
         </div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
@@ -209,6 +216,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/ .el-dialog{
+  width: 60%;
+}
 .print_style {
   position: absolute;
   right: 10px;

src/xt_pages/Pharmacy/print/patientPrint.vue

@@ -9,9 +9,11 @@
       >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
+       <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} 发药单</div></div>
       <div class="list_title">
         <div>患者名称：{{name}}</div>
         <div>发药状态：{{state}}</div>
+        <div>日期：</div>
       </div>
 
       <el-table
@@ -21,47 +23,19 @@
         max-height="450"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
       >
-        <el-table-column type="index" prop="index" label="序号" width="60">
+        <el-table-column type="index" prop="index" label="序号" width="60" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="名称" width="160">
-          <template slot-scope="scope" >
-            <span>{{scope.row.Name ? scope.row.Name : ""}}</span>
-          </template>
+        <el-table-column prop="name" label="名称" width="160" align="center">
         </el-table-column>
-        <el-table-column prop="SingleDosage" label="单次用量" width="120">
-          <template slot-scope="scope" >
-            <span>{{scope.row.SingleDosage ? scope.row.SingleDosage : ""}}</span>
-          </template>
+        <el-table-column prop="SingleDosage" label="单次用量" width="120" align="center">
         </el-table-column>
-        <el-table-column prop="use" label="用法" width="120">
-          <template slot-scope="scope" >
-            <span>{{scope.row.Usage ? scope.row.Usage : ""}}</span>
-          </template>
+        <el-table-column prop="use" label="用法" width="120" align="center"> </el-table-column>
+        <el-table-column prop="frequency" label="频率" width="120" align="center">
         </el-table-column>
-        <el-table-column prop="frequency" label="频率" width="120">
-          <template slot-scope="scope" >
-            <span>{{scope.row.Frequency ? scope.row.Frequency : ""}}</span>
-          </template>
+        <el-table-column prop="day" label="天数" width="120" align="center"> </el-table-column>
+        <el-table-column prop="amount" label="总量" width="120" align="center">
         </el-table-column>
-        <el-table-column prop="day" label="天数" width="120">
-          <template slot-scope="scope" >
-            <span>{{scope.row.Days ? scope.row.Days : ""}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="amount" label="总量" width="120">
-          <template slot-scope="scope" >
-            <span>{{scope.row.Total ? scope.row.Total : ""}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tips" label="数据来源" width="120">
-          <template slot-scope="scope" >
-            <span>{{scope.row.DataSources ? scope.row.DataSources : ""}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tips" label="备注" width="120">
-          <template slot-scope="scope" >
-            <span>{{scope.row.Remarks ? scope.row.Remarks : ""}}</span>
-          </template>
+        <el-table-column prop="tips" label="备注" width="120" align="center">
         </el-table-column>
       </el-table>
     </div>
@@ -76,10 +50,11 @@ export default {
   data() {
     return {
       visibility: false,
-      tableData: [],
+      tableData: [{}],
       isClose:false,
       name:"",
       state:null,
+      org_name: this.$store.getters.xt_user.org.org_name,
     };
   },
   props: {
@@ -103,18 +78,8 @@ export default {
         }
       }
     },
-    show: function (val,data,state) {
+    show: function () {
       this.visibility = true;
-      console.log("val",val)
-      this.tableData = val
-      this.name = data.Name
-      if (state == 1){
-        this.state = "待发药"
-      }
-      if (state == 2){
-        this.state = "已发药"
-      }
-
     },
 
     comfirm: function (formName) {
@@ -138,57 +103,61 @@ export default {
       //     scanStyles: false,
       //   });
       this.printJson({
-        title: `<div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;">
-        <div style="width: 230px;padding: 10px 0;">患者名称：${this.name}</div>
-        <div style="width: 230px;padding: 10px 0;">发药状态：${this.state}</div>
+        title: `
+        <div>
+        <div style="width: 940px;text-align:center;font-size:16px;font-weight:bold;">${this.org_name} 发药单</div>
+        <div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;font-size:14px;">
+        <div style="width: 310px;padding: 10px 0;">患者名称：${this.name}</div>
+        <div style="width: 320px;padding: 10px 0;">发药状态：${this.state}</div>
+        <div style="width: 310px;padding: 10px 0;">日期：</div>
         </div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
         fields: [
           // 需要打印的字段
-
+          // "index",
           "Name",
           "SingleDosage",
-          "Usage",
-          "Frequency",
-          "Days",
-          "Total",
-          "DataSources",
-          "Remarks",
+          "use",
+          "frequency",
+          "day",
+          "amount",
+          "from",
+          "tips",
         ],
         properties: [
           // 需要打印的字段对应的表头名
-
+         
           {
-            field: "Name",
-            displayName: "姓名",
+            field: "name",
+            displayName: "名称",
           },
           {
             field: "SingleDosage",
-            displayName: "单次用量",
+            displayName: "单词用量",
           },
           {
-            field: "Usage",
+            field: "use",
             displayName: "用法",
           },
           {
-            field: "Frequency",
+            field: "frequency",
             displayName: "频率",
           },
           {
-            field: "Days",
+            field: "day",
             displayName: "天数",
           },
           {
-            field: "Total",
+            field: "amount",
             displayName: "总量",
           },
           {
-            field: "DataSources",
+            field: "from",
             displayName: "数据来源",
           },
           {
-            field: "Remarks",
+            field: "tips",
             displayName: "备注",
           },
         ],
@@ -198,11 +167,19 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style rel="stylesheet/css" lang="scss" scoped>
+/deep/ .el-dialog{
+  width: 60%;
+}
+
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
 .print_style {
   position: absolute;
-  right: 10px;
-  top: 42px;
+  right: 65px;
+  top: 50px;
 }
 
 .list_title {
@@ -212,8 +189,34 @@ export default {
   margin: 30px auto;
 
   div {
-    width: 230px;
+    width: 320px;
     padding: 10px 0;
   }
 }
+
 </style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/data/components/addDrugs.vue

@@ -41,7 +41,7 @@
                         </div>
                         <div style="width:100%;display:flex;align-items:center;margin-left:120px;">
                             <el-form-item prop="dose" class="noMargin">
-                              <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" placeholder="剂量" ></el-input>
+                              <el-input v-model="form.dose"  style="width:100px;margin-right:5px;" placeholder="剂量" ></el-input>
                             </el-form-item>
                             <el-form-item prop="dose_unit" class="noMargin">
                               <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位">

src/xt_pages/data/components/drugs.vue

@@ -92,7 +92,7 @@
       <el-table-column prop="date" label="单位&规格" align="center">
         <template slot-scope="scope">
           <div>
-            <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+            <span>{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
           </div>
         </template>
       </el-table-column>

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -857,7 +857,7 @@
                 </tr>
                 <tr>
                   <td style="width:60px" rowspan="2">时间</td>
-                  <td colspan="4">透析参数</td>
+                  <td colspan="5">透析参数</td>
                   <td colspan="5">生命体征</td>
                   <td colspan="2">治疗中病情变化</td>
                   <td style="width:80px" rowspan="2">护士签名</td>
@@ -879,6 +879,10 @@
                     <p style="height:20px;line-height:20px">脱水量</p>
                     <p style="height:20px;line-height:20px">ml</p>
                   </th>
+                  <th style="width: 70px">
+                    <p style="height: 20px; line-height: 20px">KT/V</p>
+                    <p style="height: 20px; line-height: 20px">&nbsp;</p>
+                  </th>
                   <th style="width:30px">
                     <p style="height:20px;line-height:20px">T</p>
                     <p style="height:20px;line-height:20px">℃</p>
@@ -949,6 +953,15 @@
                       }}
                     </span>
                   </td>
+                  <td>
+                    <span v-if="getTime(monitor.operate_time) != ''">
+                      {{
+                        monitor.ktv
+                        ? monitor.ktv
+                        : ""
+                      }}
+                    </span>
+            </td>
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{ monitor.temperature ? monitor.temperature : "0" }}

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.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 10307 || 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.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10307 || 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/dialysisPrescriptionDialog.vue

@@ -82,7 +82,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.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.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249)">
+                            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.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -93,7 +93,7 @@
 
 
                     <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.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.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249">
+                            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.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"

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

@@ -233,6 +233,7 @@
                 template_id == 51 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -287,6 +288,7 @@
               template_id != 51 &&
               template_id != 53 &&
               template_id != 54 &&
+              template_id != 56 &&
               org_id!= 10210 &&
               org_id != 9555
             "
@@ -334,6 +336,7 @@
                 template_id == 48 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 template_id == 47)
             "
           >
@@ -378,6 +381,7 @@
               template_id != 46 &&
               template_id != 53 &&
               template_id != 54 &&
+              template_id != 56 &&
               template_id != 48 &&
               template_id != 47
             "
@@ -436,6 +440,7 @@
                 template_id == 48 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 template_id == 47)
             "
           >
@@ -460,6 +465,7 @@
               template_id != 48 &&
               template_id != 53 &&
               template_id != 54 &&
+              template_id != 56 &&
               template_id != 47
             "
           >
@@ -501,6 +507,7 @@
                 template_id == 29 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 template_id == 48)
             "
           >
@@ -529,6 +536,7 @@
               template_id != 43 &&
               template_id != 53 &&
               template_id != 54 &&
+              template_id != 56 &&
               template_id != 48
             "
           >
@@ -1017,6 +1025,7 @@
                 template_id == 48 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 template_id == 47)
             "
           >
@@ -1055,6 +1064,7 @@
               template_id != 48 &&
               template_id != 53 &&
               template_id != 54 &&
+              template_id != 56 &&
               template_id != 47
             "
           >
@@ -1100,6 +1110,7 @@
                 template_id == 51 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -1146,6 +1157,7 @@
               template_id == 48 &&
               template_id == 53 &&
               template_id == 54 &&
+              template_id == 56 &&
               org_id !=  10210 &&
               org_id != 9555
             "
@@ -1182,6 +1194,7 @@
               template_id != 47 &&
               template_id != 48 &&
               template_id != 54 &&
+              template_id != 56 &&
               template_id != 53
             "
           >
@@ -1203,6 +1216,7 @@
                 template_id == 47 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 template_id == 48)
             "
           >
@@ -1229,6 +1243,7 @@
               template_id != 46 &&
               template_id != 53 &&
               template_id != 54 &&
+              template_id != 56 &&
               template_id != 48
             "
           >
@@ -1252,6 +1267,7 @@
                 template_id == 46 ||
                 template_id == 53 ||
                 template_id == 54 ||
+                template_id == 56 ||
                 template_id == 48)
             "
           >

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,17 +14,17 @@
           <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 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54)" 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 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54 && 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 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53)" 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 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53" 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 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56)" 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 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56 && 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 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56)" 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 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56" 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 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53  || template_id == 54) " 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 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53 && template_id != 54" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56) " 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 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56)" 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/index.vue

@@ -17,13 +17,13 @@
           @click="next"
           >下一位</el-button
         >
-        <el-button
+        <!-- <el-button
           size="small"
           type="primary"
           @click="printOrderOne"
           icon="el-icon-printer"
-          >打印上机单</el-button
-        >
+          >打印上机单</el-button> -->
+
         <el-button
           size="small"
           type="primary"
@@ -214,7 +214,7 @@
         </el-tab-pane>
       </el-tabs>
 
-     
+
 
         <el-dialog
                 :visible.sync="startVisibility"
@@ -237,8 +237,7 @@
              <div v-for="(main_collection,index) in printList" :key="index">
               <div class="signPrint" style="font-size:16px;">
                 <div style="margin-left:50px;">姓名:
-                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
-                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
+                  <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
                 </div>
                 <div class="printCell">
@@ -248,12 +247,12 @@
                     <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
                     <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
                   </span>
-                  <span> </span>
+                  <span>{{ printDate }}</span>
                 </div>
                 <div class="printCell">
                    <span>干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
                     <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
-                 
+
                 </div>
                 <div class="printCell">
                   <span>净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
@@ -290,7 +289,7 @@
                    </span>
                 </div>
                 <div class="printCell">
-                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after).toFixed(2) }}Kg</span>
+                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
                  维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg/h
@@ -371,7 +370,6 @@
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="startVisibility = false">取 消</el-button>
-        <el-button type="primary" @click="startVisibility = false">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -858,9 +856,12 @@ export default {
       startVisibility:false,
       printList:[],
       anticoagulants_confit:null,
+      printDate:'',
+      assessmentAfterDislysis:{},
     }
   },
   created() {
+   this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
     if(this.$route.query.showView){
       this.showView = this.$route.query.showView
     }
@@ -903,7 +904,7 @@ export default {
     };
     this.websocketSend(this.initData)
     this.getInitData()
-    this.getInitPrintData()
+
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
   },
   beforeMount() {
@@ -1173,11 +1174,11 @@ export default {
           }
 
           var solution = resp.data.solution // 透析方案
-         
+
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
 
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-        
+
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
@@ -1230,7 +1231,7 @@ export default {
           var system_prescribe = resp.data.system_prescribe
 
           var lastAssessment =  resp.data.lastAssessment
-         
+
           this.$refs.nav.setLastRecord(
             lastPredialysisEvaluation,
             lastMonitorRecord,
@@ -1320,12 +1321,12 @@ export default {
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
-        
+
           this.his_doctor_advices = his_doctor_advices
           this.his_is_open = resp.data.is_open_config.is_open
 
           this.is_advice_open = resp.data.is_advice_open.is_advice_open
-          
+
           var stockType =  resp.data.stockType
           this.stockType = stockType
 
@@ -1336,7 +1337,7 @@ export default {
           }else{
             this.preparestock = []
           }
-    
+
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }
@@ -1400,7 +1401,8 @@ export default {
       )
     },
     printOrderOne(){
-      this.startVisibility = true
+      this.getInitPrintData()
+
     },
     // 日期
     handleScheduleDateChange: function(index) {
@@ -1524,7 +1526,7 @@ export default {
           //   }
           // }
 
-         
+
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
           if (this.activeName == 'first') {
@@ -1552,7 +1554,7 @@ export default {
           })
           this.tableData = newArr
           this.getData()
-         
+
         } else {
           this.$message.error(resp.msg)
         }
@@ -1725,13 +1727,13 @@ export default {
           for (let j = 0; j < patientArr[i].schedules.length; j++) {
             if (patientArr[i].schedules.length > 0 && patientArr[i].schedules[j].dialysis_order == null) {
               // 删除元素后改变i的值
-              
+
               patientArr[i].schedules.splice(j--, 1)
             }
           }
         }
         let arr1 = []
-     
+
         // let patientArr =
         if (this.patientStateVal == 0) {
           arr1 = patientArr
@@ -1746,7 +1748,7 @@ export default {
               }
             }
           }
-         
+
           arr1 = arr
         } else if (this.patientStateVal == 2) {
           let arr = []
@@ -1759,7 +1761,7 @@ export default {
               }
             }
           }
-         
+
           arr1 = arr
         } else if (this.patientStateVal == 3) {
           let arr = []
@@ -1785,7 +1787,7 @@ export default {
               }
             }
           }
-      
+
           arr1 = arr
         }
 
@@ -1809,7 +1811,7 @@ export default {
           arr = JSON.parse(JSON.stringify(arr1))
           for (let i = 0; i < arr.length; i++) {
             for (let j = 0; j < arr[i].schedules.length; j++) {
-             
+
               if(arr[i].schedules[j].doctor_advice.length == 0){
                 arr[i].schedules.splice(j--, 1)
               }
@@ -1918,7 +1920,7 @@ export default {
       }
     },
     websocketMess() {
-     
+
       this.websocket.onmessage = e => {
         let res = JSON.parse(e.data);
         // let res = re.data;
@@ -1967,7 +1969,7 @@ export default {
                   calledArr.push(item)
               }
           })
-    
+
           this.waitingCalled = waitingCalledArr
           this.called = calledArr
         }else if(res.channel == 'allQueueList'){
@@ -2024,7 +2026,7 @@ export default {
       let org_id =  parseInt(sessionStorage.getItem("org_id"));
       let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
       axios.get('/api/index/callpatient?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id).then(res => {
-       
+
         // let patientArr = res.data.queue_list.data
         // this.patientArr = patientArr
         // this.$emit('child-event',this.patientArr)
@@ -2086,7 +2088,7 @@ export default {
       }else {
         schedule_type = 2
       }
-     
+
       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 + '&schedule_type=' + schedule_type).then(res => {
@@ -2150,7 +2152,7 @@ export default {
           documentTitle: '  ',
           style: style1,
           scanStyles: false
-        }) 
+        })
       },
     getInitPrintData(){
        var params = {
@@ -2160,8 +2162,11 @@ export default {
       getInitPrintData(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+          var assessmentAfterDislysis =  response.data.data.assessmentAfterDislysis
           console.log("list2332322332",list)
           this.printList = list
+          this.assessmentAfterDislysis = assessmentAfterDislysis
+          this.startVisibility = true
         }
       })
     }

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -559,7 +559,7 @@ export default {
             
             if(project_config.is_open == 1){
               this.project = resp.data.project
-              console.log( this.project)
+              console.log("wode 2o2o3o3o23o32o32o23o32o32o", this.project)
              
               let projectArr = []
               if(this.org_id!= 10318){
@@ -570,7 +570,7 @@ export default {
                     }
                   })
                 })
-                
+                console.log("projectArr2332323232323232",projectArr)
                  resp.data.hisAdvices.map((item,index) => {
                   if(projectArr[index].project && projectArr[index].project.length > 0){
                      projectArr[index].project.map(it => {
@@ -598,10 +598,8 @@ export default {
                     })
                   }
                 })
+                console.log("hh3oo1o3o123o3oo312o132o312o31o132o",resp.data.hisAdvices)
               }
-            
-             
-
             }
            
            if(config.is_open == 0 || config.is_open == 2){

src/xt_pages/dialysis/dialysisPage.vue

@@ -648,7 +648,7 @@
                     <p>{{ DialysisPrescriptionComfirmUserName }}</p>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="commitDialysisPrescriptionAndOther">提交并设为长期处方</el-button>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="commitDialysisPrescription">提交</el-button>
-                    <el-button type="primary" @click="printDan">打印上机单</el-button>
+                    <!-- <el-button type="primary" @click="printDan">打印上机单</el-button> -->
                   </el-form-item>
                 </el-col>
 

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -688,6 +688,34 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="
+          org_template_info.template_id == 55
+        "
+      >
+        <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 == 56
+        "
+      >
+        <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"-->
@@ -846,7 +874,7 @@
             v-if="org_template_info.template_id == 5"
           >
           </DialysisPrintOrderFive>
-
+                                  
           <DialysisPrintOrderSix
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 6"
@@ -1089,6 +1117,16 @@
             v-if="org_template_info.template_id == 54"
           >
           </DialysisPrintOrderFiftyFour>
+           <DialysisPrintOrderFiftyfive
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 55"
+          >
+          </DialysisPrintOrderFiftyfive>
+          <DialysisPrintOrderFiftySix
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 56"
+          >
+          </DialysisPrintOrderFiftySix>
           
         </div>
       </el-container>
@@ -1161,10 +1199,14 @@ import DialysisPrintOrderFifty from "./template/DialysisPrintOrderFifty";
 import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
 import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo";
 import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree";
-import DialysisPrintOrderFiftyFour from "./template/DialysisPrintOrderFiftyFour"
+import DialysisPrintOrderFiftyFour from "./template/DialysisPrintOrderFiftyFour";
+import DialysisPrintOrderFiftyfive from "./template/DialysisPrintOrderFiftyfive"
+import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix"
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftySix,
+    DialysisPrintOrderFiftyfive,
     DialysisPrintOrderFiftyFour,
     DialysisPrintOrderFiftyThree,
     DialysisPrintOrderFiftyTwo,
@@ -1379,7 +1421,7 @@ export default {
         '@media print {.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 20px 20px 20px}.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:25px;font-size:14px}.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;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
         // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.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;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.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;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
       const style3 =
         '@media print {.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 20px 20px 20px}.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:25px;font-size:16px;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 #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
@@ -1402,8 +1444,8 @@ export default {
       // 三明曙光样式
       const style11 =
         '@media print {.dialysis-print-order{width:960px;margin:100px 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:30px;padding:10px 20px 20px 20px}.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:25px;font-size:15px}.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;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
-      // 漳浦天福样式
-      const style12 ='@page {margin-top:5px;}@media print {.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 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .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;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
+      // 雷州惠爱样式
+      const style12 ='@page {margin-top:5px;}@media print {.dialysis-print-order{width:960px;margin:0 auto;margin-top:50px;} .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 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .dialysis-print-order .print-table .short_tr th p{height:20px !important; line-height:20px !important;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .td_div1{display:flex;white-space: normal;} .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;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-table tr th p{height: 20px; line-height: 20px}  .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;} ';
       // 金乡宏大样式
       const style13 ='@page {margin-top:5px;}@media print {.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 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .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;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
 
@@ -1762,6 +1804,24 @@ export default {
           style: style13,
           scanStyles: false,
         });
+      }else if (
+        this.org_template_info.template_id == 55
+      ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+      }else if (
+        this.org_template_info.template_id == 56
+      ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -324,14 +324,14 @@
               医师签名：
               <span
                 style="height: 20px"
-                v-if="setAdminUserES(prescription.creater) == ''"
+                v-if="setAdminUserES(prescription.modifier) == ''"
               >
-                {{ getAdminUser(prescription.creater) }}
+                {{ getAdminUser(prescription.modifier) }}
               </span>
               <img
                 class="es-img"
                 style="height: 25px"
-                :src="setAdminUserES(prescription.creater)"
+                :src="setAdminUserES(prescription.modifier)"
                 alt
                 srcset
                 v-else

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -186,12 +186,7 @@
           </span>
           <span style="position: absolute; top: 235px; left: 250px">
             <span v-if="zhongwen.indexOf('仟') > -1">
-              {{
-                zhongwen.substring(
-                  zhongwen.indexOf("仟") - 1,
-                  zhongwen.indexOf("仟")
-                )
-              }}
+              {{zhongwen.substring(zhongwen.indexOf("仟") - 1,zhongwen.indexOf("仟"))}}
             </span>
             <span v-else>零</span>
           </span>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -420,7 +420,7 @@ export default {
               this.balanceAccounts.order_info.map((item) => {
                 if (item.advice_id > 0) {
                   obj.details.push(item);
-                  obj.total += item.pric * item.advice.prescribing_number;
+                  obj.total += item.pric.toFixed(2) * item.advice.prescribing_number
                   num++;
                 } else {
                   if (item.project.type == 2) {

src/xt_pages/outpatientCharges/summary.vue

@@ -1234,7 +1234,7 @@ export default {
         number: obj.mdtrt_id,
         name: obj.patient.name,
         age: obj.age,
-        gend: obj.gend,
+        gend: obj.patient.gender,
         setl_time: obj.setl_time,
         chargeName: this.getName(obj.creator),
       };

src/xt_pages/stock/query/expiryDateQuery.vue

@@ -0,0 +1,7 @@
+<template>
+  <div class="main-contain">
+     <div class="app-container ">
+       有效期 库存查询喔喔喔
+     </div>
+  </div>
+</template>

src/xt_pages/stock/query/goodNewQuery.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="main-contain">
+     <div class="app-container ">
+        <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+         <div>
+          <span>仓库:</span>
+          <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeStorehouseName">
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.storehouse_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <span>库存预警:</span>
+          <el-select v-model="good_id" style="width:250px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeGoodName">
+            <el-option
+              v-for="item in goodList"
+              :key="item.id"
+              :label="item.good_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+         </div>
+        </div>
+
+           <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+          >
+            <el-table-column label="耗材类型" align="center">
+              <template slot-scope="scope">
+                
+            </template>
+            </el-table-column>
+            <el-table-column label="耗材名称" align="center">
+              <template slot-scope="scope">
+               
+              </template>
+            </el-table-column>
+            <el-table-column label="规格&单位" align="center">
+                <template slot-scope="scope">
+                  
+                </template>
+            </el-table-column>
+            <el-table-column label="生产厂商" align="center">
+                <template slot-scope="scope">
+                 
+                </template>
+            </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+               
+              </template>
+            </el-table-column>
+            <el-table-column label="仓库名称" align="center">
+              <template slot-scope="scope">
+             
+              </template>
+            </el-table-column>
+        
+    
+            <el-table-column label="入库量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="出库量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="退库数量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+             <el-table-column label="实际出库" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="剩余库存" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总库存量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+           
+            <el-table-column label="操作" align="center">
+             
+              <template slot-scope="scope">
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="toClick(scope.row)"
+                >库存流水
+                </el-button>
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="toClickOne(scope.row)"
+                >批次
+                </el-button>
+               </template>
+            </el-table-column>
+
+          </el-table>
+     </div>
+
+  </div>
+</template>
+<script>
+export default {
+
+  data(){
+    return{
+     tableList:[],
+     goodList:[],
+     houseList:[],
+     storehouse_id:0,
+     good_id:0,
+     multipleSelection: [],
+     signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+     manufacturerList:[],
+    }
+  
+  },
+  methods:{
+    changeStorehouseName(){
+
+    },
+    changeGoodName(){
+
+    },
+    toClick(val){
+       var manufacturer_name = ""
+       var specification_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+       }
+      specification_name = val.specification_name + "/" + val.packing_unit
+      var overCount  = this.getOverplus(val.xt_warehouse_info)
+      // window.sessionStorage.setItem('start_time',this.start_time)
+      // window.sessionStorage.setItem('end_time',this.end_time)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+    },
+    toClickOne(val){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+       }
+      specification_name = val.specification_name + "/" + val.packing_unit
+      var overCount  = this.getOverplus(val.xt_warehouse_info)
+      // window.sessionStorage.setItem('start_time',this.start_time)
+      // window.sessionStorage.setItem('end_time',this.end_time)
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+    },
+  }
+}
+</script>
+

src/xt_pages/stock/query/patientQuery.vue

@@ -0,0 +1,7 @@
+<template>
+  <div class="main-contain">
+     <div class="app-container ">
+       患者查询 库存查询喔喔喔
+     </div>
+  </div>
+</template>

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -0,0 +1,7 @@
+<template>
+  <div class="main-contain">
+     <div class="app-container ">
+        进销存 库存查询喔喔喔
+     </div>
+  </div>
+</template>

src/xt_pages/stock/stockNewQuery.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+     
+    </div>
+     <div class="app-container ">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="库存查询" name="first">
+              <GoodNewQuery></GoodNewQuery>
+            </el-tab-pane>
+            <el-tab-pane label="进销存查询" name="second">
+               <PurchaseStockQuery></PurchaseStockQuery>
+           </el-tab-pane>
+            <el-tab-pane label="有效期查询" name="third">
+                <expiryDateQuery></expiryDateQuery>
+            </el-tab-pane>
+            <el-tab-pane label="患者查询" name="fourth">
+                <patientQuery></patientQuery>
+            </el-tab-pane>
+        </el-tabs>
+     </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import GoodNewQuery from "@/xt_pages/stock/query/goodNewQuery"
+import ExpiryDateQuery from "@/xt_pages/stock/query/expiryDateQuery"
+import PurchaseStockQuery from "@/xt_pages/stock/query/purchaseStockQuery"
+import PatientQuery from "@/xt_pages/stock/query/patientQuery"
+export default {
+  name: "stockNewQuery",
+  
+  components: {
+    BreadCrumb,
+    GoodNewQuery,
+    ExpiryDateQuery,
+    PurchaseStockQuery,
+    PatientQuery
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/query", name: "库存查询" }
+      ],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      activeName: 'first'
+    };
+  },
+  methods:{
+    handleClick(){
+        
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+/* 合并表格线样式 */
+
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+  /* height: 44px; */
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+  min-height: 44px;
+}
+.spanClass .cell tr:last-of-type td{
+  border-bottom: none;
+}
+
+</style>