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

package-lock.json

@@ -36,6 +36,21 @@
         "@babel/types": "7.0.0-beta.31"
       }
     },
+    "@babel/runtime": {
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
+      "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
+      "requires": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+          "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+        }
+      }
+    },
     "@babel/template": {
       "version": "7.0.0-beta.31",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.31.tgz",
@@ -122,6 +137,12 @@
         "moment": "*"
       }
     },
+    "@types/raf": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz",
+      "integrity": "sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==",
+      "optional": true
+    },
     "JSV": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
@@ -483,8 +504,7 @@
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
     },
     "autoprefixer": {
       "version": "7.2.3",
@@ -1474,6 +1494,11 @@
         }
       }
     },
+    "base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
+    },
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
@@ -1723,6 +1748,11 @@
         "electron-to-chromium": "^1.3.30"
       }
     },
+    "btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+    },
     "buffer": {
       "version": "4.9.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -1915,6 +1945,36 @@
       "integrity": "sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==",
       "dev": true
     },
+    "canvg": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
+      "integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
+      "optional": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@types/raf": "^3.4.0",
+        "core-js": "^3.8.3",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.7",
+        "rgbcolor": "^1.0.1",
+        "stackblur-canvas": "^2.0.0",
+        "svg-pathdata": "^6.0.3"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.32.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
+          "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
+          "optional": true
+        },
+        "regenerator-runtime": {
+          "version": "0.13.11",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+          "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+          "optional": true
+        }
+      }
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -2794,6 +2854,14 @@
       "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true
     },
+    "css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "requires": {
+        "utrie": "^1.0.2"
+      }
+    },
     "css-loader": {
       "version": "0.28.7",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
@@ -3195,8 +3263,7 @@
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
     },
     "deep-is": {
       "version": "0.1.3",
@@ -3451,6 +3518,12 @@
         "domelementtype": "1"
       }
     },
+    "dompurify": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz",
+      "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==",
+      "optional": true
+    },
     "domready": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz",
@@ -4362,6 +4435,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
+    "fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -4388,6 +4466,11 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "fflate": {
+      "version": "0.4.8",
+      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz",
+      "integrity": "sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA=="
+    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -4759,7 +4842,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4782,13 +4866,15 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4804,19 +4890,22 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4946,7 +5035,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4960,6 +5050,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4976,6 +5067,7 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4983,13 +5075,15 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5010,6 +5104,7 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5097,7 +5192,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5111,6 +5207,7 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5205,7 +5302,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5247,6 +5345,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5268,6 +5367,7 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5315,13 +5415,15 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5834,6 +5936,32 @@
         }
       }
     },
+    "html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "requires": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      }
+    },
+    "html2pdf.js": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/html2pdf.js/-/html2pdf.js-0.10.1.tgz",
+      "integrity": "sha512-3onwwhOWsZfNjIZwV6YIJ6FVhXk+X9YxHSqzeS6hup+1dGi2DHI+zZYUJ+iFnvtaYcjlhyrILL1fvRCUOa8Fcg==",
+      "requires": {
+        "es6-promise": "^4.2.5",
+        "html2canvas": "^1.0.0",
+        "jspdf": "^2.3.1"
+      },
+      "dependencies": {
+        "es6-promise": {
+          "version": "4.2.8",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+          "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+        }
+      }
+    },
     "htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -6734,6 +6862,29 @@
         "nomnom": "^1.5.x"
       }
     },
+    "jspdf": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.1.tgz",
+      "integrity": "sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==",
+      "requires": {
+        "@babel/runtime": "^7.14.0",
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "canvg": "^3.0.6",
+        "core-js": "^3.6.0",
+        "dompurify": "^2.2.0",
+        "fflate": "^0.4.8",
+        "html2canvas": "^1.0.0-rc.5"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.32.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz",
+          "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==",
+          "optional": true
+        }
+      }
+    },
     "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -8352,6 +8503,11 @@
         "no-case": "^2.2.0"
       }
     },
+    "parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+    },
     "parse-asn1": {
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
@@ -11410,6 +11566,56 @@
       "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
       "dev": true
     },
+    "quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "requires": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+        },
+        "eventemitter3": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+          "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+        }
+      }
+    },
+    "quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "requires": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      }
+    },
+    "quill-image-extend-module": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/quill-image-extend-module/-/quill-image-extend-module-1.1.2.tgz",
+      "integrity": "sha512-yHJWZWlTjNZzV34zuT4H55ttDwMxmVJ7JUgKnt/Wd3ejUNcaPOV57/sKG8VEMU5mL7bKZPIKmBdb3weM0M5UeA==",
+      "dev": true
+    },
+    "raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "optional": true,
+      "requires": {
+        "performance-now": "^2.1.0"
+      }
+    },
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -11904,6 +12110,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "rgbcolor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
+      "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
+      "optional": true
+    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -12954,6 +13166,12 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "stackblur-canvas": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.6.0.tgz",
+      "integrity": "sha512-8S1aIA+UoF6erJYnglGPug6MaHYGo1Ot7h5fuXx4fUPvcvQfcdw2o/ppCse63+eZf8PPidSu4v1JnmEVtEDnpg==",
+      "optional": true
+    },
     "stackframe": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
@@ -13398,6 +13616,12 @@
         }
       }
     },
+    "svg-pathdata": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
+      "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
+      "optional": true
+    },
     "svg-sprite-loader": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/svg-sprite-loader/-/svg-sprite-loader-3.5.2.tgz",
@@ -13496,6 +13720,14 @@
         "inherits": "2"
       }
     },
+    "text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "requires": {
+        "utrie": "^1.0.2"
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -14070,6 +14302,14 @@
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
+    "utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "requires": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
     "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -14196,6 +14436,15 @@
       "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.0.8.tgz",
       "integrity": "sha512-OKdWOwCLXiDGHVaYqWZXx4s2YNqOmfIqFMTd0Y3SzCcFIp19d7UeLB4UVZvIHammzMX4qrQ3yAzNHJmE0ApgHA=="
     },
+    "vue-quill-editor": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
+      "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "quill": "^1.3.4"
+      }
+    },
     "vue-router": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz",

package.json

@@ -5,7 +5,6 @@
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",
   "scripts": {
-
     "dev": "cross-env BABEL_ENV=development webpack-dev-server  --inline --progress --config build/webpack.dev.conf.js ",
     "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
     "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
@@ -51,9 +50,12 @@
     "element-ui": "^2.13.2",
     "file-saver": "^1.3.8",
     "font-awesome": "4.7.0",
+    "html2canvas": "^1.4.1",
+    "html2pdf.js": "^0.10.1",
     "js-cookie": "2.2.0",
     "jsbarcode": "^3.11.5",
     "jsonlint": "1.6.3",
+    "jspdf": "^2.5.1",
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
@@ -74,6 +76,7 @@
     "vue-count-to": "1.0.13",
     "vue-i18n": "7.3.2",
     "vue-multiselect": "2.0.8",
+    "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.1",
     "vue-splitpane": "1.0.2",
     "vuedraggable": "^2.16.0",
@@ -115,6 +118,7 @@
     "postcss-loader": "2.0.9",
     "postcss-url": "7.3.0",
     "qiniu-webpack-plugin": "^0.4.2",
+    "quill-image-extend-module": "^1.1.2",
     "rimraf": "2.6.2",
     "sass-loader": "^6.0.7",
     "sass-resources-loader": "^1.3.4",

src/api/dialysis.js

@@ -457,3 +457,56 @@ export function saveInformation(params){
     params:params
   })
 }
