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

package-lock.json

@@ -189,6 +189,70 @@
         }
       }
     },
+    "@foliojs-fork/fontkit": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@foliojs-fork/fontkit/-/fontkit-1.9.1.tgz",
+      "integrity": "sha512-U589voc2/ROnvx1CyH9aNzOQWJp127JGU1QAylXGQ7LoEAF6hMmahZLQ4eqAcgHUw+uyW4PjtCItq9qudPkK3A==",
+      "requires": {
+        "@foliojs-fork/restructure": "^2.0.2",
+        "brfs": "^2.0.0",
+        "brotli": "^1.2.0",
+        "browserify-optional": "^1.0.1",
+        "clone": "^1.0.4",
+        "deep-equal": "^1.0.0",
+        "dfa": "^1.2.0",
+        "tiny-inflate": "^1.0.2",
+        "unicode-properties": "^1.2.2",
+        "unicode-trie": "^2.0.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="
+        }
+      }
+    },
+    "@foliojs-fork/linebreak": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@foliojs-fork/linebreak/-/linebreak-1.1.1.tgz",
+      "integrity": "sha512-pgY/+53GqGQI+mvDiyprvPWgkTlVBS8cxqee03ejm6gKAQNsR1tCYCIvN9FHy7otZajzMqCgPOgC4cHdt4JPig==",
+      "requires": {
+        "base64-js": "1.3.1",
+        "brfs": "^2.0.2",
+        "unicode-trie": "^2.0.0"
+      },
+      "dependencies": {
+        "base64-js": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+          "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+        }
+      }
+    },
+    "@foliojs-fork/pdfkit": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@foliojs-fork/pdfkit/-/pdfkit-0.14.0.tgz",
+      "integrity": "sha512-nMOiQAv6id89MT3tVTCgc7HxD5ZMANwio2o5yvs5sexQkC0KI3BLaLakpsrHmFfeGFAhqPmZATZGbJGXTUebpg==",
+      "requires": {
+        "@foliojs-fork/fontkit": "^1.9.1",
+        "@foliojs-fork/linebreak": "^1.1.1",
+        "crypto-js": "^4.2.0",
+        "png-js": "^1.0.0"
+      },
+      "dependencies": {
+        "crypto-js": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+          "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+        }
+      }
+    },
+    "@foliojs-fork/restructure": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@foliojs-fork/restructure/-/restructure-2.0.2.tgz",
+      "integrity": "sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA=="
+    },
     "@samverschueren/stream-to-observable": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
@@ -235,8 +299,7 @@
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
     },
     "acorn-dynamic-import": {
       "version": "2.0.2",
@@ -261,6 +324,21 @@
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true
     },
+    "acorn-node": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+      "requires": {
+        "acorn": "^7.0.0",
+        "acorn-walk": "^7.0.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
+    },
     "adler-32": {
       "version": "1.2.0",
       "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.2.0.tgz",
@@ -438,6 +516,11 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
       "dev": true
     },
+    "array-from": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
+      "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg=="
+    },
     "array-includes": {
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
@@ -559,6 +642,58 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
+    "ast-transform": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz",
+      "integrity": "sha512-e/JfLiSoakfmL4wmTGPjv0HpTICVmxwXgYOB8x+mzozHL8v+dSfCbrJ8J8hJ0YBP0XcYu1aLZ6b/3TnxNK3P2A==",
+      "requires": {
+        "escodegen": "~1.2.0",
+        "esprima": "~1.0.4",
+        "through": "~2.3.4"
+      },
+      "dependencies": {
+        "escodegen": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz",
+          "integrity": "sha512-yLy3Cc+zAC0WSmoT2fig3J87TpQ8UaZGx8ahCAs9FL8qNbyV7CVyPKS74DG4bsHiL5ew9sxdYx131OkBQMFnvA==",
+          "requires": {
+            "esprima": "~1.0.4",
+            "estraverse": "~1.5.0",
+            "esutils": "~1.0.0",
+            "source-map": "~0.1.30"
+          }
+        },
+        "esprima": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+          "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA=="
+        },
+        "estraverse": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+          "integrity": "sha512-FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ=="
+        },
+        "esutils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
+          "integrity": "sha512-x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg=="
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
+          "optional": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "ast-types": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.8.tgz",
+      "integrity": "sha512-RIOpVnVlltB6PcBJ5BMLx+H+6JJ/zjDGU0t7f0L6c2M1dqcK92VQopLBlPQ9R80AVXelfqYgjcPLtHtDbNFg0Q=="
+    },
     "astral-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
@@ -1573,8 +1708,7 @@
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "batch": {
       "version": "0.6.1",
@@ -1765,12 +1899,46 @@
         }
       }
     },
+    "brfs": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brfs/-/brfs-2.0.2.tgz",
+      "integrity": "sha512-IrFjVtwu4eTJZyu8w/V2gxU7iLTtcHih67sgEdzrhjLBMHp2uYefUBfdM4k2UvcuWMgV7PQDZHSLeNWnLFKWVQ==",
+      "requires": {
+        "quote-stream": "^1.0.1",
+        "resolve": "^1.1.5",
+        "static-module": "^3.0.2",
+        "through2": "^2.0.0"
+      }
+    },
     "brorand": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
+    "brotli": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
+      "integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
+      "requires": {
+        "base64-js": "^1.1.2"
+      }
+    },
+    "browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg=="
+        }
+      }
+    },
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
@@ -1808,6 +1976,16 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "browserify-optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-optional/-/browserify-optional-1.0.1.tgz",
+      "integrity": "sha512-VrhjbZ+Ba5mDiSYEuPelekQMfTbhcA2DhLk2VQWqdcCROWeFqlTcXZ7yfRkXCIl8E+g4gINJYJiRB7WEtfomAQ==",
+      "requires": {
+        "ast-transform": "0.0.0",
+        "ast-types": "^0.7.0",
+        "browser-resolve": "^1.8.1"
+      }
+    },
     "browserify-rsa": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
@@ -1895,11 +2073,15 @@
       "integrity": "sha1-Q+Hjx389IvtVvqaJCpLQN3jEwQo=",
       "dev": true
     },
+    "buffer-equal": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+      "integrity": "sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA=="
+    },
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
     "buffer-indexof": {
       "version": "1.1.1",
@@ -2612,7 +2794,6 @@
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -2689,8 +2870,7 @@
     "convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "cookie": {
       "version": "0.5.0",
@@ -3361,12 +3541,16 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
       "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
       "requires": {
         "es5-ext": "^0.10.50",
         "type": "^1.0.1"
       }
     },
+    "dash-ast": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-2.0.1.tgz",
+      "integrity": "sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ=="
+    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -3428,8 +3612,7 @@
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
       "version": "1.5.2",
@@ -3601,6 +3784,11 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
+    "dfa": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz",
+      "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q=="
+    },
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -3772,6 +3960,14 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -4001,7 +4197,6 @@
       "version": "0.10.62",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
       "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
-      "dev": true,
       "requires": {
         "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.3",
@@ -4012,7 +4207,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "^0.10.35",
@@ -4023,7 +4217,6 @@
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "~0.10.14",
@@ -4042,7 +4235,6 @@
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
       "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
-      "dev": true,
       "requires": {
         "d": "^1.0.1",
         "es5-ext": "^0.10.62",
@@ -4055,8 +4247,7 @@
         "type": {
           "version": "2.7.2",
           "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-          "dev": true
+          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
         }
       }
     },
@@ -4064,7 +4255,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
       "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
       "requires": {
         "d": "^1.0.1",
         "ext": "^1.1.2"
@@ -4092,6 +4282,31 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
+    "escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "optional": true
+        }
+      }
+    },
     "escope": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
@@ -4424,14 +4639,17 @@
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+    },
+    "estree-is-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/estree-is-function/-/estree-is-function-1.0.0.tgz",
+      "integrity": "sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA=="
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "etag": {
       "version": "1.8.1",
@@ -4442,7 +4660,6 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "~0.10.14"
@@ -4710,7 +4927,6 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
       "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
-      "dev": true,
       "requires": {
         "type": "^2.7.2"
       },
@@ -4718,8 +4934,7 @@
         "type": {
           "version": "2.7.2",
           "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-          "dev": true
+          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
         }
       }
     },
@@ -4860,8 +5075,7 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "fastparse": {
       "version": "1.1.2",
@@ -5270,6 +5484,11 @@
         "globule": "^1.0.0"
       }
     },
+    "get-assigned-identifiers": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
+      "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -6777,7 +6996,6 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -7329,6 +7547,14 @@
         "yallist": "^2.1.2"
       }
     },
+    "magic-string": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
+      "integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
+      "requires": {
+        "sourcemap-codec": "^1.4.1"
+      }
+    },
     "make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
@@ -7444,6 +7670,21 @@
         "is-plain-obj": "^1.1"
       }
     },
+    "merge-source-map": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
+      "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==",
+      "requires": {
+        "source-map": "^0.5.6"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+        }
+      }
+    },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -7688,8 +7929,7 @@
     "next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-      "dev": true
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
     },
     "nice-try": {
       "version": "1.0.5",
@@ -8051,8 +8291,7 @@
     "object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
     },
     "object-is": {
       "version": "1.1.5",
@@ -8172,7 +8411,6 @@
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
       "requires": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -8487,6 +8725,27 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pdfmake": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.2.8.tgz",
+      "integrity": "sha512-lI+amfIaUL8CrPhndxFdhIgMj9JB49Sj4DARltKC1gLm/5NsPohZqfB+D+II8HymtPB6eugUFD5oBxmzO57qHA==",
+      "requires": {
+        "@foliojs-fork/linebreak": "^1.1.1",
+        "@foliojs-fork/pdfkit": "^0.14.0",
+        "iconv-lite": "^0.6.3",
+        "xmldoc": "^1.1.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
+      }
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -8586,6 +8845,11 @@
         "semver-compare": "^1.0.0"
       }
     },
+    "png-js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/png-js/-/png-js-1.0.0.tgz",
+      "integrity": "sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g=="
+    },
     "portfinder": {
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz",
@@ -10953,8 +11217,7 @@
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "prepend-http": {
       "version": "1.0.4",
@@ -11237,6 +11500,16 @@
       "integrity": "sha512-yHJWZWlTjNZzV34zuT4H55ttDwMxmVJ7JUgKnt/Wd3ejUNcaPOV57/sKG8VEMU5mL7bKZPIKmBdb3weM0M5UeA==",
       "dev": true
     },
+    "quote-stream": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
+      "integrity": "sha512-kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ==",
+      "requires": {
+        "buffer-equal": "0.0.1",
+        "minimist": "^1.1.3",
+        "through2": "^2.0.0"
+      }
+    },
     "raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
@@ -11909,8 +12182,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "schema-utils": {
       "version": "0.3.0",
@@ -11947,6 +12219,20 @@
         }
       }
     },
+    "scope-analyzer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/scope-analyzer/-/scope-analyzer-2.1.2.tgz",
+      "integrity": "sha512-5cfCmsTYV/wPaRIItNxatw02ua/MThdIUNnUOCYp+3LSEJvnG804ANw2VLaavNILIfWXF1D1G2KNANkBBvInwQ==",
+      "requires": {
+        "array-from": "^2.1.1",
+        "dash-ast": "^2.0.1",
+        "es6-map": "^0.1.5",
+        "es6-set": "^0.1.5",
+        "es6-symbol": "^3.1.1",
+        "estree-is-function": "^1.0.0",
+        "get-assigned-identifiers": "^1.1.0"
+      }
+    },
     "screenfull": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-4.2.0.tgz",