+
+
+export function getPatientList(keyword,params){
+   console.log("paramswoowwo",params)
+  return request({
+    url:"/api/patient/getpatientlist?keyword="+keyword,
+    method:"get",
+    params:params
+  })
+}
+
+export function getPrescriptionLogList(params){
+  
+  return request({
+    url:"/api/patient/getprescriptionloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getBeforLogList(params){
+ 
+  return request({
+    url:"/api/patient/getbeforloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getDocLogLogList(params){
+  return request({
+    url:"/api/patient/getdocloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getMonitorLogList(params){
+  return request({
+    url:"/api/patient/getmonitorloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getAferLogList(params){
+
+  return request({
+    url:"/api/patient/getafterloglist",
+    method:"get",
+    params:params,
+  })
+}

src/api/patient.js

@@ -246,9 +246,9 @@ export function deleteRescueRecords(patient_id, ids_str) {
   })
 }
 
-export function EditLapseto(patient_id, data) {
+export function EditLapseto(patient_id, data,start_time,end_time,address) {
   return request({
-    url: '/api/patients/lapseto/edit?id=' + patient_id,
+    url: '/api/patients/lapseto/edit?id=' + patient_id+"&start_time="+start_time+"&end_time="+end_time+"&patient_address="+address,
     method: 'post',
     data: data
   })
@@ -767,4 +767,31 @@ export function getPatientAllagic(id,params){
     method:"get",
     params:params
   })
+}
+
+export function saveSitemap(data){
+  
+  return request({
+    url:"/api/patient/savesitemap",
+    method:"Post",
+    data:data,
+  })
+}
+
+export function getPatientSitemap(patient_id,params){
+  
+  return request({
+    url:"/api/patient/getpatientsitemap?patient_id="+patient_id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function updateSiteMap(data){
+   
+  return request({
+    url:"/api/patient/updatesitemap",
+    method:"Post",
+    data:data,
+  })
 }

src/api/role/admin.js

@@ -185,4 +185,101 @@ export function toTestThrityMent(params){
     method:"Get",
     params:params,
   })
+}
+
+
+export function saveEnterprise(data){
+  
+  return request({
+    url:"/api/sign/saveenerprise",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getEnterPriseById(params){
+  return request({
+    url:"/api/sign/getenerprisebyid",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getMobileCode(params){
+   return request({
+    url:"/api/sign/getmobilecode",
+    method:"Get",
+    params:params,
+   })
+}
+
+export function savePersionEnterPrise(data){
+  return request({
+    url:"/api/sign/getpersionenterprise",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getPerseEnterPriseById(admin_user_id,params){
+  
+  return request({
+    url:"/api/sign/getpersenterprisebyid?admin_user_id="+admin_user_id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function CreatePersionSeal(admin_user_id,params){
+
+  return request({
+    url:"/api/device/sign/creterpersionseal?admin_user_id="+admin_user_id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function CreateNewEnterPrise(admin_user_id,params){
+ 
+   return request({
+     url:"/api/device/sign/createnewenterprise?admin_user_id="+admin_user_id,
+     method:"Get",
+     params:params,
+   })
+}
+
+export function toTestThrity(params){
+
+   return request({
+    url:"/api/device/contractid",
+    method:"Get",
+    params:params
+   })
+}
+
+export function toEndEnterPrise(params){
+  
+  return request({
+    url:"/api/device/endenterprise",
+    method:"get",
+    params:params
+  })
+}
+
+export function getEnterPriseDetail(params){
+
+  return request({
+    url:"/api/device/getenterprisedetail",
+    method:"get",
+    params:params
+  })
+}
+
+export function UploadPrintOrder(data){
+  
+  return request({
+    url:"/api/device/uploadprintorder",
+    method:"Post",
+    data:data,
+  })
 }

src/lang/en.js

@@ -83,6 +83,7 @@ export default {
     dialysisRecord: 'dialysisRecord',
     dialysisInfo:'dialysisInfo',
     dialysis_index:'dialysis_index',
+    log_index:'log_index',
     scheduling: 'scheduling',
     device: 'Device',
     deviceManage: 'Device Manage',

src/lang/zh.js

@@ -297,6 +297,7 @@ export default {
     zeroSummary: '零用明细汇总',
     hospitalhistory: '住院历史',
     dialysis_index:'信息归档',
+    log_index:"日志查询",
     objectRegistration:"医疗器械登记",
     Dialysisanalysis: '专业质控'
   },

src/router/index.js

@@ -10,6 +10,7 @@ import patient from './modules/patient'
 import qcd from './modules/qcd'
 import Dialysisanalysis from './modules/Dialysisanalysis'
 import DialysisIndex from './modules/dialysisIndex'
+import DialysisLogIndex from './modules/logIndex'
 import stock from './modules/stock'
 import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'
@@ -206,6 +207,7 @@ var _asy_router_map = [
   supply,
   Dialysisanalysis,// 新菜单6.1
   DialysisIndex,
+  DialysisLogIndex,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/modules/logIndex.js

@@ -0,0 +1,19 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+ 
+  path: '/log_index',
+  component: Layout,
+  name:'log_index',
+  redirct: '/dialysis/dialysisLogIndex',
+  children: [{
+    path: '/dialysis/dialysisLogIndex',
+    component: () => import('@/xt_pages/log/index'),
+    name: '日志查询',
+    meta: {
+      title: '日志查询',
+      noCache: true
+    }
+  },]
+ 
+}

src/router/modules/patient.js

@@ -74,6 +74,7 @@ export default {
       noCache: true
     }
   },
+  
 
   {
     path: '/patients/patient/:mid/vascularAccessDetail/:pid',
@@ -324,157 +325,169 @@ export default {
       noCache: true
     }
   },
-  // {//评估工具/跌倒评估
-  //   path: '/patients/patient/:id/Fallassessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'Fallassessment',
-  //   meta: {
-  //     title: 'firstDiseasePrint',
-  //     noCache: true
-  //   }
-  // },
-  // {//小儿跌倒风险评估
-  //   path: '/patients/patient/:id/pediatricFallAssessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'pediatricFallAssessment',
-  //   meta: {
-  //     title: 'pediatricFallAssessment',
-  //     noCache: true
-  //   }
-  // },
-  // {//压疮风险评估
-  //   path: '/patients/patient/:id/pressuresore',
-  //   component: () => import('@/xt_pages/user/evaluationtool/pressuresore'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'pressuresore',
-  //   meta: {
-  //     title: 'pressuresore',
-  //     noCache: true
-  //   }
-  // },
-  // {//oh压疮评估
-  //   path: '/patients/patient/:id/OHpressuresore',
-  //   component: () => import('@/xt_pages/user/evaluationtool/OHpressuresore'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'OHpressuresore',
-  //   meta: {
-  //     title: 'OHpressuresore',
-  //     noCache: true
-  //   }
-  // },
-  // {//日常生活能力评估
-  //   path: '/patients/patient/:id/dailyLife',
-  //   component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'dailyLife',
-  //   meta: {
-  //     title: 'dailyLife',
-  //     noCache: true
-  //   }
-  // },
-  // {//导管脱落风险评估
-  //   path: '/patients/patient/:id/Cathetershedding',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Cathetershedding'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'Cathetershedding',
-  //   meta: {
-  //     title: 'Cathetershedding',
-  //     noCache: true
-  //   }
-  // },
-  // {//RASS及疼痛评估
-  //   path: '/patients/patient/:id/RassAssessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/RassAssessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'RassAssessment',
-  //   meta: {
-  //     title: 'RassAssessment',
-  //     noCache: true
-  //   }
-  // },
-  // {//营养状况评估
-  //   path: '/patients/patient/:id/nourishmentAssessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/nourishmentAssessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'nourishmentAssessment',
-  //   meta: {
-  //     title: 'nourishmentAssessment',
-  //     noCache: true
-  //   }
-  // },
-  // {//约束告知单
-  //   path: '/patients/patient/:id/Constraintnotification',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Constraintnotification'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'Constraintnotification',
-  //   meta: {
-  //     title: 'Constraintnotification',
-  //     noCache: true
-  //   }
-  // },
-  // {//心理评估
-  //   path: '/patients/patient/:id/mindAssessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/mindAssessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'mindAssessment',
-  //   meta: {
-  //     title: 'mindAssessment',
-  //     noCache: true
-  //   }
-  // },
-  // {//瘙痒评估
-  //   path: '/patients/patient/:id/pruritusAssessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/pruritusAssessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'pruritusAssessment',
-  //   meta: {
-  //     title: 'pruritusAssessment',
-  //     noCache: true
-  //   }
-  // },
-  // {//血液透析患者评估
-  //   path: '/patients/patient/:id/hemodialysis',
-  //   component: () => import('@/xt_pages/user/evaluationtool/hemodialysis'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'hemodialysis',
-  //   meta: {
-  //     title: 'hemodialysis',
-  //     noCache: true
-  //   }
-  // },
-  // {//Glasgow昏迷评分量表
-  //   path: '/patients/patient/:id/Glasgow',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Glasgow'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'Glasgow',
-  //   meta: {
-  //     title: 'Glasgow',
-  //     noCache: true
-  //   }
-  // },
-  // {//肌力评估表
-  //   path: '/patients/patient/:id/Muscleforce',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Muscleforce'),
+  
+  {//评估工具/跌倒评估
+    path: '/patients/patient/:id/Fallassessment',
+    component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'Fallassessment',
+    meta: {
+      title: 'firstDiseasePrint',
+      noCache: true
+    }
+  },
+  {//小儿跌倒风险评估
+    path: '/patients/patient/:id/pediatricFallAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'pediatricFallAssessment',
+    meta: {
+      title: 'pediatricFallAssessment',
+      noCache: true
+    }
+  },
+  {//压疮风险评估
+    path: '/patients/patient/:id/pressuresore',
+    component: () => import('@/xt_pages/user/evaluationtool/pressuresore'),
+    hidden: true,
+    is_menu: false,
+    name: 'pressuresore',
+    meta: {
+      title: 'pressuresore',
+      noCache: true
+    }
+  },
+  {//oh压疮评估
+    path: '/patients/patient/:id/OHpressuresore',
+    component: () => import('@/xt_pages/user/evaluationtool/OHpressuresore'),
+    hidden: true,
+    is_menu: false,
+    name: 'OHpressuresore',
+    meta: {
+      title: 'OHpressuresore',
+      noCache: true
+    }
+  },
+  {//日常生活能力评估
+    path: '/patients/patient/:id/dailyLife',
+    component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),
+    hidden: true,
+    is_menu: false,
+    name: 'dailyLife',
+    meta: {
+      title: 'dailyLife',
+      noCache: true
+    }
+  },
+  {//导管脱落风险评估
+    path: '/patients/patient/:id/Cathetershedding',
+    component: () => import('@/xt_pages/user/evaluationtool/Cathetershedding'),
+    hidden: true,
+    is_menu: false,
+    name: 'Cathetershedding',
+    meta: {
+      title: 'Cathetershedding',
+      noCache: true
+    }
+  },
+  {//RASS及疼痛评估
+    path: '/patients/patient/:id/RassAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/RassAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'RassAssessment',
+    meta: {
+      title: 'RassAssessment',
+      noCache: true
+    }
+  },
+  {//营养状况评估
+    path: '/patients/patient/:id/nourishmentAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/nourishmentAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'nourishmentAssessment',
+    meta: {
+      title: 'nourishmentAssessment',
+      noCache: true
+    }
+  },
+  {//约束告知单
+    path: '/patients/patient/:id/Constraintnotification',
+    component: () => import('@/xt_pages/user/evaluationtool/Constraintnotification'),
+    hidden: true,
+    is_menu: false,
+    name: 'Constraintnotification',
+    meta: {
+      title: 'Constraintnotification',
+      noCache: true
+    }
+  },
+  {//心理评估
+    path: '/patients/patient/:id/mindAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/mindAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'mindAssessment',
+    meta: {
+      title: 'mindAssessment',
+      noCache: true
+    }
+  },
+  {//瘙痒评估
+    path: '/patients/patient/:id/pruritusAssessment',
+    component: () => import('@/xt_pages/user/evaluationtool/pruritusAssessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'pruritusAssessment',
+    meta: {
+      title: 'pruritusAssessment',
+      noCache: true
+    }
+  },
+  {//血液透析患者评估
+    path: '/patients/patient/:id/hemodialysis',
+    component: () => import('@/xt_pages/user/evaluationtool/hemodialysis'),
+    hidden: true,
+    is_menu: false,
+    name: 'hemodialysis',
+    meta: {
+      title: 'hemodialysis',
+      noCache: true
+    }
+  },
+  {//Glasgow昏迷评分量表
+    path: '/patients/patient/:id/Glasgow',
+    component: () => import('@/xt_pages/user/evaluationtool/Glasgow'),
+    hidden: true,
+    is_menu: false,
+    name: 'Glasgow',
+    meta: {
+      title: 'Glasgow',
+      noCache: true
+    }
+  },
+  {//肌力评估表
+    path: '/patients/patient/:id/Muscleforce',
+    component: () => import('@/xt_pages/user/evaluationtool/Muscleforce'),
+    hidden: true,
+    is_menu: false,
+    name: 'Muscleforce',
+    meta: {
+      title: 'Muscleforce',
+      noCache: true
+    }
+  },
+  // {//血管通路图
+  //   path: '/patients/patient/:id/angiogram',
+  //   component: () => import('@/xt_pages/user/angiogram'),
   //   hidden: true,
   //   is_menu: false,
-  //   name: 'Muscleforce',
+  //   name: 'angiogram',
   //   meta: {
-  //     title: 'Muscleforce',
+  //     title: 'angiogram',
   //     noCache: true
   //   }
   // },

src/router/modules/workforce.js

@@ -56,6 +56,15 @@ export default {
       noCache: true
     }
   },
+  // {//患者调班
+  //   path: '/workforce/Patientshift',
+  //   component: () => import('@/xt_pages/workforce/Patientshift'),
+  //   name: '患者调班',
+  //   meta: {
+  //     title: '患者调班',
+  //     noCache: true
+  //   }
+  // },
   {
     path: '/workforce/schedule/printone',
     component: () => import('@/xt_pages/workforce/printOne'),

src/views/layout/Layout.vue

@@ -134,7 +134,7 @@ export default {
   created(){
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
-    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index'];
+    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','log_index'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];

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

@@ -48,7 +48,7 @@ export default {
   },
   created(){
     if(this.navTitle == '透析管理'){
-      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis'];
+      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis','log_index'];
       // console.log('permission_routers',this.permission_routers)
       let routerArr = [];
       this.permission_routers.map(item => {
@@ -120,7 +120,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '透析管理'){
-          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis'];
+          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis','log_index'];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -915,7 +915,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -941,7 +941,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -1349,7 +1349,7 @@
                           <td width="60">时间</td>
                           <td width="60">血压<br />(mmHg)</td>
                           <td width="50">脉搏<br />(次/分)</td>
-                          <td width="50">呼吸<br />(次/分)</td>
+                          <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
                           <td width="50" v-if="org_id == 10478">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
@@ -1467,7 +1467,7 @@
                                 : ""
                             }}
                           </td>
-                          <td>
+                          <td v-if="org_id!=10489">
                             {{
                               monitor_record.breathing_rate
                                 ? monitor_record.breathing_rate

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue

@@ -88,12 +88,10 @@
                   <span style="width: 14%;">震颤：</span>
                   <span style="width: 14%;">外观：</span>
                   <span style="width: 14%;">置换方式：
-                    {{
-                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
-                        }}
+                    {{getDisplaceLiquiPart(record.prescription.displace_liqui_part)}}
                   </span>
                   <span style="width: 14%;">置换总量：
-                    {{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : "/" }}
+                    {{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : "/" }}L
                   </span>
                 </td>
               </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -208,18 +208,7 @@
                   <tr style="text-align:left">
                     <td colspan="11" style="padding-left:5px">
                       治疗抗凝：<label-box
-                        :isChecked="
-
-                            isCheckBoxChecked(
-                              record.prescription,
-                              'anticoagulant',
-                              6
-                            ) || isCheckBoxChecked(
-                              record.prescription,
-                              'anticoagulant',
-                              7
-                            )
-                        "
+                        :isChecked="isCheckBoxChecked(record.prescription,'anticoagulant',6) || isCheckBoxChecked(record.prescription,'anticoagulant',7) || isCheckBoxChecked(record.prescription,'anticoagulant',3)"
                         showValue="低分子肝素："
                       ></label-box>
                       <span style="width:50px;display: inline-block;">{{

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -97,14 +97,7 @@
                       </td>
                       <td width="120">
                         <div class="under-line">&nbsp;
-                          <span style="width:30px;text-align:left;">
-                          {{ record.assessment_after_dislysis.actual_treatment_hour ? 
-                          record.assessment_after_dislysis.actual_treatment_hour : '' }}
-                        </span>h
-                        <span style="width:30px;text-align:left;" v-if="record.assessment_after_dislysis.actual_treatment_minute>0">
-                          {{ record.assessment_after_dislysis.actual_treatment_minute ? 
-                          record.assessment_after_dislysis.actual_treatment_minute : '0' }}
-                        </span>min
+                          {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
                       </div>
                       </td>
                       <td width="10"></td>
@@ -113,9 +106,9 @@
                       <td width="120">
                         <div class="under-line">&nbsp;
                           {{
-                            record.patient.total_dialysis +
+                            record.Count +
                             record.patient.user_sys_before_count
-                              ? record.patient.total_dialysis +
+                              ? record.Count +
                                 record.patient.user_sys_before_count
                               : "/"
                           }}
@@ -1558,12 +1551,11 @@
                               <td width="70">抗凝方式:</td>
                               <td width="120">
                                 <label-box
-                                  :isChecked="
-                                    record.prescription.anticoagulant == 6
+                                  :isChecked="(record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3)
                                       ? true
                                       : false
                                   "
-                                  showValue="低分子肝素钙"
+                                  showValue="低分子肝素"
                                 ></label-box>
                               </td>
 
@@ -1572,7 +1564,7 @@
                                   &nbsp;
                                   <span
                                     v-if="
-                                      record.prescription.anticoagulant == 6
+                                      record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3
                                     "
                                     >{{
                                       record.prescription
@@ -1880,7 +1872,11 @@
                                 </div>
                               </td>
                               <td width="10">ml</td>
-                              <td></td>
+                              <td style="padding-left:5px;width:20%;">
+                                 置换液总量:
+                               <span style="width:50px;display: inline-block;">&nbsp;{{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : '' }}</span>L
+                             </td>
+                              
                             </tr>
                           </tbody>
                         </table>
@@ -2911,17 +2907,17 @@
                           v-if="
                             setAdminUserES(
                               advice[0],
-                              'execution_staff'
+                              'advice_doctor'
                             ) == ''
                           "
                           >{{
-                            getAdminUser(advice[0], "execution_staff")
+                            getAdminUser(advice[0], "advice_doctor")
                           }}</span
                         >
                         <img
                           class="es-img"
                           :src="
-                            setAdminUserES(advice[0], 'execution_staff')
+                            setAdminUserES(advice[0], 'advice_doctor')
                           "
                           alt=""
                           srcset=""

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -20,12 +20,18 @@
 
         </li>
 
-         <li v-if="isShow('置换速度')">
+         <li v-if="isShow('置换速度')&& this.$store.getters.xt_user.template_info.org_id!=10375">
           <label>置换速度 : </label>
           <span class="content">{{displace_speed }}</span>
             <span class="unit">ml/min</span>
         </li>
 
+        <li v-if="isShow('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375">
+          <label>置换速度 : </label>
+          <span class="content">{{displace_speed }}</span>
+            <span class="unit">ml/L</span>
+        </li>
+
 
         <li v-if="isShow('透析液配方')">
           <label>透析液配方 : </label>

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

@@ -291,7 +291,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6 && org_id!=10223 && org_id!=10445 && org_id!=0"
+          v-if="(template_id != 6 && org_id!=10223 && org_id!=10445)  || org_id == 10460"
           prop="checker"
           min-width="30px"
           align="center"

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

@@ -604,7 +604,7 @@
                     </el-col>
 
 
-                    <el-col :span="8" v-if="isShows('置换速度')" v-show="totalShow">
+                    <el-col :span="8" v-if="isShows('置换速度') && this.$store.getters.xt_user.template_info.org_id != 10375" v-show="totalShow">
                         <el-form-item label="置换速度(ml/min)" prop="displace_speed" :rules="isCheckmust('置换速度')">
                             <el-input
                                     v-model="dialysisPrescription.displace_speed"
@@ -612,6 +612,14 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8" v-if="isShows('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375" v-show="totalShow">
+                        <el-form-item label="置换速度(L/h)" prop="displace_speed" :rules="isCheckmust('置换速度')">
+                            <el-input
+                                    v-model="dialysisPrescription.displace_speed"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col
                             :span="8"
                             v-if="isShows('钙名称')"
@@ -3333,6 +3341,9 @@ mu
         this.hide()
       },
       handleSolution: function(formName) {
+        if(this.dialysisPrescription.anticoagulant == "" || this.dialysisPrescription.anticoagulant == 0){
+          this.dialysisPrescription.anticoagulant = 3
+        }
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
@@ -3387,7 +3398,7 @@ mu
                   ParamsQuery['patient'] = this.patient.id
                   ParamsQuery['record_date'] = this.record_date
                   ParamsQuery['mode'] = '1'
-
+               
                   postSoulution(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/dialysisOff.vue

@@ -20,7 +20,7 @@
           <span class="content">{{end_time}}</span>
         </li>
       </ul>
-      <ul>
+      <ul v-if="org_id!=0&&org_id!=10460">
         <li>
           <label>宣教知识 : </label>
           <span class="content">{{this.record.mission}}</span>
@@ -38,7 +38,8 @@ export default {
   name: 'DialysisComputer',
   data() {
       return {
-        title: '透析下机 '
+        title: '透析下机 ',
+        org_id:0,
       }
   },
   props: {
@@ -76,6 +77,9 @@ export default {
   },
   methods: {
 
+  },
+  created(){
+    this.org_id = this.$store.getters.xt_user.org.id
   }
 }
 </script>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
-    <div id="dialysis-print-box-1">
+    
+    <div id="dialysis-print-box-1"  ref="pdfContent">
       <div
         id="dialysis-print-box-1-1"
         class="dialysis-print-order print-template-two print_page_main_content"
@@ -827,7 +828,7 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
-                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
+                        <span v-if="prescription.dialyzer_perfusion_apparatus&&prescription.dialyzer_perfusion_apparatus!=''">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
@@ -950,10 +951,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -1430,7 +1431,7 @@
                         <td width="50">时间</td>
                         <td width="65">血压<br />(mmHg)</td>
                         <td width="50">脉搏<br />(次/分)</td>
-                        <td width="50">呼吸<br />(次/分)</td>
+                        <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
                         <td width="50" v-if="org_id==10478 || org_id == 0">
                           动脉压<br />({{
@@ -1487,7 +1488,7 @@
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
                           {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
-                        <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
+                        <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                         <td v-if="org_id ==10478">
                           {{
@@ -3057,6 +3058,7 @@
                     <div class="inline_block" style="flex: 1">
                       治疗医生：
                       <div
+                        v-if="org_id ==10191"
                         class="under_line"
                         style="width: 80px; text-align: center"
                       >
@@ -3074,6 +3076,25 @@
                           v-else
                         />
                       </div>
+                      <div
+                        v-if="org_id!=10191"
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                      <span
+                            style="height: 30px; display: inline-block"
+                            v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
+                          >
+                            {{ getAdminUser(doctor_advices[0].advice_doctor) }}
+                          </span>
+                          <img
+                            style="height: 40px"
+                            :src="setAdminUserES(doctor_advices[0].advice_doctor)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                      </div>
                     </div>
                   </div>
                 </td>
@@ -3092,12 +3113,17 @@ import CheckBox from "../batch_print/option_check_box";
 import { getDialysisRecord } from "@/api/dialysis";
 import { getDataConfig } from "@/utils/data";
 import { jsGetAge, uParseTime } from "@/utils/tools";
+
 import LabelBox from "../printItem/LabelBox";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from "print-js";
-
+import html2pdf from 'html2pdf.js'
+import { UploadPrintOrder } from "@/api/role/admin"
+import { HTML5_FMT } from "moment";
+import html2canvas from 'html2canvas'
+import { jsPDF } from 'jspdf';
 export default {
   name: "dialysisPrintOrderSix",
   props: ["childResponse"],
@@ -4057,6 +4083,7 @@ export default {
         return "0.0";
       }
     },
+
   },
   watch: {
     "patientInfo.gender": function () {
@@ -4083,6 +4110,8 @@ export default {
         this.patientInfo_source_1 = false;
       }
     },
+
+
   },
   created() {
     this.way_arr = getDataConfig("hemodialysis", "way");

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -1,6 +1,7 @@
 <template>
   <div >
     <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="toUpload">一键上传</el-button>
     <div id="dialysis-print-box-64">
       <div
         id="dialysis-print-box-64-1"
@@ -721,6 +722,12 @@
 import { getDialysisRecord } from "@/api/dialysis";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
+import print from "print-js";
+import html2pdf from 'html2pdf.js'
+import { UploadPrintOrder } from "@/api/role/admin"
+import { HTML5_FMT } from "moment";
+import html2canvas from 'html2canvas'
+import { jsPDF } from 'jspdf';
 export default {
   data() {
     return {
@@ -1221,7 +1228,76 @@ export default {
         }
       }
       return name
-    }
+    },
+
+    toUpload() {
+        let dom = document.getElementById("dialysis-print-box-64");
+        //调用方法下载
+        html2canvas(dom, {
+          useCORS: true, //允许跨域
+          allowTaint: false,
+          logging: false,
+          letterRendering: true,
+          ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+          scale: 4, //按比例增加分辨率
+          background: '#fff',//pdf背景色为白色，默认是黑色的
+       
+        }).then((canvas) => {
+          //返回图片dataURL，参数：图片格式和清晰度(0-1)
+          var pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+          //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+          var pdf = new jsPDF('', 'pt', 'a4');
+
+          //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+          pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+
+          var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+          console.log("base63",newBase64Data)
+          this.viewPdf(newBase64Data)
+
+          var data = {
+            name:newBase64Data,
+          }
+          UploadPrintOrder(data).then(response=>{
+            if(response.data.state == 1){
+              var sign =  response.data.data.sign
+              console.log("SIGNWWOOWWO")
+              this.$message.success("保存成功!")
+            }
+          })
+          
+          // this.viewPdf(newBase64Data)
+          //保存到pdf，名字是stone
+          // pdf.save('stone.pdf');
+         
+        });
+      },
+   
+    viewPdf(content) {
+      console.log("content",content);
+      const blob = this.base64ToBlob(content);
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(blob);
+      } else {
+        const fileURL = URL.createObjectURL(blob);
+        console.log("fileUlrwowowoow",fileURL)
+        window.open(fileURL);//打开ppf文件
+      }
+    },
+    base64ToBlob(code) {
+      code = code.replace(/[\n\r]/g, '');// 检查base64字符串是否符合base64编码
+      // atob() 方法用于解码使用 base-64 编码的字符串。
+      const raw = window.atob(code);
+      const rawLength = raw.length;
+      const uInt8Array = new Uint8Array(rawLength);
+      for (let i = 0; i < rawLength; ++i) {
+      // 将解码后的逐个字符转换成Unicode序号，放入Unit8Array数组
+        uInt8Array[i] = raw.charCodeAt(i);
+      }
+      // 通过Blob将Uint8Array数组转换成pdf类型的文件对象
+      return new Blob([uInt8Array], { type: 'application/pdf' });
+    },
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -63,7 +63,15 @@
               <td width="10"></td>
               <td width="80">透析次数:</td>
               <td width="120">
-                <div class="under-line">&nbsp;{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+                <div class="under-line">&nbsp;
+                  {{
+                          patientInfo.total_dialysis +
+                          patientInfo.user_sys_before_count
+                            ? patientInfo.total_dialysis +
+                              patientInfo.user_sys_before_count
+                            : "/"
+                        }}
+                </div>
               </td>
               <td></td>
             </tr>
@@ -593,7 +601,7 @@
                           &nbsp;{{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
                         </div>
                       </td>
-                      <td width="35">min</td>
+                      <td width="35" v-if="afterdialysis.actual_treatment_minute>0">min</td>
                       <td></td>
                     </tr>
                   </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -103,7 +103,7 @@
                     }}
                   </span>
                   <span style="width: 14%;">置换总量：
-                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
+                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}L
                   </span>
                 </td>
               </tr>
@@ -325,7 +325,7 @@
                 </tr>
             </table>
           </div>
-          <div style="margin-bottom: 10px;">
+          <div style="margin-bottom: 10px;" v-if="org_id!=0&& org_id!=10375">
             <table class="table" border="1"
               style="border-collapse: collapse;text-align: center;width: 100%;"
             >

src/xt_pages/log/index.vue

@@ -0,0 +1,685 @@
+<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">
+            <div style="width: 465px;white-space: nowrap;">
+              <span>日期查询：</span>
+           
+              <el-date-picker
+                v-model="record_date"
+                prefix-icon="el-icon-date"
+                @change="changeTime"
+                style="width:150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+
+             
+              <el-autocomplete
+                style="margin:16px 5px"
+                popper-class="my-autocomplete"
+                v-model.trim="patient_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入患者姓名"
+                @select="handleSelect"
+              >
+                <i
+                  class="el-icon-search el-input__icon"
+                  slot="suffix"
+                >
+                </i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+             </el-autocomplete>
+
+            </div>
+           
+            <el-table
+                :data="prescriptionlogList"
+                border
+                style="width: 100%">
+                <el-table-column  prop="date" label="序号" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{scope.$index + 1 }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="患者姓名" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{ getPatientName(scope.row.patient_id) }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="操作人" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getUserName(scope.row.admin_user_id)}}
+                   </template>
+                </el-table-column>
+
+
+                <el-table-column  prop="date" label="操作时间" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getTime(scope.row.ctime) }}
+                   </template>
+                </el-table-column>
+                
+               
+                
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :page-size="10"
+                background
+                style="margin-top:20px;float: right"
+                :total="total"
+            ></el-pagination>
+          </el-tab-pane>
+
+          <el-tab-pane label="透前评估" name="second">
+            
+            <div style="width: 465px;white-space: nowrap;">
+              <span>日期查询：</span>
+           
+              <el-date-picker
+                v-model="record_date"
+                prefix-icon="el-icon-date"
+                @change="changeTime"
+                style="width:150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+
+             
+              <el-autocomplete
+                style="margin:16px 5px"
+                popper-class="my-autocomplete"
+                v-model.trim="patient_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入患者姓名"
+                @select="handleSelect"
+              >
+                <i
+                  class="el-icon-search el-input__icon"
+                  slot="suffix"
+                >
+                </i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+             </el-autocomplete>
+
+            </div>
+           
+            <el-table
+                :data="beforLogList"
+                border
+                style="width: 100%">
+                <el-table-column  prop="date" label="序号" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{scope.$index + 1 }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="患者姓名" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{ getPatientName(scope.row.patient_id) }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="操作人" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getUserName(scope.row.admin_user_id)}}
+                   </template>
+                </el-table-column>
+
+
+                <el-table-column  prop="date" label="操作时间" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getTime(scope.row.ctime) }}
+                   </template>
+                </el-table-column>
+                
+               
+                
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChangeOne"
+                @current-change="handleCurrentChangeOne"
+                :page-size="10"
+                background
+                style="margin-top:20px;float: right"
+                :total="total"
+            ></el-pagination>
+
+          </el-tab-pane>
+
+          <el-tab-pane label="临时医嘱" name="third">
+            <div style="width: 465px;white-space: nowrap;">
+              <span>日期查询：</span>
+           
+              <el-date-picker
+                v-model="record_date"
+                prefix-icon="el-icon-date"
+                @change="changeTime"
+                style="width:150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+
+             
+              <el-autocomplete
+                style="margin:16px 5px"
+                popper-class="my-autocomplete"
+                v-model.trim="patient_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入患者姓名"
+                @select="handleSelect"
+              >
+                <i
+                  class="el-icon-search el-input__icon"
+                  slot="suffix"
+                >
+                </i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+             </el-autocomplete>
+
+            </div>
+           
+            <el-table
+                :data="adviceLogList"
+                border
+                style="width: 100%">
+                <el-table-column  prop="date" label="序号" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{scope.$index + 1 }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="患者姓名" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{ getPatientName(scope.row.patient_id) }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column prop="date" label="操作步骤" min-width="50"  align="center">
+                  <template slot-scope="scope" >
+                      <span v-if="scope.row.module == 1">新增或修改</span>
+                      <span v-if="scope.row.module == 2">执行</span>
+                      <span v-if="scope.row.module == 3">核对</span>
+                      <span v-if="scope.row.module == 4">删除</span>
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="操作人" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getUserName(scope.row.admin_user_id)}}
+                   </template>
+                </el-table-column>
+
+
+                <el-table-column  prop="date" label="操作时间" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getTime(scope.row.ctime) }}
+                   </template>
+                </el-table-column>
+
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChangeTwo"
+                @current-change="handleCurrentChangeTwo"
+                :page-size="10"
+                background
+                style="margin-top:20px;float: right"
+                :total="total"
+            ></el-pagination>
+          </el-tab-pane>
+
+          <el-tab-pane label="透析监测" name="four">
+             
+            <div style="width: 465px;white-space: nowrap;">
+              <span>日期查询：</span>
+           
+              <el-date-picker
+                v-model="record_date"
+                prefix-icon="el-icon-date"
+                @change="changeTime"
+                style="width:150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+
+             
+              <el-autocomplete
+                style="margin:16px 5px"
+                popper-class="my-autocomplete"
+                v-model.trim="patient_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入患者姓名"
+                @select="handleSelect"
+              >
+                <i
+                  class="el-icon-search el-input__icon"
+                  slot="suffix"
+                >
+                </i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+             </el-autocomplete>
+
+            </div>
+           
+            <el-table
+                :data="monitorLogList"
+                border
+                style="width: 100%">
+                <el-table-column  prop="date" label="序号" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{scope.$index + 1 }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="患者姓名" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{ getPatientName(scope.row.patient_id) }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column prop="date" label="操作步骤" min-width="50"  align="center">
+                  <template slot-scope="scope" >
+                      <span v-if="scope.row.module == 1">新增</span>
+                      <span v-if="scope.row.module == 3">修改</span>
+                      <span v-if="scope.row.module == 4">删除</span>
+                     
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="操作人" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getUserName(scope.row.admin_user_id)}}
+                   </template>
+                </el-table-column>
+
+
+                <el-table-column  prop="date" label="操作时间" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getTime(scope.row.ctime) }}
+                   </template>
+                </el-table-column>
+
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChangeThree"
+                @current-change="handleCurrentChangeThree"
+                :page-size="10"
+                background
+                style="margin-top:20px;float: right"
+                :total="total"
+            ></el-pagination>
+          </el-tab-pane>
+
+          <el-tab-pane label="透后评估" name="five">
+            <div style="width: 465px;white-space: nowrap;">
+              <span>日期查询：</span>
+           
+              <el-date-picker
+                v-model="record_date"
+                prefix-icon="el-icon-date"
+                @change="changeTime"
+                style="width:150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+
+             
+              <el-autocomplete
+                style="margin:16px 5px"
+                popper-class="my-autocomplete"
+                v-model.trim="patient_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入患者姓名"
+                @select="handleSelect"
+              >
+                <i
+                  class="el-icon-search el-input__icon"
+                  slot="suffix"
+                >
+                </i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+             </el-autocomplete>
+
+            </div>
+           
+            <el-table
+                :data="afterLogList"
+                border
+                style="width: 100%">
+                <el-table-column  prop="date" label="序号" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{scope.$index + 1 }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="患者姓名" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{ getPatientName(scope.row.patient_id) }}
+                   </template>
+                </el-table-column>
+
+                <el-table-column  prop="date" label="操作人" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getUserName(scope.row.admin_user_id)}}
+                   </template>
+                </el-table-column>
+
+
+                <el-table-column  prop="date" label="操作时间" min-width="50"  align="center">
+                   <template slot-scope="scope" >
+                       {{getTime(scope.row.ctime) }}
+                   </template>
+                </el-table-column>
+                
+               
+                
+              </el-table>
+              <el-pagination
+                @size-change="handleSizeChangeFour"
+                @current-change="handleCurrentChangeFour"
+                :page-size="10"
+                background
+                style="margin-top:20px;float: right"
+                :total="total"
+            ></el-pagination>
+          </el-tab-pane>
+        
+      </el-tabs>
+   </div>
+
+   
+  </div>
+</template>
+<script>
+  import {getPatientList,getPrescriptionLogList,getBeforLogList,getDocLogLogList,getMonitorLogList,getAferLogList} from  "@/api/dialysis"
+  import { uParseTime } from '@/utils/tools'
+  const moment = require('moment')
+  export default {
+    data(){
+      return {
+        activeName: 'first',
+        prescriptionList:[],
+        record_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+        patientList:[],
+        patient_id:0,
+        patient_name:"",
+        total:0,
+        page:1,
+        limit:10,
+        crumbs: [
+         { path: false, name: "日志查询" },      
+        ],
+        prescriptionlogList:[],
+        patients:[],
+        roleList:[],
+        beforLogList:[],
+        docLogList:[],
+        adviceLogList:[],
+        monitorLogList:[],
+        afterLogList:[],
+      }
+    },
+    methods:{
+      handleClick(val){
+        console.log("val2o2o2o2",this.activeName)
+        if(this.activeName == "first"){
+          this.getPrescriptionLogList()
+        }
+        if(this.activeName == "second"){
+          this.getBeforLogList()
+        }
+        if(this.activeName == "third"){
+          this.getDocLogLogList()
+        }
+        if(this.activeName == "four"){
+          this.getMonitorLogList()
+        }
+        if(this.activeName == "five"){
+          this.getAferLogList()
+        }
+      },
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        getPatientList(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patientList
+            console.log('searcharrya', searchArray)
+            cb(searchArray)
+          }
+        })
+        return searchArray
+      },
+      handleSelect(val) {
+       this.patient_id = val.id
+       this.patient_name = val.name
+       this.getPrescriptionLogList()
+       this.getBeforLogList()
+       this.getDocLogLogList()
+       this.getMonitorLogList()
+       this.getAferLogList()
+      },
+      handleCurrentChange(val){
+        this.page = val
+        this.getPrescriptionLogList()
+      },
+      handleSizeChange(val){
+        this.limit=val
+        this.getPrescriptionLogList()
+      },
+      handleCurrentChangeOne(val){
+         this.page = val
+         this.getBeforLogList()
+      },
+      handleSizeChangeOne(val){
+        this.limit =val
+        this.getBeforLogList()
+      },
+      handleCurrentChangeTwo(val){
+         this.page = val
+         this.getDocLogLogList()
+      },
+      handleSizeChangeTwo(val){
+        this.limit =val
+        this.getDocLogLogList()
+      },
+      handleSizeChangeThree(val){
+        this.limit =val
+        this.getMonitorLogList()
+      },
+      handleCurrentChangeThree(val){
+        this.page = val
+        this.getMonitorLogList()
+      },
+      handleSizeChangeFour(val){
+        this.limit =val
+        this.getAferLogList()
+      },
+      handleCurrentChangeFour(val){
+        this.page = val
+        this.getAferLogList()
+      },
+      changeTime(val){
+        console.log("va222o3o22o3",val)
+        this.record_date = val
+        console.log("wowowoow",this.activeName)
+        if(this.activeName == "first"){
+          this.getPrescriptionLogList()
+        }
+        if(this.activeName == "second"){
+          this.getBeforLogList()
+        }
+        if(this.activeName == "third"){
+          this.getDocLogLogList()
+        }
+        if(this.activeName == "four"){
+          this.getMonitorLogList()
+        }
+        if(this.activeName == "five"){
+          this.getAferLogList()
+        }
+
+      },
+
+      getPrescriptionLogList(){
+           var params = {
+             record_date:this.record_date,
+             patient_id: this.patient_id,
+             limit:this.limit,
+             page:this.page,
+           }
+           console.log("paramswoowow",params)
+        getPrescriptionLogList(params).then(response=>{
+           if(response.data.state== 1){
+              this.prescriptionlogList =  response.data.data.prescriptionlogList
+              this.total= response.data.data.total
+
+              this.patients = response.data.data.patients
+
+              this.roleList = response.data.data.role
+           }
+        })
+      },
+      getPatientName(patient_id){
+         var name = ""
+        for(let i=0;i<this.patients.length;i++){
+          if(patient_id == this.patients[i].id){
+             name = this.patients[i].name
+          }
+        }
+        return name
+      },
+      getUserName(admin_user_id){
+        var user_name = ""
+        for(let i=0;i<this.roleList.length;i++){
+          if(admin_user_id == this.roleList[i].admin_user_id){
+             user_name = this.roleList[i].user_name
+          }   
+        }
+        return user_name
+      },
+
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d} {h}:{i}:{s}')
+         }
+      },
+     
+      getBeforLogList(){
+        var params = {
+             record_date:this.record_date,
+             patient_id: this.patient_id,
+             limit:this.limit,
+             page:this.page,
+           }
+         
+       getBeforLogList(params).then(response=>{
+         if(response.data.state == 1){
+          this.beforLogList =  response.data.data.beforLogList
+          this.total= response.data.data.total
+          this.patients = response.data.data.patients
+          this.roleList = response.data.data.role
+         }
+       }) 
+      },
+      getDocLogLogList(){
+        var params = {
+             record_date:this.record_date,
+             patient_id: this.patient_id,
+             limit:this.limit,
+             page:this.page,
+           }
+        getDocLogLogList(params).then(response=>{
+           if(response.data.state == 1){
+             this.adviceLogList =  response.data.data.adviceLogList
+             this.total= response.data.data.total
+            this.patients = response.data.data.patients
+            this.roleList = response.data.data.role
+           }
+        })
+      },
+      getMonitorLogList(){
+        var params = {
+             record_date:this.record_date,
+             patient_id: this.patient_id,
+             limit:this.limit,
+             page:this.page,
+           }
+        getMonitorLogList(params).then(response=>{
+          if(response.data.state== 1){
+            this.monitorLogList =  response.data.data.monitorLogList
+             this.total= response.data.data.total
+            this.patients = response.data.data.patients
+            this.roleList = response.data.data.role
+          }
+        })
+      },
+
+      getAferLogList(){
+         var params = {
+             record_date:this.record_date,
+             patient_id: this.patient_id,
+             limit:this.limit,
+             page:this.page,
+           }
+        getAferLogList(params).then(response=>{
+           if(response.data.state == 1){
+            this.afterLogList =  response.data.data.afterLogList
+             this.total= response.data.data.total
+            this.patients = response.data.data.patients
+            this.roleList = response.data.data.role
+           }
+        })
+      }
+      
+    },
+    created(){
+
+      this.record_date = moment(new Date()).add('year',0).format("YYYY-MM-DD")
+      this.getPrescriptionLogList()
+      
+      
+    },
+  }
+</script>

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -745,10 +745,12 @@ export default {
         changeTime(val){
             this.start_time = val.getTime()/1000
             this.getlist()
+            this.getchartlist()
         },
         changeTimeTwo(val){
             this.end_time = val.getTime()/1000
             this.getlist()
+            this.getchartlist()
         },
         compare(property){
             return function(a,b){

src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue

@@ -2,9 +2,9 @@
   <div id='invoice-print' style="position: relative;">
     <div>
       <div style="display: inline-block; position: absolute;top: 30px;left: 30px;">{{list.order.mdtrt_id}}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 230px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 280px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 330px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 260px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 330px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 400px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
     </div>
     <div>
       <div style="position: absolute;top: 50px;left: 60px;">{{ paramsObj.name }}</div>
@@ -14,44 +14,44 @@
           <div  style="position: absolute;top:50px;left:250px;"></div>
       </div>
       <div style="display:flex;justify-content: space-between;">
-          <div  style="position: absolute;top:50px;left:480px;" v-if="list.gender == 1">√</div>
-          <div  style="position: absolute;top:50px;left:540px;" v-else-if="list.gender == 2">√</div>
+          <div  style="position: absolute;top:50px;left:570px;" v-if="list.gender == 1">√</div>
+          <div  style="position: absolute;top:50px;left:630px;" v-else-if="list.gender == 2">√</div>
       </div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:68px;left:120px;">医保</div>
-      <div  style="position: absolute;top:68px;left:300px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
-      <div  style="position: absolute;top:68px;left:480px;">现金</div>
+      <div  style="position: absolute;top:88px;left:120px;">医保</div>
+      <div  style="position: absolute;top:88px;left:340px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
+      <div  style="position: absolute;top:88px;left:570px;">现金</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:124px;left:0px;">西药费</div>
-      <div  style="position: absolute;top:124px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:124px;left:120px;">化验费</div>
-      <div  style="position: absolute;top:124px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:124px;left:240px;">治疗费</div>
-      <div  style="position: absolute;top:124px;left:320px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:124px;left:410px;">处置费</div>
-      <div  style="position: absolute;top:124px;left:480px;">0</div>
+      <div  style="position: absolute;top:150px;left:0px;">西药费</div>
+      <div  style="position: absolute;top:150px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:120px;">化验费</div>
+      <div  style="position: absolute;top:150px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:270px;">治疗费</div>
+      <div  style="position: absolute;top:150px;left:340px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:490px;">处置费</div>
+      <div  style="position: absolute;top:150px;left:570px;">0</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:150px;left:0px;">中成药</div>
-      <div  style="position: absolute;top:150px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:150px;left:120px;">诊疗费</div>
-      <div  style="position: absolute;top:150px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:150px;left:240px;">材料费</div>
-      <div  style="position: absolute;top:150px;left:320px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div> 
-      <div  style="position: absolute;top:150px;left:410px;">护理费</div>
-      <div  style="position: absolute;top:150px;left:480px;">0</div>
+      <div  style="position: absolute;top:188px;left:0px;">中成药</div>
+      <div  style="position: absolute;top:188px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:120px;">诊疗费</div>
+      <div  style="position: absolute;top:188px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:270px;">材料费</div>
+      <div  style="position: absolute;top:188px;left:340px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div> 
+      <div  style="position: absolute;top:188px;left:490px;">护理费</div>
+      <div  style="position: absolute;top:188px;left:570px;">0</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:176px;left:0px;">注射费</div>
-      <div  style="position: absolute;top:176px;left:60px;">0</div> 
-      <div  style="position: absolute;top:176px;left:120px;">检查费</div>
-      <div  style="position: absolute;top:176px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:176px;left:240px;">输氧费</div>
-      <div  style="position: absolute;top:176px;left:320px;">0</div>
-      <div  style="position: absolute;top:176px;left:410px;">其他</div>
-      <div  style="position: absolute;top:176px;left:480px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:0px;">注射费</div>
+      <div  style="position: absolute;top:225px;left:60px;">0</div> 
+      <div  style="position: absolute;top:225px;left:120px;">检查费</div>
+      <div  style="position: absolute;top:225px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:270px;">输氧费</div>
+      <div  style="position: absolute;top:225px;left:340px;">0</div>
+      <div  style="position: absolute;top:225px;left:490px;">其他</div>
+      <div  style="position: absolute;top:225px;left:570px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:202px;left:60px;"></div>
@@ -61,64 +61,62 @@
     </div>
     <div>
       <span>
-        <span  style="position: absolute;top:230px;left:120px">
+        <span  style="position: absolute;top:280px;left:100px">
           <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:230px;left:160px">
+        <span  style="position: absolute;top:280px;left:140px">
             <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:230px;left:210px">
+        <span  style="position: absolute;top:280px;left:190px">
             <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:230px;left:260px">
+        <span  style="position: absolute;top:280px;left:260px">
             <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span style="position: absolute;top:230px;left:310px">
+        <span style="position: absolute;top:280px;left:310px">
             <span v-if="zhongwen.indexOf('拾') > -1">
                     {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:230px;left:360px">
+        <span  style="position: absolute;top:280px;left:380px">
            <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:230px;left:420px">
+        <span  style="position: absolute;top:280px;left:450px">
              <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-
-        <span  style="position: absolute;top:230px;left:480px">
+        <span  style="position: absolute;top:280px;left:510px">
              <span v-if="zhongwen.indexOf('分') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
                 </span>
                 <span v-else>零</span>
         </span>
       </span>
-      <span style="position: absolute;top:230px;left:530px">{{ totalPrice.toFixed(2) }}</span>
+      <span style="position: absolute;top:280px;left:600px">{{ totalPrice.toFixed(2) }}</span>
     </div>
 
-
     <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:283px;left:100px;">阳春{{ org_name}}</div>
-      <div style="position: absolute;top:283px;left:240px;"></div>
-      <div style="position: absolute;top:283px;left:410px;">{{list.admin_user_name}}</div>
+      <div style="position: absolute;top:370px;left:100px;">{{ org_name}}</div>
+      <div style="position: absolute;top:370px;left:240px;"></div>
+      <div style="position: absolute;top:370px;left:460px;">{{list.admin_user_name}}</div>
     </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -8,9 +8,9 @@
           <td colspan="4">发票号：</td>
         </tr>
         <tr style="border-bottom: 1px solid black;">
-          <td colspan="4">单据编码：{{info.number}}</td>
-          <td colspan="2">就诊时间：{{info.setl_time}}</td>
-          <td colspan="2">金额单位：{{info.medfee_sumamt}}元</td>
+          <td colspan="2">单据编码：{{info.number}}</td>
+          <td colspan="4">就诊时间：{{info.setl_time}}</td>
+          <td colspan="3">金额单位：{{info.medfee_sumamt}}元</td>
         </tr>
         <tr>
           <td colspan="4">姓名：{{info.patient.name}}</td>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -67,7 +67,11 @@
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
-        <div><el-button type="primary" @click="exportList">导出</el-button></div>
+        <div>
+          <el-button type="primary" @click="exportList">按透析记录导出</el-button>
+          <el-button type="primary" @click="exportListOne">按排班导出</el-button>
+        </div>
+       
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         >
@@ -142,6 +146,7 @@ export default {
       },
       patient_id:0,
       modeIdCount:[],
+      scheduleCount:[],
     };
   },
   methods: {
@@ -202,6 +207,10 @@ export default {
 
           var modeIdCount = response.data.data.modeIdCount
           console.log("modeidcount=====",modeIdCount)
+
+        
+         
+
           for(let i=0;i<modeIdCount.length;i++){
             if(modeIdCount[i].mode_id == 1){
                modeIdCount[i].mode_id = "HD"
@@ -302,6 +311,109 @@ export default {
             }
           }
           this.modeIdCount = modeIdCount
+
+          var scheduleCount =  response.data.data.scheduleCount
+          console.log("scheduleCount",scheduleCount)
+          for(let i=0;i<scheduleCount.length;i++){
+            if(scheduleCount[i].mode_id == 1){
+              scheduleCount[i].mode_id = "HD"
+            }
+            if(scheduleCount[i].mode_id == 2){
+              scheduleCount[i].mode_id = "HDF"
+            }
+            if(scheduleCount[i].mode_id == 3){
+              scheduleCount[i].mode_id = "HD+HP"
+            }
+            if(scheduleCount[i].mode_id == 4){
+              scheduleCount[i].mode_id = "HP"
+            }
+            if(scheduleCount[i].mode_id == 5){
+              scheduleCount[i].mode_id = "HF"
+            }
+            if(scheduleCount[i].mode_id == 6){
+              scheduleCount[i].mode_id = "SCUF"
+            }
+            if(scheduleCount[i].mode_id == 7){
+              scheduleCount[i].mode_id = "IUF"
+            }
+            if(scheduleCount[i].mode_id == 8){
+              scheduleCount[i].mode_id = "HFHD"
+            }
+            if(scheduleCount[i].mode_id == 9){
+              scheduleCount[i].mode_id = "HFHD+HP"
+            }
+            if(scheduleCount[i].mode_id == 10){
+              scheduleCount[i].mode_id = "PHF"
+            }
+            if(scheduleCount[i].mode_id == 11){
+              scheduleCount[i].mode_id = "HFR"
+            }
+            if(scheduleCount[i].mode_id == 12){
+              scheduleCount[i].mode_id = "HDF+HP"
+            }
+            if(scheduleCount[i].mode_id == 13){
+              scheduleCount[i].mode_id = "CRRT"
+            }
+             if(scheduleCount[i].mode_id == 14){
+              scheduleCount[i].mode_id = "腹水回输"
+            }
+             if(scheduleCount[i].mode_id == 15){
+              scheduleCount[i].mode_id = "HD前置换"
+            }
+             if(scheduleCount[i].mode_id == 16){
+              scheduleCount[i].mode_id = "HD后置换"
+            }
+             if(scheduleCount[i].mode_id == 17){
+              scheduleCount[i].mode_id = "HDF前置换"
+            }
+             if(scheduleCount[i].mode_id == 18){
+              scheduleCount[i].mode_id = "HDF后置换"
+            }
+              if(scheduleCount[i].mode_id == 19){
+                scheduleCount[i].mode_id = "IUF+HD"
+            }
+            if(scheduleCount[i].mode_id == 20){
+              scheduleCount[i].mode_id = "UF"
+            }
+            if(scheduleCount[i].mode_id == 21){
+              scheduleCount[i].mode_id = "HD+"
+            }
+            if(scheduleCount[i].mode_id == 22){
+              scheduleCount[i].mode_id = "血浆胆红素吸附+HDF"
+            }
+            if(scheduleCount[i].mode_id == 23){
+              scheduleCount[i].mode_id = "血浆胆红素吸附"
+            }
+            if(scheduleCount[i].mode_id == 24){
+              scheduleCount[i].mode_id = "I-HDF"
+            }
+            if(scheduleCount[i].mode_id == 25){
+              scheduleCount[i].mode_id = "HD高通"
+            }
+
+            if(scheduleCount[i].mode_id == 26){
+              scheduleCount[i].mode_id = "CVVH"
+            }
+            if(scheduleCount[i].mode_id == 27){
+              scheduleCount[i].mode_id = "CVVHD"
+            }
+             if(scheduleCount[i].mode_id == 28){
+              scheduleCount[i].mode_id = "CVVHDF"
+            }
+            if(scheduleCount[i].mode_id == 29){
+              scheduleCount[i].mode_id = "PE"
+            }
+            if(scheduleCount[i].mode_id == 30){
+              scheduleCount[i].mode_id = "血浆胆红素吸附+HP"
+            }
+           if(scheduleCount[i].mode_id == 31){
+            scheduleCount[i].mode_id = "HPD"
+            }
+            if(scheduleCount[i].mode_id == 32){
+              scheduleCount[i].mode_id = "HDP"
+            }
+          }
+          this.scheduleCount = scheduleCount
           let dataInfo = {}
           list.forEach((item, index) => {
             let { patient_id } = item
@@ -353,6 +465,15 @@ export default {
        }
        return count
     },
+    getScheduleDialysisCount(id){
+       var count = 0
+       for(let i=0;i<this.scheduleCount.length;i++){
+           if(id == this.scheduleCount[i].patient_id){
+              count += this.scheduleCount[i].Count
+           }
+       }
+       return count
+    },
     onSearch(){
       if(this.listQuery.search == "" || this.listQuery.search == null){
          this.getDialysisList()
@@ -576,6 +697,55 @@ export default {
           this.downloadLoading = false
         })
       },
+
+      exportListOne(){
+       for(let i=0;i<this.DialysisData.length;i++){
+         this.DialysisData[i].index = i+1
+         this.DialysisData[i].HD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD")
+         this.DialysisData[i].HDF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF")
+         this.DialysisData[i].HDHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD+HP")
+         this.DialysisData[i].HP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HP")
+         this.DialysisData[i].HF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HF")
+         this.DialysisData[i].SCUF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"SCUF")
+         this.DialysisData[i].IUF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"IUF")
+         this.DialysisData[i].HFHD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HFHD")
+         this.DialysisData[i].HFHDHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HFHD+HP")
+         this.DialysisData[i].HDFHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF+HP")
+         this.DialysisData[i].CRRT = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CRRT")
+         this.DialysisData[i].OTR = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"腹水回输")
+
+         this.DialysisData[i].IUFHD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"IUF+HD")
+         this.DialysisData[i].UF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"UF")
+         this.DialysisData[i].HDPlus = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD+")
+         this.DialysisData[i].IHDF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"I-HDF")
+         this.DialysisData[i].HDGT = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD高通")
+         this.DialysisData[i].CVVH = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CVVH")
+         this.DialysisData[i].CVVHD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CVVHD")
+         this.DialysisData[i].CVVHDF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CVVHDF")
+         this.DialysisData[i].PE = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"PE")
+         this.DialysisData[i].XUEHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"血浆胆红素吸附+HP")
+         this.DialysisData[i].HPD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HPD")
+         this.DialysisData[i].HDP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDP")
+
+         this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
+         this.DialysisData[i].total_count = this.getScheduleDialysisCount(this.DialysisData[i].patient_id)
+       }
+       console.log("hhh2323323232",this.DialysisData)
+       import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+
+        const data = this.formatJson(filterVal, this.DialysisData)
+
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析详情'
+         })
+          this.downloadLoading = false
+        })
+      },
+
       formatJson(filterVal, jsonData) {
         return jsonData.map(v =>
           filterVal.map(j => {
@@ -601,6 +771,23 @@ export default {
           }
         }
 
+        return count
+     },
+
+     getScheduleHdModeIdCount(id,mode_name){
+        var count = 0
+        var arr = []
+        for(let i = 0;i<this.scheduleCount.length;i++){
+           if(id == this.scheduleCount[i].patient_id && this.scheduleCount[i].mode_id == mode_name){
+             arr.push(this.scheduleCount[i])
+           }
+        }
+        if(arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            count += arr[i].Count
+          }
+        }
+
         return count
      }
 

src/xt_pages/role/admin.vue

@@ -4,6 +4,14 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
      
        <div>
+
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toGet">CA企业认证</el-button> -->
+
         <el-button
           type="primary"
           size="small"
@@ -16,6 +24,9 @@
         @click="BatchDelete"
         >医药师登记</el-button>
 
+
+       
+
          <!-- <el-button
           type="primary"
           size="small"
@@ -85,9 +96,9 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestNight">后台签署</el-button>
-          
+           -->
 
-          <el-button
+          <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -101,6 +112,72 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestThrityMent">生成PDF</el-button>  -->
+
+
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestTwo">创建个人印章</el-button> -->
+
+
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestThree">创建合同</el-button>
+
+
+          <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestSeven">添加合同签署人</el-button>
+
+
+          <el-button 
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestTen"
+          >
+           获取短信验证码
+          </el-button>
+
+          <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestNight">后台签署</el-button>
+
+          <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestThrity">合同详情查询</el-button>
+
+
+         <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toWatch">合同在线预览</el-button>
+
+          <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toEnd">结束签署</el-button> -->
+           
+         
           
      </div>
     
@@ -178,7 +255,25 @@
         </el-table-column>
         <el-table-column label="操作" width="240" align="center">
           <template slot-scope="scope">
-            <!-- <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}"> -->
+           
+             
+            <!-- <span>
+              <el-button type="primary" size="small" @click="toRenZhen(scope.row.user_id,scope.row.user_name)">
+                    <span>CA个人认证</span>
+              </el-button>
+            </span>
+
+            <span>
+              <el-button type="primary" size="small" @click="toYinZhang(scope.row.user_id,scope.row.user_name)">
+                    <span>创建个人印章</span>
+              </el-button>
+            </span>
+
+            <span>
+              <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
+                    <span>授权用户企业印章</span>
+              </el-button>
+            </span> -->
             <el-tooltip
               class="item"
               effect="dark"
@@ -252,11 +347,130 @@
       </el-row>
       <admin-info-form ref="admininfoform"></admin-info-form>
     </div>
+
+    <el-dialog
+      title="CA企业认证"
+      :visible.sync="dialogVisible"
+      width="50%">
+      <span>
+        
+        <el-form>
+          <el-row>
+            <el-col>
+               <el-form-item label="企业类型:">
+                <el-select
+                  v-model="form.org_type"
+                  filterable
+                  clearable
+                  allow-create
+                  placeholder="选择"
+                >
+                  <el-option
+                    v-for="item in businessList"
+                    :key="item.id"
+                    :label="item.name "
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+               </el-form-item>
+            </el-col>
+
+            <el-col>
+               <el-form-item label="企业名称:">
+                 <el-input style="width:200px" v-model="form.enterprise_name" placeholder="请按营业执照上面的公司填写名称"></el-input>
+               </el-form-item>
+            </el-col>
+
+            <el-col>
+               <el-form-item label="统一社会信用代码:">
+                 <el-input style="width:200px" v-model="form.code" placeholder="请输入统一社会信息代码"></el-input>
+               </el-form-item>
+            </el-col>
+
+            <el-col>
+               <el-form-item label="组织机构代码:">
+                 <el-input style="width:200px" v-model="form.org_code" placeholder="请输入统一社会信息代码"></el-input>
+               </el-form-item>
+            </el-col>
+
+           
+            <el-col>
+               <el-form-item label="法定代表人:">
+                 <el-input style="width:200px" v-model="form.legal_person_name" placeholder="请输入统一社会信息代码"></el-input>
+               </el-form-item>
+            </el-col>
+
+            <el-col>
+               <el-form-item label="法定代表人身份证:">
+                 <el-input style="width:200px" v-model="form.legal_id_card_num" placeholder="请输入统一社会信息代码"></el-input>
+               </el-form-item>
+            </el-col>
+
+            <el-col>
+               <el-form-item label="法人手机号码:">
+                 <el-input style="width:200px" v-model="form.legal_phone" placeholder="请输入法人手机号码"></el-input>
+               </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveEnterprise">立即认证</el-button>
+      </span>
+    </el-dialog>
+
+
+    <el-dialog
+      title="CA个人认证"
+      :visible.sync="persionDialogVisible"
+      width="50%">
+      <span>
+        
+        <el-form>
+          <el-row>
+          
+            <el-col>
+               <el-form-item label="姓名:">
+                 <el-input style="width:200px" v-model="personForm.display_name" placeholder="请输入姓名"></el-input>
+               </el-form-item>
+            </el-col>
+
+            <el-col>
+               <el-form-item label="身份证号:">
+                 <el-input style="width:200px" v-model="personForm.id_card_num" placeholder="请输入身份证号"></el-input>
+               </el-form-item>
+            </el-col>
+
+            <el-col>
+               <el-form-item label="手机号:">
+                 <el-input style="width:200px" v-model="personForm.phone" placeholder="请输入手机号"></el-input>
+               </el-form-item>
+            </el-col>
+
+           
+            <el-col>
+               <el-form-item label="验证码:">
+                 <el-input style="width:100px" v-model="form.code" placeholder="请输入验证码"></el-input>
+                 <el-button type="primary" size="small" @click="getCode">获取验证码</el-button>
+               </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="persionDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="savePersonEnterprise">立即认证</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -280,7 +494,32 @@ export default {
       org: null,
       isSubSuperAdmin: false,
       local_user_id: 0,
-      selectDrug:[]
+      selectDrug:[],
+      dialogVisible:false,
+      persionDialogVisible:false,
+      businessList:[
+        {id:1,name:"企业"},
+        {id:2,name:"个体工商户"},
+        {id:3,name:"政府机构"}
+      ],
+      form:{
+        id:0,
+        org_type:"",
+        enterprise_name:"",
+        code:"",
+        org_code:"",
+        legal_person_name:"",
+        legal_id_card_num:"",
+        legal_phone:"",
+      },
+      personForm:{
+        id:0,
+        display_name:"",
+        phone:"",
+        id_card_num:"",
+        admin_user_id:"",
+        code:"",
+      }
     };
   },
   components: {
@@ -288,6 +527,7 @@ export default {
     AdminInfoForm
   },
   created: function() {
+     
     this.local_user_id = this.$store.getters.xt_user.user.id;
     let page = 1;
     this.getRoles(page);
@@ -641,11 +881,138 @@ export default {
       })
     },
     toTestThrityMent(){
-      toTestThriytyMent().then(response=>{
+      toTestThrityMent().then(response=>{
         var sign =  response.data.data.sign
         console.log("sign",sign)
         this.$message.success("保存")
       })
+    },
+
+    saveEnterprise(){
+      
+        var params = {
+          id:this.form.id,
+          org_type:parseInt(this.form.org_type),
+          enterprise_name:this.form.enterprise_name,
+          code:this.form.code,
+          org_code:this.form.org_code,
+          legal_person_name:this.form.legal_person_name,
+          legal_id_card_num:this.form.legal_id_card_num,
+          legal_phone:this.form.legal_phone,
+        }
+       console.log("paramswowo",params)
+      saveEnterprise(params).then(response=>{
+        if(response.data.state==1){
+          var enterPrise =  response.data.data.enterPrise
+          this.dialogVisible = false
+          this.$message.success("保存成功!")
+        }
+      })
+    },
+    toGet(){
+      getEnterPriseById().then(response=>{
+        if(response.data.state == 1){
+          this.dialogVisible = true
+          var enterPrise =  response.data.data.enterPrise
+          this.form.id = enterPrise.id
+          this.form.org_type = enterPrise.org_type?enterPrise.org_type:""
+          this.form.enterprise_name = enterPrise.enterprise_name
+          this.form.code = enterPrise.code
+          this.form.org_code = enterPrise.org_code
+          this.form.legal_person_name = enterPrise.legal_person_name
+          this.form.legal_id_card_num  = enterPrise.legal_id_card_num
+          this.form.legal_phone = enterPrise.legal_phone
+        }
+      })
+    },
+    toRenZhen(admin_user_id,user_name){
+       
+      getPerseEnterPriseById(admin_user_id).then(response=>{
+        if(response.data.state== 1){
+          var lastPerson =  response.data.data.lastPerson
+          this.personForm.id = lastPerson.id
+          this.personForm.display_name = user_name
+          this.personForm.phone = lastPerson.phone
+          this.personForm.id_card_num = lastPerson.id_card_num
+          this.personForm.admin_user_id =lastPerson.admin_user_id
+          this.persionDialogVisible = true
+        }
+      })
+
+   
+    },
+    getCode(){
+        var params = {
+          phone:this.personForm.phone,
+        }
+       console.log("paramsowowo",params)
+      getMobileCode(params).then(response=>{
+        if(response.data.state == 1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+          this.$message.success("发送成功!")
+        }
+      }) 
+    },
+    savePersonEnterprise(){
+        var params = {
+          id:this.personForm.id,
+          display_name:this.personForm.display_name,
+          phone:this.personForm.phone,
+          id_card_num:this.personForm.id_card_num,
+          admin_user_id:this.personForm.admin_user_id,
+          code:this.personForm.code,
+        }
+       console.log("param2o2o2o2",params)
+      savePersionEnterPrise(params).then(response=>{
+        if(response.data.state == 1){
+          var personEnterPrse = response.data.data.personEnterPrse
+          this.$message.success("认证成功")
+          this.persionDialogVisible = false
+        }
+      })
+    },
+    toYinZhang(admin_user_id){
+      CreatePersionSeal(admin_user_id).then(response=>{
+        if(response.data.state == 1){
+          var personSeal =  response.data.data.personSeal
+          this.$message.success("创建成功")
+        }
+      })
+    },
+    toShouQuan(admin_user_id){
+      CreateNewEnterPrise(admin_user_id).then(response=>{
+         if(response.data.state == 1){
+           var newEnterPrise =  response.data.data.newEnterPrise
+           this.$message.success("保存成功!")
+         }
+      })
+    },
+    toTestThrity(){
+      toTestThrity().then(response=>{
+         if(response.data.state == 1){
+            var sign =  response.data.data.sign
+            console.log("signwoowow",sign)
+         }
+      })
+    },
+    toEnd(){
+      toEndEnterPrise().then(response=>{
+        if(response.data.state == 1){
+          var sign = response.data.data.sign
+
+          this.$message.success("保存成功")
+        }
+      })
+    },
+    toWatch(){
+      getEnterPriseDetail().then(response=>{
+        if(response.data.state == 1){
+          var sign = response.data.data.sign
+
+          this.$message.success("保存成功")
+        }
+      })
     }
   },
   watch: {

src/xt_pages/sign/Schedulingdisplay.vue

@@ -46,8 +46,8 @@
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
                           <p style="width:12%">分区</p>
-                          <p style="width:5%">{{ getdays(day) }}</p>
-                          <p style="width:79%">病人姓名 </p>
+                          <p style="width:6%">{{ getdays(day) }}</p>
+                          <p style="width:78%">病人姓名 </p>
                         </div>
                     </div>
                     <div class="lineUpList">
@@ -55,7 +55,7 @@
                         <p style="display: inline-block;width:12%;text-align: center;">{{ item[1].name }}</p>
                         <p style="display: inline-block;width:87%">
                           <span v-for="(it,index) in item[1].data" :key="index" >
-                            {{ it.name }}&nbsp;&nbsp;
+                            {{nameSplit(it.name)}}&nbsp;&nbsp;
                           </span>
                         </p>
                       </div>
@@ -81,7 +81,8 @@
                             <p style="display: inline-block;width:12%;text-align: center;">{{ item[1].name }}</p>
                             <p style="display: inline-block;width:87%">
                               <span v-for="(it,index) in item[1].data" :key="index" >
-                                {{ it.name }}&nbsp;&nbsp;
+                                <!-- {{ it.name }}&nbsp;&nbsp; -->
+                                {{nameSplit(it.name)}}
                               </span>
                             </p>
                           </div>
@@ -131,7 +132,7 @@ export default {
       currentPage: 1,
       total:0,
       page:0,
-      pagesize:6,
+      pagesize:4,
       day:'',
       teem_sel: [
         { name: "上午", id: 1 },
@@ -144,7 +145,9 @@ export default {
           {"name":"周名浩","patient_id":"12394","partition_id":"1291","bed_id":"3593","zon_name":"A1区","number":"4"},
           {"name":"许素琼","patient_id":"10893","partition_id":"1291","bed_id":"3594","zon_name":"A1区","number":"5"},
           {"name":"陈少荣","patient_id":"17925","partition_id":"1291","bed_id":"3595","zon_name":"A1区","number":"6"},
-          {"name":"石佩贤","patient_id":"21244","partition_id":"1291","bed_id":"5455","zon_name":"A1区","number":"31（滤）"}]},
+          {"name":"石佩贤","patient_id":"21244","partition_id":"1291","bed_id":"5455","zon_name":"A1区","number":"31（滤）"},
+          {"bed_id": "4500",'name': "B区刘春秀","number": "B1","partition_id": "1797","patient_id": "17581","zon_name": "B区"},
+          {"bed_id": "4406",'name': "右7H34杨贵益","number": "1号床","partition_id": "1797","patient_id": "17581","zon_name": "B区"}]},
           "1333":{"name":"A2区","data":[{"name":"王梓绵","patient_id":"20283","partition_id":"1333","bed_id":"3596","zon_name":"A2区","number":"7"},
           {"name":"陈惠艮","patient_id":"17935","partition_id":"1333","bed_id":"3597","zon_name":"A2区","number":"8"},
           {"name":"曾御贞","patient_id":"11218","partition_id":"1333","bed_id":"3598","zon_name":"A2区","number":"9"},
@@ -361,12 +364,28 @@ export default {
           return this.teem_sel[i].name
         }
       }
-    }
+    },
+    nameSplit(val) {
+      var reg = /[\u4e00-\u9fa5]/g
+      let name = val
+      name = name.substr(-4)
+      var names = name.match(reg)
+      name = names.join('')
+      if (name.includes('区')) {
+        name = name.replace('区', '')
+      }
+      if (name.includes('号')) {
+        name = name.replace('号', '')
+      }
+      return name
+    },
 
   },
   created(){ 
-    this.org_id = this.$store.getters.xt_user.org_id
-    // this.schArr = Object.entries(this.data);
+    
+    // console.log('jiequsdfasdfas',this.nameSplit('左B区陈漫'));
+    this.org_id = this.$store.getters.xt_user.org_id 
+    this.schArr = Object.entries(this.data);
     // console.log('5555555555',Math.ceil(this.schArr.length / this.pagesize));
     // console.log('00000',arr);
     // this.getindexschedulelist()
@@ -381,6 +400,7 @@ export default {
 <style lang="scss" scoped>
 .main-contain{
     height: 100%;
+    
 }
 .page_lineUp{
     height: 100%;

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -354,7 +354,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
@@ -1959,6 +1959,7 @@ export default {
       if(max_unit == min_unit){
          all_price = max_str * price + min_str * price
       }
+      console.log("all_pricewowo",all_price)
       if(all_price > 0){
         return all_price.toFixed(2)
       }else{

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -46,6 +46,7 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
+import print from "print-js";
 import { uParseTime } from '@/utils/tools'
 import { getInventoryModeList } from "@/api/drug/drug"
 export default {

src/xt_pages/stock/inventoryPrint.vue

@@ -45,6 +45,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import print from "print-js";
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
 import { getInventoryExportList } from "@/api/stock"

src/xt_pages/stock/query/goodNewQuery.vue

@@ -797,7 +797,8 @@ export default {
    exportList(){
       import('@/vendor/Export2Excel').then(excel => {
       
-         if(this.tableList!=null && this.tableList.length > 0){
+        if(this.org_id!=0 && this.org_id!=9956){
+          if(this.tableList!=null && this.tableList.length > 0){
           for(let i=0;i<this.tableList.length;i++){
             this.tableList[i].index = i+1
             this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
@@ -826,7 +827,42 @@ export default {
            filename: '库存查询'
          })
           this.downloadLoading = false
-        })
+        }
+
+        if(this.org_id == 0 || this.org_id == 9956){
+         
+          if(this.tableList!=null && this.tableList.length > 0){
+          for(let i=0;i<this.tableList.length;i++){
+            this.tableList[i].index = i+1
+            this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
+            this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+            this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+            this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
+            this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
+            this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
+
+          }
+         }
+         
+
+         const tHeader = ['序号','耗材编码','耗材类型', '耗材名称', '规格&单位','生产厂商','经销商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+         const filterVal = ['index','good_number','type_name', 'good_name', 'spec','manufacturer_name','dealer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+        
+         const data = this.formatJson(filterVal, this.tableList)
+         
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '库存查询'
+         })
+          this.downloadLoading = false
+        }
+   
+       })
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));

src/xt_pages/stock/query/goodNewQueryPrint.vue

@@ -33,6 +33,7 @@
               <thead>
                 <tr>
                   <td width="5%">序号</td>
+                  <td width="5%" v-if="org_id ==0 || org_id ==9956">耗材编码</td>
                   <td width="6%">耗材类型</td>
                   <td width="10%">耗材名称</td>
                   <td width="10%">规格&单位</td>
@@ -53,6 +54,7 @@
                 <tr v-for="(item, index) in tableList" :key="index">
                   <!-- 序号 -->
                   <td>{{ index + 1 }}</td>
+                  <td width="5%" v-if="org_id ==0 || org_id ==9956">{{item.good_number }}</td>
                   <!-- 耗材类型 -->
                   <td>{{ getGoodTypeName(item.good_type_id) }}</td>
                   <!-- 耗材名称 -->

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -1001,6 +1001,9 @@ export default {
     this.$router.push({path:"/purchase/new/stock/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
    },
    exportList: function() {
+
+       if(this.org_id!=0&& this.org_id!=9956){
+         
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
@@ -1028,6 +1031,39 @@ export default {
               filename
             })
         })
+       }
+
+       if(this.org_id == 0 || this.org_id == 9956){
+        
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].query_date = this.start_time+"~"+this.end_time
+          this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
+          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+          this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
+        }
+        import('@/vendor/Export2Excel').then(excel => {
+           const multiHeader = [['序号','耗材编码', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['','', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1']
+           const filterVal = ['index','good_number', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','dealer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+    
+           const data = this.formatJson(filterVal, this.tableList)
+           
+           const filename = '进销存查询'
+     
+          
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+        })
+       }
+   
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -25,6 +25,7 @@
                             <thead>
                                 <tr>
                                   <td rowspan="2" width="80">序号</td>
+                                  <td rowspan="2" width="80" v-if="org_id==9956">耗材编码</td>
                                   <td rowspan="2" width="80">耗材名称</td>
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
@@ -54,6 +55,7 @@
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
+                                 <td v-if="org_id==9956">{{item.good_number}}</td>
                                  <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>

src/xt_pages/user/components/PatientDetail.vue

@@ -366,7 +366,7 @@
               </el-col>
 
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转地: "
                 >
@@ -380,9 +380,9 @@
                  </el-select>
                 </el-form-item>
               </el-col>
-           
+            -->
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转开始时间 : "
                 >
@@ -400,9 +400,9 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转结束时间 : "
                 >
@@ -420,9 +420,9 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col> 
+              </el-col>  -->
 
-                <el-col :span="8" style="margin-bottom: 20px;">
+                <!-- <el-col :span="8" style="margin-bottom: 20px;">
                 <el-form-item
                   label="备注 : "
                   prop="sch_remark">
@@ -435,7 +435,7 @@
                     placeholder
                   ></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
             <el-col :span="8" style="height: 59px">
               <el-form-item
@@ -1374,8 +1374,6 @@ export default {
       patientSourceList:[
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
-        {value:3,label:"请假"},
-        {value:4,label:"流转"}
       ],
       generic_info_fold: true,
       treat_info_fold: true,

src/xt_pages/user/components/PatientForm.vue

@@ -394,7 +394,7 @@
                 </el-form-item>
               </el-col>
       
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者去向 : "
                 >
@@ -408,11 +408,11 @@
                     >
                   </el-radio-group>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
            
 
             
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转地: "
                 >
@@ -425,11 +425,11 @@
                     </el-option>
                  </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
            
  
              
-                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转开始时间 : "
                 >
@@ -447,9 +447,9 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转结束时间 : "
                 >
@@ -467,11 +467,11 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col> 
+              </el-col>  -->
            
              
 
-              <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="备注 : "
                   prop="sch_remark">
@@ -483,7 +483,7 @@
                     placeholder
                   ></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
 
               <el-col :span="24" :style="isEdit ? 'width:360px' : ''" v-show="showLapseto">
@@ -1411,8 +1411,6 @@ export default {
       patientSourceList:[
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
-        {value:3,label:"请假"},
-        {value:4,label:"流转"}
       ],
       lapsetoOptions: [
         { value: 1, label: "留治" },

src/xt_pages/user/components/PatientSidebar.vue

@@ -99,6 +99,10 @@ export default {
               label:'血管通路'
             },
             // {
+            //   name:'1-12',
+            //   label:'血管通路图'
+            // },
+            // {
             //   name: '1-2',
             //   label: '病程管理'
             // },
@@ -203,68 +207,69 @@ export default {
             },
           ]
         },
-        // {
-        //   name: '5',
-        //   label: '评估工具',
-        //   children: [
-        //     {
-        //       name: '5-1',
-        //       label: '跌倒评估'
-        //     },
-        //     {
-        //       name: '5-2',
-        //       label: '小儿跌倒风险评估'
-        //     },
-        //     {
-        //       name: '5-3',
-        //       label: '压疮风险评估'
-        //     },
-        //     {
-        //       name: '5-4',
-        //       label: 'OH压疮评估'
-        //     },
-        //     {
-        //       name: '5-5',
-        //       label: '日常生活能力评估'
-        //     },
-        //     {
-        //       name: '5-6',
-        //       label: '导管脱落风险评估'
-        //     },
-        //     {
-        //       name: '5-7',
-        //       label: 'RASS及疼痛评估'
-        //     },
-        //     {
-        //       name: '5-8',
-        //       label: '营养状况评估'
-        //     },
-        //     {
-        //       name: '5-9',
-        //       label: '约束告知单'
-        //     },
-        //     {
-        //       name: '5-10',
-        //       label: '心理评估'
-        //     },
-        //     {
-        //       name: '5-11',
-        //       label: '瘙痒评估'
-        //     },
-        //     {
-        //       name: '5-12',
-        //       label: '血液透析患者评估'
-        //     },
-        //     {
-        //       name: '5-13',
-        //       label: 'Glasgow昏迷评分量表'
-        //     },
-        //     {
-        //       name: '5-14',
-        //       label: '肌力评估表'
-        //     },
-        //   ]
-        // },
+        {
+          name: '5',
+          label: '评估工具',
+          children: [
+            {
+              name: '5-1',
+              label: '跌倒评估'
+            },
+            {
+              name: '5-2',
+              label: '小儿跌倒风险评估'
+            },
+            {
+              name: '5-3',
+              label: '压疮风险评估'
+            },
+            {
+              name: '5-4',
+              label: 'OH压疮评估'
+            },
+            {
+              name: '5-5',
+              label: '日常生活能力评估'
+            },
+            {
+              name: '5-6',
+              label: '导管脱落风险评估'
+            },
+            {
+              name: '5-7',
+              label: 'RASS及疼痛评估'
+            },
+            {
+              name: '5-8',
+              label: '营养状况评估'
+            },
+            {
+              name: '5-9',
+              label: '约束告知单'
+            },
+            {
+              name: '5-10',
+              label: '心理评估'
+            },
+            {
+              name: '5-11',
+              label: '瘙痒评估'
+            },
+            {
+              name: '5-12',
+              label: '血液透析患者评估'
+            },
+            {
+              name: '5-13',
+              label: 'Glasgow昏迷评分量表'
+            },
+            {
+              name: '5-14',
+              label: '肌力评估表'
+            },
+          ]
+        },
+        
       ],
       name:""
     }
@@ -326,45 +331,49 @@ export default {
         this.$router.push({path:'/patients/inspection_check?id='+this.id})
       } else if(name == '4-3'){
         this.$router.push({path:'/patients/ktv?id='+this.id})
-      }
-      // else if (name == '5-1') {
-      //   this.$router.push({
-      //     path: '/patients/patient/'+ this.id +'/Fallassessment'
-      //   })
-      // } else if (name == '5-2') {
-      //   this.$router.push({
-      //     path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
-      //   })
-      // } else if (name == '5-3') {
-      //   this.$router.push({
-      //     path: '/patients/patient/' + this.id + '/pressuresore'
-      //   })
-      // } else if (name == '5-4') {
-      //   this.$router.push({
-      //     path: '/patients/patient/' + this.id + '/OHpressuresore'
-      //   })
-      // } else if (name == '5-5'){
-      //   this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
-      // } else if (name == '5-6'){
-      //   this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
-      // } else if (name == '5-7'){
-      //   this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
-      // } else if(name == '5-8'){
-      //   this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
-      // } else if(name == '5-9'){
-      //   this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
-      // } else if(name == '5-10'){
-      //   this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
-      // } else if(name == '5-11'){
-      //   this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
+      } 
+      // else if(name == '1-12'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/angiogram'})
+      // } 
+      else if (name == '5-1') {
+        this.$router.push({
+          path: '/patients/patient/'+ this.id +'/Fallassessment'
+        })
+      } else if (name == '5-2') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
+        })
+      } else if (name == '5-3') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/pressuresore'
+        })
+      } else if (name == '5-4') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/OHpressuresore'
+        })
+      } else if (name == '5-5'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
+      } else if (name == '5-6'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
+      } else if (name == '5-7'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
+      } else if(name == '5-8'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
+      } else if(name == '5-9'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
+      } else if(name == '5-10'){
+        this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
+      } else if(name == '5-11'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
 
-      // } else if(name == '5-12'){
-      //   this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
-      // } else if(name == '5-13'){
-      //   this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
-      // } else if(name == '5-14'){
-      //   this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
-      // }
+      } else if(name == '5-12'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
+      } else if(name == '5-13'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
+      } else if(name == '5-14'){
+        this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
+      }
+     
     },
     changePatient(value) {
       console.log(value)

src/xt_pages/user/dialysisRecord.vue

@@ -153,6 +153,15 @@
               <span>{{getTime(scope.row.assessment_after_dislysis)}}</span>
             </template>
           </el-table-column>
+
+          <el-table-column  width="96" align="center" label="透析器/灌流器">
+             <template slot-scope="scope">
+                 {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+                 {{ scope.row.prescription.dialysis_dialyszers }}
+              <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{ scope.row.prescription.dialysis_irrigation }}</span>    
+             </template>
+          </el-table-column>
+
           <el-table-column
             prop="predialysis_evaluation.dry_weight"
             width="96"
@@ -337,6 +346,7 @@
               <th>分区机号</th>
               <th>透析模式</th>
               <th>透析时长（h）</th>
+              <th>透析器/灌流器</th>
               <th>干体重（kg）</th>
               <th>透前称重（kg）</th>
               <th>透后称重（kg）</th>
@@ -356,6 +366,11 @@
                 <td>{{ item.partition_name }}-{{ item.device.number }}</td>
                 <td>{{ modeName(item.prescription.mode_id) }}</td>
                 <td>{{getTime(item.assessment_after_dislysis)}}</td>
+                <td>
+                   <span v-if="item.prescription.dialyzer_perfusion_apparatus"></span>
+                   <span v-if="item.prescription.dialysis_dialyszers!=''">{{ item.prescription.dialysis_dialyszers }} </span>
+                   <span v-if="item.prescription.dialysis_irrigation!=''">/{{ item.prescription.dialysis_irrigation }} </span> 
+                </td>
                 <td>{{ item.predialysis_evaluation.dry_weight }}</td>
                 <td>{{ item.predialysis_evaluation.weight_before }}</td>
                 <td>{{ item.assessment_after_dislysis.weight_after }}</td>

src/xt_pages/user/evaluationtool/Muscleforce.vue

@@ -1,173 +1,173 @@
 <template>
-    <div class="patient-container">
-        <patient-sidebar :id="patientID" defaultActive="5-14"></patient-sidebar>
-        <div>
-            <div class="patient-app-container advice-container app-container">
-                <div class="content_top">
-                    <!-- 左 -->
-                    <div style="width: 58%;">
-                        <div style="margin-bottom: 20px;"><el-button type="primary">新增</el-button></div>
-                        <div style="font-size: 20px;margin-bottom: 20px;">肌力评估表</div>
-                        <div style="width: 100%;">
-                            <table class="table" border="1" style="width: 100%;">
-                                <thead>
-                                    <tr>
-                                        <th style="width: 150px;">级别</th>
-                                        <th>分值</th>
-                                    </tr>
-                                </thead>
-                                <!-- <tbody>
-                                    <tr class="bg_color">
-                                        <td class="start">0级</td>
-                                        <td>
-                                            <div class="jiange">
-                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball"/>&nbsp; 肌肉完全不收缩</label>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    
-                                    <tr>
-                                        <td class="start">1级</td>
-                                        <td>
-                                            <div class="jiange">
-                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp; 可见肌肉收缩但无肢体运动</label>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                   
-                                    <tr class="bg_color">
-                                        <td class="start">2级</td>
-                                        <td>
-                                            <div class="jiange">
-                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball"/>
-                                                    &nbsp;肢体能在床上移动，但不能抬离床面，即不能对抗地心引力
-                                                </label>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                   
-                                    <tr >
-                                        <td class="start">3级</td>
-                                        <td>
-                                            <div class="jiange">
-                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
-                                                    &nbsp;肢体能抬离床面，克服地心引力做随意运动，但不能对抗外加阻力
-                                                </label>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    
-                                    <tr class="bg_color">
-                                        <td class="start">4级</td>
-                                        <td>
-                                            <div class="jiange">
-                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
-                                                    &nbsp;能在一般的外加阻力下作运动，但力量较正常弱
-                                                </label>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                   
-                                    <tr>
-                                        <td class="start">5级</td>
-                                        <td>
-                                            <div class="jiange">
-                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
-                                                    &nbsp;正常肌力
-                                                </label>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </tbody> -->
-                              <tbody>
-                                <tr v-for="(item,index) in shuju" :key="index" :style="{'background':(index==0 || index % 2==0) ?'rgb(243, 240, 240)':'white'}">
-                                  <td class="start">{{ item.title }}</td>
-                                  <td>
-                                    <div class="jiange">
-                                      <label style="font-size: 15px;"><input type="checkbox" name="ball" :value="item.value" @change="handleCheckedCitiesChange"/>&nbsp;{{ item.value }}</label>
-                                    </div>
-                                  </td>
-                                </tr>
-                              </tbody>
-                            </table>
-                        </div>
-                        
-                        <div style="vertical-align: top;  margin: 10px 0px; position: relative;">
-                            <span style="position: relative; top: -55px;">护理措施：</span>
-                            <div style="margin-top: 20px;display: inline-block; width: 90%;">
-                                <el-input maxlength="200" type = "textarea" :rows="3" v-model="input" placeholder="输入护理措施，200字以内" ></el-input>
-                            </div>
-                        </div>
-                        
-                        <div>
-                            <div class="bottoms">
-                                <span>级别:</span>
-                                <el-input v-model="Mus_Totalpoints" style="width: 100px;"></el-input>级
-                            </div>
+  <div class="patient-container">
+    <patient-sidebar :id="patientID" defaultActive="5-14"></patient-sidebar> 
+    <div>
+      <div class="patient-app-container advice-container app-container">
+        <div class="content_top">
+          <!-- 左 -->
+          <div style="width: 58%;">
+              <div style="margin-bottom: 20px;"><el-button type="primary">新增</el-button></div>
+              <div style="font-size: 20px;margin-bottom: 20px;">肌力评估表</div>
+              <div style="width: 100%;">
+                  <table class="table" border="1" style="width: 100%;">
+                      <thead>
+                          <tr>
+                              <th style="width: 150px;">级别</th>
+                              <th>分值</th>
+                          </tr>
+                      </thead>
+                      <!-- <tbody>
+                          <tr class="bg_color">
+                              <td class="start">0级</td>
+                              <td>
+                                  <div class="jiange">
+                                      <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball"/>&nbsp; 肌肉完全不收缩</label>
+                                  </div>
+                              </td>
+                          </tr>
+                          
+                          <tr>
+                              <td class="start">1级</td>
+                              <td>
+                                  <div class="jiange">
+                                      <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp; 可见肌肉收缩但无肢体运动</label>
+                                  </div>
+                              </td>
+                          </tr>
+                          
+                          <tr class="bg_color">
+                              <td class="start">2级</td>
+                              <td>
+                                  <div class="jiange">
+                                      <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball"/>
+                                          &nbsp;肢体能在床上移动，但不能抬离床面，即不能对抗地心引力
+                                      </label>
+                                  </div>
+                              </td>
+                          </tr>
+                          
+                          <tr >
+                              <td class="start">3级</td>
+                              <td>
+                                  <div class="jiange">
+                                      <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
+                                          &nbsp;肢体能抬离床面，克服地心引力做随意运动，但不能对抗外加阻力
+                                      </label>
+                                  </div>
+                              </td>
+                          </tr>
+                          
+                          <tr class="bg_color">
+                              <td class="start">4级</td>
+                              <td>
+                                  <div class="jiange">
+                                      <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
+                                          &nbsp;能在一般的外加阻力下作运动，但力量较正常弱
+                                      </label>
+                                  </div>
+                              </td>
+                          </tr>
+                          
+                          <tr>
+                              <td class="start">5级</td>
+                              <td>
+                                  <div class="jiange">
+                                      <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
+                                          &nbsp;正常肌力
+                                      </label>
+                                  </div>
+                              </td>
+                          </tr>
+                      </tbody> -->
+                    <tbody>
+                      <tr v-for="(item,index) in shuju" :key="index" :style="{'background':(index==0 || index % 2==0) ?'rgb(243, 240, 240)':'white'}">
+                        <td class="start">{{ item.title }}</td>
+                        <td>
+                          <div class="jiange">
+                            <label style="font-size: 15px;"><input type="checkbox" name="ball" :value="item.value" @change="handleCheckedCitiesChange"/>&nbsp;{{ item.value }}</label>
+                          </div>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+              </div>
+              
+              <div style="vertical-align: top;  margin: 10px 0px; position: relative;">
+                  <span style="position: relative; top: -55px;">护理措施：</span>
+                  <div style="margin-top: 20px;display: inline-block; width: 90%;">
+                      <el-input maxlength="200" type = "textarea" :rows="3" v-model="input" placeholder="输入护理措施，200字以内" ></el-input>
+                  </div>
+              </div>
+              
+              <div>
+                  <div class="bottoms">
+                      <span>级别:</span>
+                      <el-input v-model="Mus_Totalpoints" style="width: 100px;"></el-input>级
+                  </div>
 
-                            <div class="bottoms">
-                                <span>评估日期:</span>
-                                <el-date-picker
-                                    v-model="value1"
-                                    type="date"
-                                    placeholder="选择日期"
-                                    :clearable="false"
-                                    style="width: 150px;">
-                                </el-date-picker>
-                            </div>
+                  <div class="bottoms">
+                      <span>评估日期:</span>
+                      <el-date-picker
+                          v-model="value1"
+                          type="date"
+                          placeholder="选择日期"
+                          :clearable="false"
+                          style="width: 150px;">
+                      </el-date-picker>
+                  </div>
 
-                            <div class="bottoms">
-                                <span>评估人:</span>
-                                <el-select v-model="value" placeholder="请选择" >
-                                    <el-option
-                                    v-for="item in options"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                    style="width:150px;">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            
-                        </div> 
-                    </div>
-                    <!-- 虚线 -->
-                    <div style="height: 100vh; width: 1px; border-left:1px dashed #DCDFE6 ;"></div>
-                    <!-- 右 -->
-                    <div style="width: 38%;">
-                        <div style="font-size: 20px; margin-bottom: 20px;">评估历史记录</div>
-                        <div style="width: 100%;">
-                            <el-table
-                            :data="tableData"
-                            stripe
-                            border
-                            :header-cell-style="{
-                                background: '#0077ff9f',color:'white'}"
-                            style="width: 100%">
-                                <el-table-column
-                                prop="date"
-                                label="评估日期"
-                                width="180">
-                                </el-table-column>
-                                <el-table-column
-                                prop="name"
-                                label="总分"
-                                >
-                                </el-table-column>
-                                <el-table-column
-                                prop="name"
-                                label="评估人"
-                                >
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </div>
-                </div>
-                
-            </div>
+                  <div class="bottoms">
+                      <span>评估人:</span>
+                      <el-select v-model="value" placeholder="请选择" >
+                          <el-option
+                          v-for="item in options"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                          style="width:150px;">
+                          </el-option>
+                      </el-select>
+                  </div>
+                  
+              </div> 
+          </div>
+          <!-- 虚线 -->
+          <div style="height: 100vh; width: 1px; border-left:1px dashed #DCDFE6 ;"></div>
+          <!-- 右 -->
+          <div style="width: 38%;">
+              <div style="font-size: 20px; margin-bottom: 20px;">评估历史记录</div>
+              <div style="width: 100%;">
+                  <el-table
+                  :data="tableData"
+                  stripe
+                  border
+                  :header-cell-style="{
+                      background: '#0077ff9f',color:'white'}"
+                  style="width: 100%">
+                      <el-table-column
+                      prop="date"
+                      label="评估日期"
+                      width="180">
+                      </el-table-column>
+                      <el-table-column
+                      prop="name"
+                      label="总分"
+                      >
+                      </el-table-column>
+                      <el-table-column
+                      prop="name"
+                      label="评估人"
+                      >
+                      </el-table-column>
+                  </el-table>
+              </div>
+          </div>
         </div>
-       
+          
+      </div>
     </div>
+      
+  </div>
 </template>
 <script>
 import PatientSidebar from '../components/PatientSidebar.vue'

src/xt_pages/user/patients.vue

@@ -253,7 +253,7 @@
           </ul>
         </div>
       </div>
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">患者去向</span> : </label>
         <div class="time ">
           <ul class="">
@@ -267,7 +267,7 @@
             </li>
           </ul>
         </div>
-      </div>
+      </div> -->
       <div class="cell clearfix">
         <label class="title"><span class="name">其它查询</span> : </label>
         <el-select
@@ -525,7 +525,7 @@
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required>
+          <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3"> 
             <el-date-picker
               v-model="lapsetoForm.lapseto_time"
               type="datetime"
@@ -539,6 +539,47 @@
           <el-form-item label="转出(死亡)原因:" v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3">
               <el-input v-model="lapsetoForm.out_reason"></el-input>
           </el-form-item>
+
+          <el-form-item label="开始时间:" v-if="lapsetoForm.lapseto_type != 2 && lapsetoForm.lapsetoType !=3">
+            <el-date-picker
+                  size="small"
+                  v-model="form.patient_start_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+         </el-form-item>
+
+         <el-form-item label="结束时间:" v-if="lapsetoForm.lapseto_type != 2 && lapsetoForm.lapsetoType !=3">
+            <el-date-picker
+                  size="small"
+                  v-model="form.patient_end_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+         </el-form-item>
+
+        <el-form-item label="转院地区:" v-if="lapsetoForm.lapseto_type == 4">
+          <el-select v-model="form.patient_address" placeholder="请选择">
+              <el-option
+                v-for="item in liuAddresslist"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+           </el-select>
+        </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="LapsetoDialogVisible = false">取 消</el-button>
@@ -638,34 +679,32 @@
             :data="patientAllgicList"
             border
             style="width: 100%">
-            <el-table-column  prop="date" label="流转地"  width="180"  align="center">
+            <el-table-column  prop="date" label="序号"  width="100"  align="center">
               <template  slot-scope="scope">
-                 {{ scope.row.patient_address }}
-
+                {{ scope.$index + 1 }}
               </template>
             </el-table-column>
-            <el-table-column  prop="name" label="流转开始时间"  width="180"   align="center">
+            <el-table-column  prop="date" label="转归方式"  width="100"  align="center">
+              <template  slot-scope="scope">
+                 {{getPatientSource(scope.row.patient_source) }}
+              </template>
+            </el-table-column>
+            
+            <el-table-column  prop="name" label="开始时间"  width="180"   align="center">
               <template  slot-scope="scope"  >
                  {{ getTime(scope.row.start_time) }}
-
               </template>
             </el-table-column>
 
-            <el-table-column  prop="name" label="开始流转结束时间"  width="180"   align="center">
+            <el-table-column  prop="name" label="结束时间"  width="180"   align="center">
               <template  slot-scope="scope"  >
                 {{ getTime(scope.row.end_time) }}
-
-              </template>
-            </el-table-column>
-            <el-table-column  prop="address"  label="流转地址"   align="center">
-              <template  slot-scope="scope" >
-                {{ scope.row.patient_address }}
               </template>
             </el-table-column>
-
-            <el-table-column  prop="address"  label="备注"   align="center">
+            
+            <el-table-column  prop="date" label="转院地区"  width="180"  align="center">
               <template  slot-scope="scope">
-                {{ scope.row.remake }}
+                 {{ scope.row.patient_address }}
               </template>
             </el-table-column>
           </el-table>
@@ -689,7 +728,7 @@
   import { log } from 'util'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
-
+  import { getDataConfig } from "@/utils/data";
   export default {
     name: 'Patient',
     components: {
@@ -738,7 +777,14 @@
         lapsetoOptions: [
           { value: 1, label: '留治' },
           { value: 2, label: '转出' },
-          { value: 3,  label: "死亡" },
+          { value: 3, label: "死亡" },
+          { value: 4, label: "转院" },
+          { value: 5, label:"肾移植"},
+          { value: 6, label:"转腹透"},
+          { value:7,  label:"出院"},
+          { value:8,  label:"好转"},
+          { value:9,  label:"放弃治疗"},
+          { value:10, label:"其他状态"},
         ],
         systemType: 0,
         systemArr: [
@@ -761,16 +807,20 @@
           {value:0,label:"全部",source:0,lapeseto:0},
           {value:1,label:"门诊",source:1,lapeseto:1},
           {value:2,label:"住院",source:2,lapeseto:2},
-          {value:3,label:"请假",source:3,lapeseto:3},
-          {value:4,label:"流转",source:4,lapeseto:4}
+         
        ],
         lapsetoArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           { value: 1, label: '转出', source: 0, lapseto: 2 },
           { value: 2, label: '留治', source: 0, lapseto: 1 },
           { value: 3, label: '死亡', source:0,  lapseto: 3 },
-          // { value: 3, label: "门诊", source: 1, lapseto: 1 },
-          // { value: 4, label: "住院", source: 2, lapseto: 1 }
+          { value: 4, label: "转院", source: 0, lapseto: 4 },
+          { value: 5, label: "肾移植", source: 0, lapseto: 5 },
+          { value: 6, label: "转腹透", source: 0, lapseto: 6 },
+          { value: 7, label: "出院", source: 0, lapseto: 7 },
+          { value: 8, label: "好转", source: 0, lapseto: 8 },
+          { value: 9, label: "放弃治疗", source: 0, lapseto: 9 },
+          { value: 10, label: "其他状态", source: 0, lapseto: 10 },
         ],
         scheduling: [
           {
@@ -839,10 +889,17 @@
         totalOne: 0,
         page: 1,
         limit: 5,
-        patientAllgicList:[]
+        patientAllgicList:[],
+        liuAddresslist:[],
+        form:{
+          patient_address:"",
+          patient_start_time:"",
+          patient_end_time:"",
+        }
       }
     },
     created() {
+      this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
       if(sessionStorage.getItem('patientPageSize')){
         this.listQuery.limit = parseInt(sessionStorage.getItem('patientPageSize'))
       }
@@ -1272,10 +1329,14 @@
         return row.total_dialysis + row.user_sys_before_count
       },
       EditLapseto() {
-        if (this.lapsetoForm.lapseto_time == '') {
-          this.$message.error('请选择时间')
-          return
+
+        if(this.lapsetoForm.lapeseto ==2 || this.lapsetoForm.lapeseto == 3 ){
+          if (this.lapsetoForm.lapseto_time == '') {
+            this.$message.error('请选择时间')
+            return
+          }
         }
+      
         //  if(this.lapeseto == "留治"){
         //    this.lapsetoForm.lapseto_type = 1
         //  }
@@ -1286,7 +1347,7 @@
         //   this.lapsetoForm.lapseto_type = 3
         //  }
         console.log("22222",this.lapsetoForm)
-        EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm).then(
+        EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm,this.form.patient_start_time,this.form.patient_end_time,this.form.patient_address).then(
           response => {
             if (response.data.state === 1) {
               this.$notify({
@@ -1325,14 +1386,49 @@
       },
       LapsetoInfo(row) {
         console.log("row",row)
-        if (typeof row.lapseto === 'undefined' ||(row.lapseto !== 1 && row.lapseto !== 2 && row.lapseto !==3)) {
-          return '未设置'
-        } else if (row.lapseto === 1) {
+        if (row.lapseto === 1) {
           return '留治'
         } else if(row.lapseto === 2) {
           return '转出'
         }else if(row.lapseto === 3){
           return '死亡'
+        }else if(row.lapseto == 4){
+          return "转院"
+        }else if(row.lapseto == 5){
+          return "肾移植"
+        }else if(row.lapseto == 6){
+           return "转腹透"
+        }else if(row.lapseto == 7){
+           return "出院"
+        }else if(row.lapseto == 8){
+           return "好转"
+        }else if (row.lapseto == 9){
+           return "放弃治疗"
+        }else if (row.lapseto == 10){
+           return "其他状态"
+        }
+      },
+      getPatientSource(val){
+        if(val === 1) {
+          return '留治'
+        }else if(val === 2) {
+          return '转出'
+        }else if(val === 3){
+          return '死亡'
+        }else if(val == 4){
+          return "转院"
+        }else if(val == 5){
+          return "肾移植"
+        }else if(val == 6){
+           return "转腹透"
+        }else if(val == 7){
+           return "出院"
+        }else if(val== 8){
+           return "好转"
+        }else if (val == 9){
+           return "放弃治疗"
+        }else if (val == 10){
+           return "其他状态"
         }
       },
       openWechatBindDialog() {

src/xt_pages/user/vascularAccess.vue

@@ -115,8 +115,8 @@
               </el-tooltip>
            </template>
       </el-table-column>
-  </el-table>
-    <el-pagination
+      </el-table>
+      <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :page-sizes="[10,20,50,100]"
@@ -127,166 +127,166 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"></el-pagination>
 
-     <el-dialog
-         title="新增通路"
-         :visible.sync="dialogVisible"
-         width="65%"
-         center>
-      <el-form label-width="150px" :model="form" ref="form" :rules="rules" >
-         <el-row :gutter="24">
-            <el-col :span="24">
-                <el-form-item label="通路项目:"  prop="access_project"  > 
-                    <el-radio-group style="padding: 10px;" v-model="form.access_project" @change="changeRadio">
-                        <el-radio  label="1">内瘘</el-radio>
-                        <el-radio  label="2">导管</el-radio>
-                   </el-radio-group>
-                </el-form-item>
-            </el-col>
-         </el-row>
-         <el-row :gutter="24">
-            <el-col :span="8">
-               <el-form-item label="建立日期:" :required="true" prop="start_time">
-                 <el-date-picker
-                    type="datetime"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择时间"
-                    v-model="form.start_time"
-                    style="width:200px">
-                 </el-date-picker>
-               </el-form-item>
-            </el-col>
-             <el-col :span="8">
-               <el-form-item label="血管通路类型:" :required="true" prop="blood_access_part_opera_id">
-                 <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:200px">
-                    <el-option
-                        v-for="item in blood_access_part_opera"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                        >
-                    </el-option>
-                  </el-select>
-               </el-form-item>
-            </el-col>
-             <el-col :span="8">
-               <el-form-item label="血管通路部位:">
-                  <el-input v-model="form.blood_access_part_id" readonly @focus="showInnerDialog('17')" style="width:200px"></el-input>
-               </el-form-item>
-            </el-col>
-         </el-row>
+      <el-dialog
+          title="新增通路"
+          :visible.sync="dialogVisible"
+          width="65%"
+          center>
+        <el-form label-width="150px" :model="form" ref="form" :rules="rules" >
           <el-row :gutter="24">
-            <el-col :span="8">
-               <el-form-item label="血管通路部位(其他):"  prop="inflow_pass">
-                 <!-- <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
-                    <el-option
-                        v-for="item in optionsPass"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id">
-                    </el-option>
-                  </el-select> -->
-                  <el-input v-model="form.other_vascular" style="width:200px"></el-input>
-               </el-form-item>
-            </el-col>
-             <el-col :span="8">
-               <el-form-item label="首次启用日期:" prop="first_start_time">
-                  <el-date-picker
-                    type="datetime"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择时间"
-                    v-model="form.first_start_time"
-                    style="width:200px">
-                 </el-date-picker>
-               </el-form-item>
-            </el-col>
-             <el-col :span="8">
-               <el-form-item label="使用状态:" :required="true" prop="user_status">
-                 <el-select v-model="form.user_status" placeholder="请选择" style="width:200px" @change="changeStatus">
-                    <el-option
-                        v-for="item in options"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id">
-                    </el-option>
-                  </el-select>
-               </el-form-item>
-            </el-col>
-         </el-row>
-         <el-row :gutter="24" v-show="showOne">
-            <el-col :span="8">
-               <el-form-item label="导管感染转归:">
-                  <el-select v-model="form.ci_type" placeholder="请选择" style="width:200px" @change="changeStatus">
-                     <el-option
-                           v-for="item in optionsTwo"
-                           :key="item.id"
-                           :label="item.name"
-                           :value="item.id">
-                     </el-option>
-                  </el-select>
-               </el-form-item>
-             </el-col>
-             <el-col :span="8">
-               <el-form-item label="血培养检查结果:">
-                  <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:200px" @change="changeStatus">
-                     <el-option
-                           v-for="item in optionsThree"
-                           :key="item.id"
-                           :label="item.name"
-                           :value="item.id">
-                     </el-option>
-                  </el-select>
-               </el-form-item>
-            </el-col>
-            <el-col :span="8">
-               <el-form-item label="患者导管转归类型:">
-                  <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:200px" @change="changeStatus">
-                     <el-option
-                           v-for="item in optionsOne"
-                           :key="item.id"
-                           :label="item.name"
-                           :value="item.id">
-                     </el-option>
-                  </el-select>
-               </el-form-item>
-             </el-col>
-         </el-row>
-         <el-row v-show="show">
-            <el-col :span="8">
-               <el-form-item label="停用日期:">
+              <el-col :span="24">
+                  <el-form-item label="通路项目:"  prop="access_project"  > 
+                      <el-radio-group style="padding: 10px;" v-model="form.access_project" @change="changeRadio">
+                          <el-radio  label="1">内瘘</el-radio>
+                          <el-radio  label="2">导管</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="建立日期:" :required="true" prop="start_time">
                   <el-date-picker
-                    type="datetime"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择时间"
-                    v-model="form.stop_time"
-                    style="width:200px">
-                 </el-date-picker>
-               </el-form-item>
-            </el-col>
-         </el-row>
-         <el-row v-show="show">
-           <el-col>
-            <el-form-item label="停用原因:">
-               <el-input v-model="form.stop_reason"></el-input>
-            </el-form-item>
-           </el-col>  
-         </el-row>
-           <el-row>
-            <el-col>
-                <el-form-item label="备注:">
-                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+                      type="datetime"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择时间"
+                      v-model="form.start_time"
+                      style="width:200px">
+                  </el-date-picker>
                 </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="血管通路类型:" :required="true" prop="blood_access_part_opera_id">
+                  <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:200px">
+                      <el-option
+                          v-for="item in blood_access_part_opera"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id"
+                          >
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="血管通路部位:">
+                    <el-input v-model="form.blood_access_part_id" readonly @focus="showInnerDialog('17')" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+          </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="血管通路部位(其他):"  prop="inflow_pass">
+                  <!-- <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
+                      <el-option
+                          v-for="item in optionsPass"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                      </el-option>
+                    </el-select> -->
+                    <el-input v-model="form.other_vascular" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="首次启用日期:" prop="first_start_time">
+                    <el-date-picker
+                      type="datetime"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择时间"
+                      v-model="form.first_start_time"
+                      style="width:200px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="使用状态:" :required="true" prop="user_status">
+                  <el-select v-model="form.user_status" placeholder="请选择" style="width:200px" @change="changeStatus">
+                      <el-option
+                          v-for="item in options"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row :gutter="24" v-show="showOne">
+              <el-col :span="8">
+                <el-form-item label="导管感染转归:">
+                    <el-select v-model="form.ci_type" placeholder="请选择" style="width:200px" @change="changeStatus">
+                      <el-option
+                            v-for="item in optionsTwo"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="血培养检查结果:">
+                    <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:200px" @change="changeStatus">
+                      <el-option
+                            v-for="item in optionsThree"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="患者导管转归类型:">
+                    <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:200px" @change="changeStatus">
+                      <el-option
+                            v-for="item in optionsOne"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row v-show="show">
+              <el-col :span="8">
+                <el-form-item label="停用日期:">
+                    <el-date-picker
+                      type="datetime"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      placeholder="选择时间"
+                      v-model="form.stop_time"
+                      style="width:200px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row v-show="show">
+            <el-col>
+              <el-form-item label="停用原因:">
+                <el-input v-model="form.stop_reason"></el-input>
+              </el-form-item>
             </el-col>  
-         </el-row>
-      </el-form>
+          </el-row>
+            <el-row>
+              <el-col>
+                  <el-form-item label="备注:">
+                  <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+                  </el-form-item>
+              </el-col>  
+          </el-row>
+        </el-form>
 
-     <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="saveVasularAccess('form')">保存</el-button>
-     </span>
-     </el-dialog>
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="saveVasularAccess('form')">保存</el-button>
+      </span>
+      </el-dialog>
 
 
 
@@ -459,7 +459,7 @@
         <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
      </span>
      </el-dialog>
-
+     <sitemap> </sitemap>
     </div>
 
      <multi-select-box
@@ -467,6 +467,7 @@
         v-on:dialog-comfirm="innerDialogComfirm"
         v-on:dialog-cancle="innerDialogCancle"
       ></multi-select-box>
+      
   </div>
 </template>
 <script>
@@ -478,12 +479,13 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import { getDataConfig } from '@/utils/data'
   import multiSelectBox from '../dialysis/details/dialog/MultiSelectBox'
-    
+  import sitemap from './Sitemap'
   export default {
     name: 'doctorAdvice',
     components: {
       PatientSidebar,
-      multiSelectBox
+      multiSelectBox,
+      sitemap
     },
     data() {
       return {

src/xt_pages/workforce/components/tableWeeks.vue

@@ -907,7 +907,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0 && this.org_id!=10375){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/next_remind_print.vue

@@ -35,6 +35,7 @@
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
                   <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
                   <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
+                  <td width="100" >血管通路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
@@ -94,6 +95,9 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
+                <td :width="td_1_width">
+                  <span>{{getBloodName(main_collection.dialysissolution.blood_access)  }}</span>
+                </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
@@ -110,6 +114,7 @@
 
 <script>
   import { getNextScheduleWeekDay,getPrintList } from '@/api/schedule'
+  import { getDataConfig } from '@/utils/data'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -141,13 +146,18 @@
         pre_status:0,
         printObj:{},
         loading: false,
+        blood_access_option:[],
       }
     },
     components: {
       BreadCrumb
     },
     created() {
-   
+      
+      this.blood_access_option = getDataConfig(
+          'hemodialysis',
+          'vascular_access_desc'
+       )
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
       this.currentDate = this.getCurrentDate()
@@ -168,6 +178,15 @@
     
     },
     methods: {
+      getBloodName(id){
+         var name= ""
+         for(let i=0;i<this.blood_access_option.length;i++){
+           if(id == this.blood_access_option[i].id){
+              name = this.blood_access_option[i].name
+           }
+         }
+         return name
+      },
       getTimestamp(time) { //把时间日期转成时间戳
         return (new Date(time)).getTime()
       },

src/xt_pages/workforce/printOne.vue

@@ -489,6 +489,7 @@ export default {
       getSchedualPrintList(params).then((response) => {
         if (response.data.state == 1) {
           this.loading = false
+          console.log('111111',response.data.data);
           var list = response.data.data.list
           this.list = list
           var listOne = response.data.data.listOne

src/xt_pages/workforce/remind_print.vue

@@ -32,8 +32,9 @@
                   <td width="70" v-if="printObj.number == 1">机号</td>
                   <td width="120" v-if="printObj.mode == 1">透析模式</td>
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
-                  <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
+                  <td width="100" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
                   <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
+                  <td width="200">血管通路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
@@ -63,18 +64,7 @@
                 </td>
 
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
-                  <!-- <span v-if="org_id!=9987">
-                     <span > 
-                       <span v-if="org_id!=10131 && org_id!=10215 && org_id!=10233 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                     
-                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
-                      </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> 
-                  </span>
-                    {{main_collection.prescription.dialysis_dialyszers}}
-                  <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
-                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span> -->
-                  
+                 
                   <span v-if="main_collection.prescription.dialysis_dialyszers == ''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="main_collection.prescription.dialysis_dialyszers != ''">{{main_collection.prescription.dialysis_dialyszers}}</span>
 
@@ -104,6 +94,9 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
+                <td :width="td_1_width">
+                   <span>{{getBloodName(main_collection.prescription.blood_access)  }}</span>
+                </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>
                    <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
@@ -120,6 +113,7 @@
 
 <script>
   import { getScheduleList,getPrintList } from '@/api/schedule'
+  import { getDataConfig } from '@/utils/data'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
@@ -146,6 +140,7 @@
         printObj:{},
         week_time:0,
         zone:0,
+        blood_access_option:[]
       }
     },
     components: {
@@ -154,6 +149,12 @@
     created() {
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
+
+      this.blood_access_option = getDataConfig(
+          'hemodialysis',
+          'vascular_access_desc'
+       )
+      
      //console.log("org_id23322323",this.org_id)
     //  this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
@@ -414,6 +415,15 @@
         console.log('name', name)
         return name
       },
+      getBloodName(id){
+         var name= ""
+         for(let i=0;i<this.blood_access_option.length;i++){
+           if(id == this.blood_access_option[i].id){
+              name = this.blood_access_option[i].name
+           }
+         }
+         return name
+      }
     },
   }
 </script>

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -42,10 +42,13 @@
                     <span>{{getModeId(main_collection.mode_id)}}</span>
                   
                 </div>
-                <div class="printCell">
+                <div class="printCell" v-if="org_id!=10375">
                   <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
                 </div>
-                <div class="printCell">
+                <div class="printCell" v-if="org_id==10375">
+                  <span>抗凝剂：{{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}</span>
+                </div>
+                <div class="printCell" v-if="org_id!=10375">
                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}mg
@@ -79,7 +82,41 @@
                    </span>
                  
                 </div>
-                <div class="printCell">
+                <div class="printCell" v-if="org_id ==10375">
+                 首剂：<span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_shouji}} mg</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">
+                    {{main_collection.prescription.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">
+                    {{main_collection.prescription.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">
+                   {{main_collection.prescription.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">
+                   {{main_collection.prescription.anticoagulant_shouji}} mg
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">
+                   {{main_collection.prescription.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">
+                    {{main_collection.prescription.anticoagulant_shouji}}iu
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 8">
+                    {{main_collection.prescription.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 9">
+                    {{main_collection.prescription.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 10">
+                     {{main_collection.prescription.anticoagulant_shouji}}iu
+                    </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 11">
+                    {{main_collection.prescription.anticoagulant_shouji}}iu
+                   </span>
+                 
+                </div>
+                <div class="printCell" v-if="org_id!=10375">
                   维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg/h
@@ -116,8 +153,46 @@
                    </span>
               
                 </div>
+
+                <div class="printCell" v-if="org_id!=10375">
+                  维持：{{main_collection.prescription.anticoagulant_weichi}}
+                   <span v-if="main_collection.prescription.anticoagulant == 1">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">
+                    mg/h
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">
+                   iu/h
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 8">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 9">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 10">
+                    iu/h
+                    </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 11">
+                    iu/h
+                   </span>
+              
+                </div>
                
-                <div class="printCell">
+                <div class="printCell" v-if="org_id!=10375">
                   总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg
@@ -153,6 +228,44 @@
                    iu
                    </span>
           
+                </div>
+
+                <div class="printCell" v-if="org_id==10375">
+                  总量：{{main_collection.prescription.anticoagulant_zongliang}}
+                  <span v-if="main_collection.prescription.anticoagulant == 1">
+                    mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">
+                    mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">
+                    iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">
+                   mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">
+                    mg
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">
+                   iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">
+                    iu
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 8">
+                     iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 9">
+                   iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 10">
+                    iu
+                    </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 11">
+                   iu
+                   </span>
+          
                 </div>
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
                     <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>