@@ -12127,6 +12413,11 @@
         "kind-of": "^6.0.2"
       }
     },
+    "shallow-copy": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+      "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw=="
+    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -12608,6 +12899,11 @@
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
     "spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -12774,6 +13070,14 @@
       "integrity": "sha512-H89UNKr1rQJvI1c/PIR3kiAMBV23yvR7LItZiV74HWZwzt7f3YHuujJ9nJZlt58WlFox7XQsOahexwk7nTe69A==",
       "dev": true
     },
+    "static-eval": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz",
+      "integrity": "sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw==",
+      "requires": {
+        "escodegen": "^1.11.1"
+      }
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -12795,6 +13099,27 @@
         }
       }
     },
+    "static-module": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.4.tgz",
+      "integrity": "sha512-gb0v0rrgpBkifXCa3yZXxqVmXDVE+ETXj6YlC/jt5VzOnGXR2C15+++eXuMDUYsePnbhf+lwW0pE1UXyOLtGCw==",
+      "requires": {
+        "acorn-node": "^1.3.0",
+        "concat-stream": "~1.6.0",
+        "convert-source-map": "^1.5.1",
+        "duplexer2": "~0.1.4",
+        "escodegen": "^1.11.1",
+        "has": "^1.0.1",
+        "magic-string": "0.25.1",
+        "merge-source-map": "1.0.4",
+        "object-inspect": "^1.6.0",
+        "readable-stream": "~2.3.3",
+        "scope-analyzer": "^2.0.1",
+        "shallow-copy": "~0.0.1",
+        "static-eval": "^2.0.5",
+        "through2": "~2.0.3"
+      }
+    },
     "statuses": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -13382,14 +13707,12 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
       "requires": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
@@ -13421,6 +13744,11 @@
       "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
+    "tiny-inflate": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
+      "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -13558,14 +13886,12 @@
     "type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
     },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2"
       }
@@ -13636,8 +13962,7 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "typo-js": {
       "version": "1.2.3",
@@ -13738,6 +14063,31 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
       "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
     },
+    "unicode-properties": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
+      "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
+      "requires": {
+        "base64-js": "^1.3.0",
+        "unicode-trie": "^2.0.0"
+      }
+    },
+    "unicode-trie": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
+      "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
+      "requires": {
+        "pako": "^0.2.5",
+        "tiny-inflate": "^1.0.0"
+      },
+      "dependencies": {
+        "pako": {
+          "version": "0.2.9",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+          "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="
+        }
+      }
+    },
     "unidecode": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/unidecode/-/unidecode-0.1.8.tgz",
@@ -15165,8 +15515,7 @@
     "word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
     },
     "wordwrap": {
       "version": "0.0.2",
@@ -15287,11 +15636,18 @@
         }
       }
     },
+    "xmldoc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.3.0.tgz",
+      "integrity": "sha512-y7IRWW6PvEnYQZNZFMRLNJw+p3pezM4nKYPfr15g4OOW9i8VpeydycFuipE2297OvZnh3jSb2pxOt9QpkZUVng==",
+      "requires": {
+        "sax": "^1.2.4"
+      }
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "xxhashjs": {
       "version": "0.2.2",

package.json

@@ -62,6 +62,7 @@
     "node-sass": "^4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
+    "pdfmake": "^0.2.8",
     "print-js": "^1.0.50",
     "qrcodejs2": "0.0.2",
     "sass-loader": "^7.3.1",

src/store/modules/globalConfig.js

@@ -939,6 +939,21 @@ const global_config = {
         zongliang_unit: 'iu',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      17: {
+        id: 17,
+        name: '肝素钠',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -65,10 +65,11 @@
               住院号/透析卡号：
               <div class="under_line" style="width: 120px;">
                 {{
-                  record.patient.admission_number
-                    ? record.patient.admission_number
+                  record.receive_assessment.admission_number
+                    ? record.receive_assessment.admission_number
                     : "无"
-                }}/{{ record.patient.dialysis_no }}
+                }}
+                 <span v-if="record.receive_assessment.admission_number == 0">/{{ record.patient.dialysis_no }}</span> 
               </div>
             </div>
           </div>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -3299,13 +3299,16 @@ export default {
               this.records[i].monitor_records[j].end = "【结束透析】";
               tempmonitorflag = false;
             }
-            if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
+            if(this.org_id!=10515 && this.org_id!=0){
+              if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
               this.records[i].monitor_records[j].end = "【结束透析】";
              }
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
                this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
              }
             }
+            
+            }
           }
           for (const recordIndex in this.records) {
             var dlegh = 0;

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyNine.vue

@@ -557,9 +557,17 @@ export default {
           this.org_template_info = resp.data.templateInfo
 
           this.records = this.records.concat(resp.data.schedules)
-
-          console.log('记录', this.records)
-
+           if(this.records!=null){
+            for(let i=0;i<this.records.length;i++){
+              if(this.records[i].advices!=null){
+                for(let j=0;j<this.records[i].advices.length;j++){
+                    this.records[i].his_advices.push(this.records[i].advices[j])
+                }
+              }
+           }
+            console.log('记录', this.records)
+           }  
+         
           for (const recordIndex in this.records) {
             var dlegh = 0
             if (

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -29,7 +29,7 @@
         <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>
+            <span class="unit">L/h</span>
         </li>
 
 

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -319,7 +319,7 @@
 
         <li v-if="isShow('尿量')">
           <label>尿量(ml): </label>
-          <span class="content">{{ this.record.urine_volume ? this.record.urine_volume : ''}}</span>
+          <span class="content">{{ this.record.urine_volume ? this.record.urine_volume : '0'}}</span>
           <span class="unit" v-if="this.record.urine_volume">ml</span>
         </li>
 

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

@@ -1188,7 +1188,7 @@ export default {
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
-          console.log("Data",data)
+        
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)
@@ -1504,6 +1504,7 @@ export default {
   },
   created() {
     // console.log("this.form", this.form.consciousness);
+    
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -41,7 +41,7 @@
               <td width="120">住院号/透析卡号:</td>
               <td width="130">
                 <div class="under-line">
-                  &nbsp;{{ patientInfo.admission_number ? patientInfo.admission_number : "无" }}/{{ patientInfo.dialysis_no }}
+                  &nbsp;{{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number : "无" }} <span v-if="receiverTreatmentAccess.admission_number==''|| receiverTreatmentAccess.admission_number==0"> /{{ patientInfo.dialysis_no }}</span>
                 </div>
               </td>
               <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4280,7 +4280,7 @@ export default {
         
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
-        if(this.org_id ==10515 || this.org_id == 0 || this.org_id == 10510){
+        if(this.org_id ==10515 || this.org_id == 0 || this.org_id == 10510 || this.org_id ==10567 ){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
             
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -833,8 +833,17 @@ export default {
           
           this.assessmentafter = response.data.data.assessmentAfterDislysis;
           console.log("上次透后体重", this.assessmentafter);
+        
           var tableAdvice = JSON.parse(JSON.stringify(response.data.data.advices));
           
+          var doctorAdevieInfo  =  response.data.data.doctorAdevieInfo
+        
+          if(doctorAdevieInfo!=null && doctorAdevieInfo.length>0){
+             for(let i=0;i<doctorAdevieInfo.length;i++){
+               tableAdvice.push(doctorAdevieInfo[i])
+             }
+          }
+          console.log("医嘱天天吞吞吐吐",this.tableAdvice)
           if (tableAdvice.length <= 8) {
             const length = 8 - tableAdvice.length
             var obj = { advice_name: '', start_time: '' }
@@ -1095,6 +1104,8 @@ export default {
 
           this.advice_jilurow = this.advices.length + 1;
 
+
+        
           var childMap = {};
           for (const index in this.advices) {
             if (this.advices[index].parent_id == 0) {

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -4,27 +4,27 @@
       v-if="prescription.type == 1"
       :data="prescription.advices"
       border
+      height="370"
       style="width: 99%"
       :row-style="changColor"
       :header-cell-style="{
         color: '#606266',
       }"
       highlight-current-row
-      min-height="200px"
+      
     >
-    <!-- max-height=290px -->
       <el-table-column
         fixed
         align="center"
         type="index"
-        width="40"
+        width="50"
         label="序号"
       ></el-table-column>
       <el-table-column
         fixed
         align="center"
         prop="name"
-        width="400"
+        width="300"
         label="名称"
       >
         <template slot-scope="scope"
@@ -74,7 +74,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="320" label="医保编码">
+      <el-table-column align="center" prop="name" width="220" label="医保编码">
         <template slot-scope="scope">
           <div>{{ scope.row.code }}</div>
         </template>
@@ -124,7 +124,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="90"
+        width="130"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">
@@ -143,6 +143,7 @@
       v-if="prescription.type == 2"
       :data="prescription.project"
       border
+      height="370"
       style="width: 99%"
       :row-style="changColor"
       :header-cell-style="{
@@ -155,14 +156,14 @@
         fixed
         align="center"
         type="index"
-        width="40"
+        width="50"
         label="序号"
       ></el-table-column>
       <el-table-column
         fixed
         align="center"
         prop="project_name"
-        width="400"
+        width="280"
         label="名称"
       >
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
@@ -170,7 +171,7 @@
       <el-table-column
         align="center"
         prop="statistical_classification"
-        width="100"
+        width="80"
         label="组"
       >
         <template slot-scope="scope">{{
@@ -224,13 +225,13 @@
         <template slot-scope="scope">{{ scope.row.price }}元</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="执行状态">
+      <el-table-column align="center" prop="name" width="80" label="执行状态">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="120" label="医保编码">
+      <el-table-column align="center" prop="name" width="220" label="医保编码">
         <template slot-scope="scope">
           <div>{{ scope.row.medical_code }}</div>
         </template>
@@ -280,7 +281,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="90"
+        width="130"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -1,174 +1,88 @@
 <template>
   <div id='invoice-print' style="position: relative;">
-    <!-- <div style="position: absolute;top:90px;left:81px;">
-      阜阳经沃血液透析中心
-    </div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:120px;left:81px;">
-        小米
-      </div>
-      <div style="position: absolute;top:120px;left:200px;">
-        号码
-      </div>
-    </div>
-
-    <div style="display: flex;">
-      <div style="position: absolute;top:150px;left:81px;">
-        医保证号:
-      </div>
-      <div style="position: absolute;top:150px;left:190px;">
-        人员类别:
-      </div>
-      <div style="position: absolute;top:150px;left:252px;">
-       2023-09-28
-      </div>
-    </div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:170px;left:106px;">目录内</div>
-      <div style="position: absolute;top:170px;left:146px;">目录外</div>
-      <div style="position: absolute;top:170px;left:232px;">目录内</div>
-      <div style="position: absolute;top:170px;left:272px;">目录外</div>
-    </div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:190px;left:106px;">目录内</div>
-      <div style="position: absolute;top:190px;left:146px;">目录外</div>
-      <div style="position: absolute;top:190px;left:232px;">目录内</div>
-      <div style="position: absolute;top:190px;left:272px;">目录外</div>
-    </div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:210px;left:106px;">目录内</div>
-      <div style="position: absolute;top:210px;left:146px;">目录外</div>
-      <div style="position: absolute;top:210px;left:232px;">目录内</div>
-      <div style="position: absolute;top:210px;left:272px;">目录外</div>
-    </div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:230px;left:106px;">目录内</div>
-      <div style="position: absolute;top:230px;left:146px;">目录外</div>
-      <div style="position: absolute;top:230px;left:232px;">目录内</div>
-      <div style="position: absolute;top:230px;left:272px;">目录外</div>
-    </div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:250px;left:106px;">目录内</div>
-      <div style="position: absolute;top:250px;left:146px;">目录外</div>
-      <div style="position: absolute;top:250px;left:232px;">目录内</div>
-      <div style="position: absolute;top:250px;left:272px;">目录外</div>
-    </div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:270px;left:106px;">目录内</div>
-      <div style="position: absolute;top:270px;left:146px;">目录外</div>
-      <div style="position: absolute;top:270px;left:232px;">目录内</div>
-      <div style="position: absolute;top:270px;left:272px;">目录外</div>
-    </div> -->
-    <!--金额 -->
-    <!-- <div style="display: flex;">
-      <div style="position: absolute;top:290px;left:146px;">280</div>
-      <div style="position: absolute;top:290px;left:242px;">个人支付：9.92</div>
-    </div>
-    <div style="position: absolute;top:310px;left:146px;">贰佰捌拾整</div>
-    <div style="position: absolute;top:330px;left:190px;">目录内金额</div>
-    <div style="position: absolute;top:350px;left:252px;">个人医保</div>
-    <div style="display: flex;">
-      <div style="position: absolute;top:370px;left:106px;">收款人员</div>
-      <div style="position: absolute;top:370px;left:252px;">流水号</div>
-    </div> -->
-    <!-- 附件 -->
-    <div v-for="(item,index) in Arr" :key="index">
-      <div :style="{position: 'absolute',top:(60 + (index * 450))  + 'px',left:'30px'}">
+    <div>
+      <div style="position: absolute;top:60px;left:30px">
         阜阳经沃血液透析中心
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'30px'}">
+        <div :style="{position: 'absolute',top:'80px',left:'30px'}">
           {{paramsObj.name}}
         </div>
-        <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'200px'}">
+        <div :style="{position: 'absolute',top:'80px',left:'200px'}">
           {{list.order.fa_piao_number}}
         </div>
       </div>
 
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'81px'}">
+        <div :style="{position: 'absolute',top:'100px',left:'81px'}">
         </div>
-        <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'190px'}">
+        <div :style="{position: 'absolute',top:'100px',left:'190px'}">
           
         </div>
-        <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'300px'}">
+        <div :style="{position: 'absolute',top:'100px',left:'300px'}">
         {{printDate}}
         </div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'75px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'270px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:'155px',left:'75px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:'155px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:'155px',left:'270px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:'155px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'75px'}">{{list.chineseTraditionalMedicineCostTotal?list.chineseTraditionalMedicineCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'270px'}">{{list.laboratoryCostTotal?list.laboratoryCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:'190px',left:'75px'}">{{list.chineseTraditionalMedicineCostTotal?list.chineseTraditionalMedicineCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:'190px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:'190px',left:'270px'}">{{list.laboratoryCostTotal?list.laboratoryCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:'190px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'75px'}"></div>
-        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'270px'}"></div>
-        <div :style="{position: 'absolute',top:(210+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:'210px',left:'75px'}"></div>
+        <div :style="{position: 'absolute',top:'210px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:'210px',left:'270px'}"></div>
+        <div :style="{position: 'absolute',top:'210px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'75px'}">{{list.checkCostTotal?list.checkCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'270px'}"></div>
-        <div :style="{position: 'absolute',top:(230+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:'230px',left:'75px'}">{{list.checkCostTotal?list.checkCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:'230px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:'230px',left:'270px'}"></div>
+        <div :style="{position: 'absolute',top:'230px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'75px'}">{{list.treatCostTotal?list.treatCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'270px'}">{{list.materialCostTotal?list.materialCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(250+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:'250px',left:'75px'}">{{list.treatCostTotal?list.treatCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:'250px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:'250px',left:'270px'}">{{list.materialCostTotal?list.materialCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:'250px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'75px'}"></div>
-        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'270px'}"></div>
-        <div :style="{position: 'absolute',top:(270+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:'270px',left:'75px'}"></div>
+        <div :style="{position: 'absolute',top:'270px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:'270px',left:'270px'}"></div>
+        <div :style="{position: 'absolute',top:'270px',left:'310px'}"></div>
       </div>
     <!--金额 -->
     <div style="display: flex;">
-      <div :style="{position: 'absolute',top:(310+(index * 450))+'px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
-      <div :style="{position: 'absolute',top:(310+(index * 450))+'px',left:'270px'}">个人支付：{{list.order.psn_cash_pay}}</div>
+      <div :style="{position: 'absolute',top:'310px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
+      <div :style="{position: 'absolute',top:'310px',left:'270px'}">个人支付：{{list.order.psn_cash_pay}}</div>
     </div>
-    <div :style="{position: 'absolute',top:(330+(index * 450))+'px',left:'190px'}">{{zhongwen}}</div>
-    <div :style="{position: 'absolute',top:(350+(index * 450))+'px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
-    <div :style="{position: 'absolute',top:(370+(index * 450))+'px',left:'300px'}">{{list.order.acct_pay}}</div>
+    <div :style="{position: 'absolute',top:'330px',left:'190px'}">{{zhongwen}}</div>
+    <div :style="{position: 'absolute',top:'350px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
+    <div :style="{position: 'absolute',top:'370px',left:'300px'}">{{list.order.acct_pay}}</div>
     <div style="display: flex;">
-      <div :style="{position: 'absolute',top:(390+(index * 450))+'px',left:'106px'}">{{list.admin_user_name}}</div>
-      <div :style="{position: 'absolute',top:(390+(index * 450))+'px',left:'300px'}">{{list.order_number}}</div>
+      <div :style="{position: 'absolute',top:'390px',left:'106px'}">{{list.admin_user_name}}</div>
+      <div :style="{position: 'absolute',top:'390px',left:'300px'}">{{list.order_number}}</div>
     </div>
 
-      <div v-for="(ite,index2) in item" :key="index2" style="">
-
-        <div :style="{position: 'absolute',top:(90 + (index * 450))  + 'px',left:(400 + (index2 * 200)) + 'px'}">{{list.order_number}}</div>
-        <div :style="{position: 'absolute',top:(110 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.name}}</div>
-        <div :style="{position: 'absolute',top:(130 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.item}}</div>
-        <div :style="{position: 'absolute',top:(300 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.doctor_name}}</div>
-        <div :style="{position: 'absolute',top:(320 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.total}}</div>
-        <div :style="{position: 'absolute',top:(340 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.operator}}</div>
-        <div :style="{position: 'absolute',top:(360 + (index * 450))  + 'px',left:(490 + (index2 * 200)) + 'px'}">{{ite.printDate}}</div>
-        <!-- 附件 -->
-        <!-- <div :style="{position: 'absolute',top:(120 + (index * 350))  + 'px',left:'490px'}">号码</div>
-        <div :style="{position: 'absolute',top:(150 + (index * 350))  + 'px',left:'490px'}">{{ite}}</div>
-        <div :style="{position: 'absolute',top:(170 + (index * 350))  + 'px',left:'490px'}">项目</div>
-        <div :style="{position: 'absolute',top:(310 + (index * 350))  + 'px',left:'490px'}">金额</div>
-        <div :style="{position: 'absolute',top:(330 + (index * 350))  + 'px',left:'490px'}">收款人</div>
-        <div :style="{position: 'absolute',top:(350 + (index * 350))  + 'px',left:'490px'}">日期</div> -->
-        <!-- 附件 -->
-        <!-- <div :style="{position: 'absolute',top:(120 + (index * 350))  + 'px',left:'588px'}">号码</div>
-        <div :style="{position: 'absolute',top:(150 + (index * 350))  + 'px',left:'588px'}">{{ite}}</div>
-        <div :style="{position: 'absolute',top:(170 + (index * 350))  + 'px',left:'588px'}">项目</div>
-        <div :style="{position: 'absolute',top:(310 + (index * 350))  + 'px',left:'588px'}">金额</div>
-        <div :style="{position: 'absolute',top:(330 + (index * 350))  + 'px',left:'588px'}">收款人</div>
-        <div :style="{position: 'absolute',top:(350 + (index * 350))  + 'px',left:'588px'}">日期</div> -->
+      <div v-for="(items,index) in Arr" :key="index" style="">
+        <div v-for="(ite,index2) in items" :key="index2">
+          <div :style="{position: 'absolute',top:'90px',left:(400 + (index * 200)) + 'px'}">{{list.order_number}}</div>
+          <div :style="{position: 'absolute',top:'110px',left:(490 + (index * 200)) + 'px'}">{{Arr[0][0].name}}</div>
+          <div :style="{position: 'absolute',top:(130 + (index2 * 20))  + 'px',left:(490 + (index * 200)) + 'px'}">{{ite.item}} {{ite.total}}</div>
+          <div :style="{position: 'absolute',top:'300px',left:(490 + (index * 200)) + 'px'}">{{Arr[0][0].doctor_name}}</div>
+          <div :style="{position: 'absolute',top:'320px',left:(490 + (index * 200)) + 'px'}">{{list.order.psn_cash_pay}}</div>
+          <div :style="{position: 'absolute',top:'340px',left:(490 + (index * 200)) + 'px'}">{{Arr[0][0].operator}}</div>
+          <div :style="{position: 'absolute',top:'360px',left:(490 + (index * 200)) + 'px'}">{{Arr[0][0].printDate}}</div>
+        </div>
       </div>
-
     </div>
 
   </div>
@@ -191,12 +105,13 @@ export default {
       Arr:[],
       // pageArrs:['西药费','化验费','治疗费','处置费',,'输氧费','其他']
       // pageArrs:['西药费','化验费','治疗费','处置费','中成药','诊疗费','材料费',
-      //         '护理费','注射费','检查费'],
+      //         '护理费','注射费','检查费','输氧费','其他'],
     }
   },
   created(){
     console.log('paramsObj',this.paramsObj)
-    // console.log('vvvv',this.group(this.pageArrs,3));
+    // console.log('vvvv',this.group(this.pageArrs,4));
+    // this.Arr = this.group(this.pageArrs,4)
     let params = {
       order_id: this.paramsObj.order_id,
       patient_id: this.paramsObj.patient_id,
@@ -257,7 +172,6 @@ export default {
           this.pageArr.push(obj)
         }
 
-
         if(this.list.chineseTraditionalMedicineCostTotal > 0){
           let obj = {
             name: this.paramsObj.name,
@@ -270,7 +184,6 @@ export default {
           this.pageArr.push(obj)
         }
 
-
         if(this.list.laboratoryCostTotal > 0){
           let obj = {
             name:this.paramsObj.name,
@@ -283,7 +196,6 @@ export default {
           this.pageArr.push(obj)
         }
 
-
         if(this.list.checkCostTotal > 0){
           let obj = {
             name: this.paramsObj.name,
@@ -308,7 +220,6 @@ export default {
           this.pageArr.push(obj)
         }
 
-
         if(this.list.materialCostTotal > 0){
           let obj = {
             name:this.paramsObj.name,
@@ -326,8 +237,8 @@ export default {
           //   num=1
           // }
         // // }
-        // console.log('2222',this.pageArr,Math.ceil(this.pageArr.length/3));
-        this.Arr = this.group(this.pageArr,3)
+        console.log('2222',this.pageArr);
+        this.Arr = this.group(this.pageArr,4)
         console.log('3333',this.Arr)
 
       })

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -198,14 +198,9 @@
             <el-tab-pane label="日结" name="first">
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
-                  <div>
                     <div class="tabsBox" v-for="items,index in big_prescriptions" :key="index">
-                      <div style="height: calc(100% - 60px);">
-
-
                         <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
                                  @tab-click="tabclickEvent">
-                          <!--<el-radio-group v-model="med_radio">-->
                           <el-tab-pane
                             v-for="(item, index) in items.prescriptions"
                             :key="index"
@@ -245,25 +240,21 @@
                                   type="primary"
                                 >撤销明细
                                 </el-button>
-                                <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
-                                <!--<div>{{ items.prescriptions[0].order.order_status}}</div>-->
                                 <el-button v-loading="loadingtwo"
                                            v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
-                                           type="primary">收费<!--修改的地方-->
+                                           type="primary">收费  
                                 </el-button>
                               </div>
                             </div>
                           </el-tab-pane>
-
-
-                          <prescription-table ref="prescription_tables"
+                            <prescription-table ref="prescription_tables"
                                               :prescription="items.curPrescriptions"
                                               :manufacturers="manufacturers"></prescription-table>
-                          <!--</el-radio-group>-->
+                          
                         </el-tabs>
-                      </div>
+
                       <div class="costBox">
                         <span>当前处方总费用：<span style="color:red;">{{ items.total }}元</span></span>
 
@@ -326,12 +317,7 @@
 
                       </div>
 
-
                     </div>
-                  </div>
-
-
-
                 </div>
                 <div class="centerRight">
                   <p class="centerRightTitle" style="padding-top: 10px;">就诊信息</p>
@@ -557,7 +543,6 @@
 
 
                   </div>
-
                 </div>
                 <div class="centerRight">
                   <p class="centerRightTitle" style="padding-top: 10px;">
@@ -5727,9 +5712,8 @@ export default {
 }
 .tabsBox {
   position: relative;
-
-  overflow-y: auto;
-  height: 450px;
+  // overflow-y: auto;
+  height: 560px;
 
 
 .el-tabs__item {
@@ -5763,7 +5747,7 @@ export default {
 
 .centerLeft {
   flex: 1;
-  display: flex;
+  // display: flex;
   flex-direction: column;
   position: relative;
   overflow-y: auto;
@@ -5771,7 +5755,7 @@ export default {
 
 .preTabs {
   height: 100%;
-  display: flex;
+  // display: flex;
   flex-direction: column;
 
 .el-tab-pane {

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -65,7 +65,7 @@
           <td width="8.1%">单价</td>
           <td width="8.1%">金额</td>
            <td width="10.1%">医保标识</td>
-<!--          <td width="10.1%">个人自付</td>-->
+
 
         </tr>
         <!-- width="72.6%"  16.82%  16.1-->
@@ -87,7 +87,7 @@
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
                  <div style="width: 10.1%;padding: 5px;"></div>
-<!--/*                <div style="width: 10.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>*/-->
+
               </div>
             </div>
           </td>
@@ -107,7 +107,7 @@
           <td colspan="2" >医院盖章：</td>
         </tr>
         <tr>
-          <td colspan="8" style="padding-top: 20px;">医师签名：</td>
+          <td colspan="8" style="padding-top: 40px;">医师签名：</td>
         </tr>
       </table>
     </div>

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -142,6 +142,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
+
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.count }}
@@ -260,6 +266,8 @@ export default {
       storehouse_id:0,
       manufacturerList:[],
       dealerList:[],
+      patientsList:[]
+        
     };
   },
   methods: {
@@ -405,7 +413,8 @@ export default {
           this.dealerList = response.data.data.dealerList
           var listgroup = response.data.data.listgroup
           
-          this.
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
 
           this.cancelStockDate.push({
             order_number: "合计",
@@ -759,7 +768,17 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.GetCancelStock()
+     },
+     getPatientName(id){
+     
+     var name =""
+     for(let i=0;i<this.patientsList.length;i++){
+       if(id == this.patientsList[i].id){
+         name = this.patientsList[i].name
+       }
      }
+     return name
+    }
   }
 };
 </script>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -154,6 +154,11 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">
@@ -165,6 +170,7 @@
             </span>
           </template>
         </el-table-column>
+      
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0 && scope.row.price > 0">{{getTotal(scope.row.price, scope.row.count)}}</span>
@@ -280,6 +286,7 @@ export default {
       wareOutList:[],
       manufacturerList:[],
       dealerList:[],
+      patientsList:[],
     };
   },
   methods: {
@@ -353,7 +360,9 @@ export default {
           this.total = response.data.data.total;
           this.wareOutList = []
           this.wareOutList =  response.data.data.list
-          console.log("党的20大长长",this.wareOutList)
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
+         
           var total = 0
           var objOne = {
             warehouse_out_order_number: "合计",
@@ -413,7 +422,9 @@ export default {
            this.houseList.push(response.data.data.houseList[i])
           }
           this.wareOutList =  response.data.data.list
-          console.log("党的20大长长",this.wareOutList)
+          // console.log("党的20大长长",this.wareOutList)
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
           var total = 0
           var objOne = {
             warehouse_out_order_number: "合计",
@@ -1034,7 +1045,17 @@ export default {
          }
       }
       return total
-    }
+    },
+    getPatientName(id){
+     
+      var name =""
+      for(let i=0;i<this.patientsList.length;i++){
+        if(id == this.patientsList[i].id){
+          name = this.patientsList[i].name
+        }
+      }
+      return name
+     }
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -133,6 +133,11 @@
           {{scope.row.price}}
           </template>
         </el-table-column>
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{scope.row.count}}
@@ -236,7 +241,8 @@ export default {
       tableDataList:[],
       drugTypeList:[],
       dealerList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      patientsList:[]
     };
   },
   methods: {
@@ -352,6 +358,7 @@ export default {
            var list = response.data.data.orderPrint
            this.dealerList =  response.data.data.dealerList
            this.manufacturerList =  response.data.data.manufacturerList
+           this.patientsList =response.data.data.patientsList
            //this.drugTypeList = response.data.data.drugTypeList
            for(let i=0;i<list.length;i++){
              list[i].child = []
@@ -365,6 +372,7 @@ export default {
            }
            this.tableDataList = list
            console.log("数据我我我",this.tableDataList)
+
            var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
@@ -515,7 +523,17 @@ export default {
         }
       }
       return name
-    }
+    },
+    getPatientName(id){
+     
+     var name =""
+     for(let i=0;i<this.patientsList.length;i++){
+       if(id == this.patientsList[i].id){
+         name = this.patientsList[i].name
+       }
+     }
+     return name
+    },
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -162,6 +162,11 @@
            </span>
           </template>
         </el-table-column>
+        <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)  }}
+            </template>
+        </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{scope.row.count}}
@@ -290,7 +295,8 @@ export default {
       storehouse_id:0,
       houseList:[],
       dealerList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      patientsList:[]
     };
   },
   methods: {
@@ -430,12 +436,16 @@ export default {
         if(response.data.state == 1){
           var order = response.data.data.order
           console.log("order233322332323223",order)
+
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []
           this.houseList.push(obj)
           for(let i=0;i<response.data.data.houseList.length;i++){
            this.houseList.push(response.data.data.houseList[i])
           }
+          this.patientsList = []
+          this.patientsList = response.data.data.patientsList
+
           var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
@@ -586,6 +596,16 @@ export default {
       }
       return name
     },
+    getPatientName(id){
+     
+     var name =""
+     for(let i=0;i<this.patientsList.length;i++){
+       if(id == this.patientsList[i].id){
+         name = this.patientsList[i].name
+       }
+     }
+     return name
+    },
 
      exportList(){
         

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -236,7 +236,7 @@
               <el-select
                 v-model="scope.row.admin_user_id"
                 filterable
-                placeholder="请选择厂商"
+                placeholder="请选择出库对象"
               >
                 <el-option
                   v-for="(option, index) in doctorList"
@@ -906,6 +906,18 @@ export default {
           this.recordInfo.recordData[i].total_count = total_count;
           this.recordInfo.recordData[i].max_unit_fisrt = val.max_unit;
           this.recordInfo.recordData[i].min_unit_fisrt = val.min_unit;
+
+          if(val.first_drug_warehouse_info!=null&&val.first_drug_warehouse_info.expiry_date >0){
+            this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_drug_warehouse_info.expiry_date)
+          }else{
+            this.recordInfo.recordData[i].expiry_date = ""
+          }
+
+          if(val.first_drug_warehouse_info!=null&&val.first_drug_warehouse_info.product_date >0){
+            this.recordInfo.recordData[i].product_date = this.getTimeOne(val.first_drug_warehouse_info.product_date)
+          }else{
+            this.recordInfo.recordData[i].product_date=""
+          }
           if (val.retail_price == 0) {
             this.recordInfo.recordData[i].price = "";
           } else {
@@ -927,6 +939,8 @@ export default {
           } else {
             this.recordInfo.recordData[i].dealer = val.dealer;
           }
+
+          console.log("hhahhahahwowowo",this.recordInfo.recordData)
         }
       }
     },

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -1132,6 +1132,17 @@ export default {
           this.recordInfo.recordData[i].max_unit_fisrt = val.max_unit;
           this.recordInfo.recordData[i].min_unit_fisrt = val.min_unit;
           this.recordInfo.recordData[i].count_unit = val.max_unit;
+          if(val.first_drug_warehouse_info!=null&&val.first_drug_warehouse_info.expiry_date >0){
+            this.recordInfo.recordData[i].expiry_date = this.getTime(val.first_drug_warehouse_info.expiry_date)
+          }else{
+            this.recordInfo.recordData[i].expiry_date = ""
+          }
+
+          if(val.first_drug_warehouse_info!=null&&val.first_drug_warehouse_info.product_date >0){
+            this.recordInfo.recordData[i].product_date = this.getTime(val.first_drug_warehouse_info.product_date)
+          }else{
+            this.recordInfo.recordData[i].product_date=""
+          }
           if (val.dealer == 0) {
             this.recordInfo.recordData[i].dealer = "";
           } else {

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -890,6 +890,20 @@ export default {
             this.recordInfo.recordData[i].stock_count = total_count
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
+             
+            if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
+              this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
+            }else{
+              this.recordInfo.recordData[i].expiry_date = ""
+            }
+
+            if(val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.product_date >0){
+              this.recordInfo.recordData[i].product_date = this.getTimeOne(val.first_xt_warehouse_info.product_date)
+            }else{
+              this.recordInfo.recordData[i].product_date = ""
+            }
+           
+          
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].price ="0"
             }else{
@@ -903,6 +917,8 @@ export default {
             }else{
              this.recordInfo.recordData[i].dealer = val.dealer
             }
+
+            console.log("日期我我我哦我",  this.recordInfo.recordData)
          }
 
 

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -832,6 +832,20 @@
             this.recordInfo.recordData[i].warehouse_info_id = 0
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
+            
+              
+            if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
+              this.recordInfo.recordData[i].expiry_date = this.getTime(val.first_xt_warehouse_info.expiry_date)
+            }else{
+              this.recordInfo.recordData[i].expiry_date = ""
+            }
+
+            if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.product_date >0){
+              this.recordInfo.recordData[i].product_date = this.getTime(val.first_xt_warehouse_info.product_date)
+            }else{
+              this.recordInfo.recordData[i].product_date = ""
+            }
+
             if(val.packing_price == 0){
                this.recordInfo.recordData[i].price = "0"
             }else{