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

package-lock.json

@@ -225,14 +225,6 @@
       "requires": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
-      },
-      "dependencies": {
-        "negotiator": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-          "dev": true
-        }
       }
     },
     "acorn": {
@@ -2122,15 +2114,15 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001717",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001717.tgz",
-      "integrity": "sha512-V0sTnN19lYOQrM19FYGDmITrIH5Gck9dI005H9dVhIE9MEYZIWMBjKdwCeTSqhCf65H6n+ZMRiMz/4j5jq57Iw==",
+      "version": "1.0.30001718",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001718.tgz",
+      "integrity": "sha512-XJRbbI1T9yUmA3mqXSmN2Zn7LAoUSvQd//XymssqZcsBI+sR1j87ZPbPQcJsAsR/MKhpa4ZSOs0wf1DDjbUcfQ==",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001717",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz",
-      "integrity": "sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==",
+      "version": "1.0.30001718",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
       "dev": true
     },
     "canvg": {
@@ -2164,9 +2156,9 @@
       }
     },
     "caseless": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-      "integrity": "sha512-ODLXH644w9C2fMPAm7bMDQ3GRvipZWZfKc+8As6hIadRIelE0n0xZuN38NS6kiK3KPEVrpymmQD8bvncAHWQkQ==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true
     },
     "center-align": {
@@ -2687,6 +2679,12 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "negotiator": {
+          "version": "0.6.4",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+          "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+          "dev": true
+        },
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -3877,9 +3875,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.5.151",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.151.tgz",
-      "integrity": "sha512-Rl6uugut2l9sLojjS4H4SAr3A4IgACMLgpuEMPYCVcKydzfyPrn5absNRju38IhQOf/NwjJY8OGWjlteqYeBCA==",
+      "version": "1.5.152",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.152.tgz",
+      "integrity": "sha512-xBOfg/EBaIlVsHipHl2VdTPJRSvErNUaqW8ejTq5OlOlIYx1wOllCHsAvAIrr55jD1IYEfdR86miUEt8H5IeJg==",
       "dev": true
     },
     "elegant-spinner": {
@@ -4279,9 +4277,9 @@
           }
         },
         "debug": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-          "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+          "version": "4.4.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+          "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.3"
@@ -6103,6 +6101,14 @@
         "caseless": "~0.11.0",
         "concat-stream": "^1.4.6",
         "http-response-object": "^1.0.0"
+      },
+      "dependencies": {
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha512-ODLXH644w9C2fMPAm7bMDQ3GRvipZWZfKc+8As6hIadRIelE0n0xZuN38NS6kiK3KPEVrpymmQD8bvncAHWQkQ==",
+          "dev": true
+        }
       }
     },
     "http-deceiver": {
@@ -6416,188 +6422,6 @@
       "dev": true,
       "requires": {
         "meow": "^3.3.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-          "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^2.0.0",
-            "map-obj": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-          "dev": true
-        },
-        "indent-string": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-          "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
-          "dev": true,
-          "requires": {
-            "repeating": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-          "dev": true
-        },
-        "meow": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-          "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "^2.0.0",
-            "decamelize": "^1.1.2",
-            "loud-rejection": "^1.0.0",
-            "map-obj": "^1.0.1",
-            "minimist": "^1.1.3",
-            "normalize-package-data": "^2.3.4",
-            "object-assign": "^4.0.1",
-            "read-pkg-up": "^1.0.1",
-            "redent": "^1.0.0",
-            "trim-newlines": "^1.0.0"
-          }
-        },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "redent": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-          "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
-          "dev": true,
-          "requires": {
-            "indent-string": "^2.1.0",
-            "strip-indent": "^1.0.1"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        },
-        "strip-indent": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-          "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1"
-          }
-        },
-        "trim-newlines": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-          "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-          "dev": true
-        }
       }
     },
     "internal-slot": {
@@ -7631,15 +7455,16 @@
       }
     },
     "load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
         "pify": "^2.0.0",
-        "strip-bom": "^3.0.0"
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       },
       "dependencies": {
         "parse-json": {
@@ -8238,9 +8063,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "neo-async": {
@@ -12043,13 +11868,10 @@
       "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA=="
     },
     "qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.1.0"
-      }
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true
     },
     "query-string": {
       "version": "4.3.4",
@@ -12250,28 +12072,6 @@
         "path-type": "^1.0.0"
       },
       "dependencies": {
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
         "path-type": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -12288,15 +12088,6 @@
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
           "dev": true
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
         }
       }
     },
@@ -12658,20 +12449,6 @@
         "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.5.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-          "dev": true
-        }
       }
     },
     "require-directory": {
@@ -13735,9 +13512,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-          "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+          "version": "4.4.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+          "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.3"
@@ -13766,9 +13543,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-          "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+          "version": "4.4.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+          "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.3"
@@ -14054,10 +13831,13 @@
       "integrity": "sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg=="
     },
     "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
     },
     "strip-eof": {
       "version": "1.0.0",
@@ -14431,6 +14211,14 @@
         "http-response-object": "^1.1.0",
         "promise": "^7.1.1",
         "qs": "^6.1.0"
+      },
+      "dependencies": {
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha512-ODLXH644w9C2fMPAm7bMDQ3GRvipZWZfKc+8As6hIadRIelE0n0xZuN38NS6kiK3KPEVrpymmQD8bvncAHWQkQ==",
+          "dev": true
+        }
       }
     },
     "throttle-debounce": {
@@ -15014,6 +14802,15 @@
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
           "dev": true
+        },
+        "qs": {
+          "version": "6.14.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+          "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.1.0"
+          }
         }
       }
     },
@@ -15616,12 +15413,6 @@
           "integrity": "sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng==",
           "dev": true
         },
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -15643,16 +15434,25 @@
           "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
           "dev": true
         },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
           "dev": true,
           "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
+            "error-ex": "^1.2.0"
           }
         },
         "path-type": {
@@ -15706,6 +15506,12 @@
             "ansi-regex": "^2.0.0"
           }
         },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+          "dev": true
+        },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -16031,16 +15837,6 @@
             "ms": "^2.1.1"
           }
         },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
         "fsevents": {
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -16072,12 +15868,6 @@
             }
           }
         },
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-          "dev": true
-        },
         "is-binary-path": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
@@ -16096,37 +15886,12 @@
             "number-is-nan": "^1.0.0"
           }
         },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
         "ms": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
         "os-locale": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
@@ -16136,62 +15901,6 @@
             "lcid": "^1.0.0"
           }
         },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
         "readdirp": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -16223,15 +15932,6 @@
             "ansi-regex": "^2.0.0"
           }
         },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        },
         "which-module": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",

src/api/inspection.js

@@ -138,6 +138,22 @@ export function getinspectionchildlist(params){
 }
 
 
+export function getMajorInpsectionList(patient_id,params){
+  
+  return request({
+    url:"/api/patient/getmajorinpsectionlist?patient_id="+patient_id,
+    method:"get",
+    params:params,
+  })
+}
 
+export function getPatientInsepctionList(project_id,patient_id,limit,page){
+ 
+  return request({
+    url:"/api/patient/getpatientinspectionlist?project_id="+project_id+"&patient_id="+patient_id+"&limit"+limit+"&page="+page,
+    method:"get",
+    params:params
+  })
+}
 
 

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

@@ -638,6 +638,8 @@ export const xt_asyncRouterMap = [
         name: 'Inspection',
         meta: { title: 'inspection', noCache: true }
       },
+
+     
       
       {
         path: '/',

src/router/modules/patient.js

@@ -149,6 +149,17 @@ export default {
       title: 'inspection',
       noCache: true
     }
+  },
+   {//新
+    path: '/patients/inspection/list',
+    component: () => import('@/xt_pages/user/inspection_list'),
+    hidden: true,
+    is_menu: false,
+    name: 'InspectionList',
+    meta: {
+      title: 'InspectionList',
+      noCache: true
+    }
   },
   {
     path: '/patients/newInspection',

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -700,8 +700,22 @@ export default {
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
 
-        var textarea = ""
-        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+        // var textarea = ""
+        // textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+
+        var  textAreaList = this.textarea.split(",")
+          var textarea = ""
+          textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+          var  parts = textarea.split(',')
+          for(let i=0;i<textAreaList.length;i++){
+            if(parts[parts.length-2] == textAreaList[i]){
+                this.$message.error("该条码已经存在,不能重复扫码")
+            }
+          }
+
+          const uniqueStr = [...new Set(textarea.split(','))].join(',');
+
+          var textarea = uniqueStr
 
 
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10726){

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -1350,8 +1350,22 @@ export default {
         // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
         if (event.key === 'Enter') {
 
+          // var textarea = ""
+          // textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+          var  textAreaList = this.textarea.split(",")
           var textarea = ""
           textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+          var  parts = textarea.split(',')
+          for(let i=0;i<textAreaList.length;i++){
+            if(parts[parts.length-2] == textAreaList[i]){
+                this.$message.error("该条码已经存在,不能重复扫码")
+            }
+          }
+
+          const uniqueStr = [...new Set(textarea.split(','))].join(',');
+
+          var textarea = uniqueStr
+        
 
           if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10726){
 

src/xt_pages/data/components/consumables.vue

@@ -104,6 +104,11 @@
           width="55">
       </el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+      <el-table-column label="耗材ID号" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.id }}
+        </template>
+      </el-table-column>
       <el-table-column label="耗材名称" align="center">
         <template slot-scope="scope">
           {{ scope.row.good_name }}
@@ -137,6 +142,12 @@
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
       </el-table-column> -->
+
+      <el-table-column label="进货价" width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.buy_price }}
+        </template>
+      </el-table-column>
       <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.packing_price }}

src/xt_pages/data/components/drugs.vue

@@ -93,6 +93,11 @@
        ></el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
 
+      <el-table-column prop="date" label="药品ID号" align="center" >
+        <template slot-scope="scope">
+          <div>{{scope.row.id}}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="date" label="药品名称" align="center" >
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1262,12 +1262,12 @@
                             <span v-if="org_id != 10683">置换量</span>
                             <span v-if="org_id == 10683">置换液速度</span>
                             <br />
-                            <span v-if="org_id != 10598 && org_id != 10567 && org_id != 10724 && org_id != 10644 && org_id != 10414">
+                            <span v-if="org_id != 10598 && org_id != 10567 && org_id != 10724 && org_id != 10644 && org_id != 10414&& org_id != 10471">
                               <span v-if="org_id != 0 && org_id != 10683">(ml)</span>
                               <span v-if="org_id == 0 || org_id == 10683">(ml/h)</span>
                             </span>
                             <span
-                              v-if="org_id == 10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id ==10414">L</span>
+                              v-if="org_id == 10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id ==10414 || org_id == 10471">L</span>
                           </td>
                           <td v-if="org_id == 3877 || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td width="50" v-if="

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -1031,7 +1031,7 @@
                       <table class="table-box">
                         <tbody>
                           <tr>
-                            <td width="40">肝素:</td>
+                            <!-- <td width="40">肝素:</td> -->
                             <td width="75">
                               <label-box
                                 :isChecked="
@@ -1109,12 +1109,24 @@
                                 showValue="普通肝素:"
                               ></label-box>
                             </td>
+
+                            <td width="80">
+                              <label-box
+                                :isChecked="
+                                  record.prescription.anticoagulant == 15
+                                    ? true
+                                    : false
+                                "
+                                showValue="甲磺酸萘莫司他:"
+                              ></label-box>
+                            </td>
+
                             <td width="35">首剂</td>
                             <td width="40">
                               <div class="under-line">
                                 &nbsp;
                                 <span
-                                  v-if="record.prescription.anticoagulant == 2"
+                                  v-if="record.prescription.anticoagulant == 2 || record.prescription.anticoagulant == 15"
                                   >{{
                                     record.prescription.anticoagulant_shouji
                                   }}</span
@@ -1150,6 +1162,10 @@
                                 v-if="record.prescription.anticoagulant == 1"
                                 >mg</span
                               >
+                              <span
+                                v-if="record.prescription.anticoagulant == 15"
+                                >mg</span
+                              >
                             </td>
                             <td width="10"></td>
                             <td width="35">追加</td>
@@ -1157,7 +1173,7 @@
                               <div class="under-line">
                                 &nbsp;
                                 <span
-                                  v-if="record.prescription.anticoagulant == 2"
+                                  v-if="record.prescription.anticoagulant == 2|| record.prescription.anticoagulant == 15"
                                   >{{
                                     record.prescription.anticoagulant_weichi
                                       ? record.prescription.anticoagulant_weichi
@@ -1195,6 +1211,10 @@
                                 v-if="record.prescription.anticoagulant == 1"
                                 >mg/h</span
                               >
+                              <span
+                                v-if="record.prescription.anticoagulant == 15"
+                                >mg/h</span
+                              >
                             </td>
 
                             <td width="35">总量:</td>
@@ -1202,7 +1222,7 @@
                               <div class="under-line">
                                 &nbsp;
                                 <span
-                                  v-if="record.prescription.anticoagulant == 2"
+                                  v-if="record.prescription.anticoagulant == 2 || record.prescription.anticoagulant == 15"
                                   >{{
                                     record.prescription.anticoagulant_zongliang
                                       ? record.prescription
@@ -1241,8 +1261,12 @@
                                 v-if="record.prescription.anticoagulant == 1"
                                 >mg</span
                               >
+                              <span
+                                v-if="record.prescription.anticoagulant == 15"
+                                >mg</span
+                              >
                             </td>
-                            <td width="40"></td>
+                            <!-- <td width="40"></td> -->
                           </tr>
                         </tbody>
                       </table>

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

@@ -1077,8 +1077,10 @@ export default {
     },
     'form.additional_weight':function(){
       if(this.predialysis_evaluation!=null){
-
-         this.form.additional_weight = this.predialysis_evaluation.additional_weight
+         if(this.form.additional_weight == "" || this.form.additional_weight == 0){
+          this.form.additional_weight = this.predialysis_evaluation.additional_weight
+         }
+         
        }
     },
     'form.after_weight':function(){

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

@@ -3113,7 +3113,7 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '17:30'
             }
-           }else if(this.$store.getters.xt_user.org.id == 10745){
+           }else if(this.$store.getters.xt_user.org.id == 10744){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
             } else if (schedual.schedule_type == 2) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1440,11 +1440,11 @@
                             <span v-if="org_id != 10683">置换量</span>
                             <br />
                             <span
-                              v-if="org_id != 10598 && org_id != 10567 && org_id != 10724 && org_id != 10644 && org_id != 10353 && org_id != 10414 && org_id!=10744">
+                              v-if="org_id != 10598 && org_id != 10567 && org_id != 10724 && org_id != 10644 && org_id != 10353 && org_id != 10414 && org_id!=10744 && org_id!=10471">
                               <span v-if="org_id != 0 && org_id != 10683">(ml)</span>
                               <span v-if="org_id == 10683">(ml/h)</span>
                             </span>
-                            <span v-if="org_id == 10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id == 10353 || org_id == 10414 || org_id == 10744">(L)</span>
+                            <span v-if="org_id == 10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id == 10353 || org_id == 10414 || org_id == 10744 || org_id == 10471">(L)</span>
                           </td>
                           <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
                           <td width="50"
@@ -1465,20 +1465,29 @@
                             {{ monitor.temperature ? monitor.temperature : "" }}
                           </td>
                           <td>
-                            <span v-if="org_id!=9478">
+                            <span v-if="org_id!=9478 && org_id!=10744">
                               {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                             </span>
 
-                            <span v-if="org_id == 9478">
+                            <span v-if="org_id == 9478 || org_id == 10744">
                               {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "拒测" }}
                             </span>
                             
                           </td>
-                          <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</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>
+                            <span v-if="org_id ==10744"> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</span>
+                            <span v-if="org_id !=10744"> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</span>
+                          </td>
+                          <td v-if="org_id != 10489">
+                            <span  v-if="org_id ==10744"> {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}</span>
+                            <span  v-if="org_id !=10744"> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}</span>
+                          </td>
+                          <td>
+                           <span v-if="org_id ==10744">  {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span>
+                           <span v-if="org_id !=10744">  {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</span>
+                          </td>
                           <td v-if="org_id == 10478 || org_id == 10598 || org_id == 10510 || org_id == 10735 || org_id == 10744">
                             {{
                               monitor.arterial_pressure
@@ -1487,14 +1496,14 @@
                             }}
                           </td>
                           <td>
-                            <span v-if="org_id == 10551">
+                            <span v-if="org_id == 10551 || org_id ==10744">
                               {{
                                 monitor.venous_pressure
                                   ? monitor.venous_pressure
                                   : "/"
                               }}
                             </span>
-                            <span v-if="org_id != 10551">
+                            <span v-if="org_id != 10551 && org_id!=10744">
                               {{
                                 monitor.venous_pressure
                                   ? monitor.venous_pressure
@@ -1511,11 +1520,18 @@
                               (dialysisOrder &&
                                 monitor.operate_time < dialysisOrder.start_time)
                             ">
-                              {{
+                             <span v-if="org_id == 10744">{{
+                                monitor.transmembrane_pressure
+                                  ? monitor.transmembrane_pressure
+                                  : "/"
+                              }}
+                              </span>  
+                              <span v-if="org_id != 10744">{{
                                 monitor.transmembrane_pressure
                                   ? monitor.transmembrane_pressure
                                   : ""
                               }}
+                              </span>  
                             </span>
                             <span v-if="
                               dialysisOrder &&
@@ -1523,11 +1539,20 @@
                               dialysisOrder &&
                               monitor.operate_time >= dialysisOrder.start_time
                             ">
+                             <span v-if="org_id == 10744">
+                              {{
+                                monitor.transmembrane_pressure
+                                  ? monitor.transmembrane_pressure
+                                  : "/"
+                              }}
+                             </span> 
+                             <span v-if="org_id != 10744">
                               {{
                                 monitor.transmembrane_pressure
                                   ? monitor.transmembrane_pressure
                                   : ""
                               }}
+                             </span> 
                             </span>
                           </td>
                           <td v-if="org_id == 9919">
@@ -1542,12 +1567,13 @@
                           </td>
 
                           <td v-if="org_id != 9919 && org_id != 9671 && org_id != 9836 && org_id != 10644">
-                            {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
+                             <span v-if="org_id == 10744"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "/" }}</span>
+                             <span v-if="org_id!=10744"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</span>
                           </td>
 
 
                           <td v-if="org_id == 10121">
-                            {{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }}
+                            {{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "/" }}
                           </td>
 
                           <td v-if="org_id == 9538">
@@ -1559,11 +1585,12 @@
                             v-if="org_id != 9538 && org_id != 10121 && org_id != 10600 && org_id != 10644 && org_id != 10735">
                             <span
                               v-if="org_id != 0 && org_id != 10469 && org_id != 10490 && org_id != 10567 && org_id != 10724">
-                              {{
-                                monitor.conductivity ? monitor.conductivity : "" }}</span>
+                                <span v-if="org_id == 10744">{{monitor.conductivity ? monitor.conductivity : "/" }}</span> 
+                                <span v-if="org_id != 10744">{{monitor.conductivity ? monitor.conductivity : "" }}</span> 
+                            </span>
                             <span v-if="org_id == 10469 || org_id == 10567 || org_id == 0 || org_id == 10724"> {{
-                              monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
-                            <span v-if="org_id == 10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : ""
+                              monitor.sodium_concentration ? monitor.sodium_concentration : "/" }}</span>
+                            <span v-if="org_id == 10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "/"
                               }}</span>
                           </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -589,14 +589,14 @@
                 <table class="table-box">
                   <tbody>
                     <tr>
-                      <td width="40">肝素:</td>
-                      <td width="75">
+                      <!-- <td width="40">肝素:</td> -->
+                      <td width="70">
                         <label-box
                           :isChecked="(prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7) ? true : false"
                           showValue="低分子:"></label-box>
                       </td>
 
-                      <td width="60">
+                      <td width="30">
                         <div class="under-line">
                           &nbsp;
                           <span
@@ -617,15 +617,19 @@
                         <label-box :isChecked="prescription.anticoagulant == 1 ? true : false"
                           showValue="无肝素"></label-box>
                       </td>
-                      <td width="100">
+                      <td width="90">
                         <label-box :isChecked="prescription.anticoagulant == 2 ? true : false"
                           showValue="普通肝素:"></label-box>
                       </td>
-                      <td width="35">首剂</td>
-                      <td width="40">
+                      <td width="60">
+                        <label-box :isChecked="prescription.anticoagulant == 15 ? true : false"
+                          showValue="甲磺酸萘莫司他:"></label-box>
+                      </td>
+                      <td width="40">首剂</td>
+                      <td width="20">
                         <div class="under-line">
                           &nbsp;
-                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_shouji }}</span>
+                          <span v-if="prescription.anticoagulant == 2 || prescription.anticoagulant == 15">{{ prescription.anticoagulant_shouji }}</span>
                         </div>
                       </td>
                       <td width="20">
@@ -633,30 +637,32 @@
                         <span v-if="prescription.anticoagulant == 3">iu</span>
                         <span v-if="prescription.anticoagulant == 2">iu</span>
                         <span v-if="prescription.anticoagulant == 1">mg</span>
+                        <span v-if="prescription.anticoagulant == 15">iu</span>
                       </td>
                       <td width="10"></td>
-                      <td width="35">追加</td>
-                      <td width="40">
+                      <td width="40">追加</td>
+                      <td width="20">
                         <div class="under-line">
                           &nbsp;
-                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi ?
+                          <span v-if="prescription.anticoagulant == 2 || prescription.anticoagulant == 15">{{ prescription.anticoagulant_weichi ?
                             prescription.anticoagulant_weichi : "/" }}</span>
 
                         </div>
                       </td>
-                      <td width="40">
+                      <td width="20">
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                         <span v-if="prescription.anticoagulant == 4">mg/h</span>
                         <span v-if="prescription.anticoagulant == 3">iu/h</span>
                         <span v-if="prescription.anticoagulant == 2">iu/h</span>
                         <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                        <span v-if="prescription.anticoagulant == 15">mg/h</span>
                       </td>
 
                       <td width="35">总量:</td>
                       <td width="40">
                         <div class="under-line">
                           &nbsp;
-                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_zongliang ?
+                          <span v-if="prescription.anticoagulant == 2 || prescription.anticoagulant == 15">{{ prescription.anticoagulant_zongliang ?
                             prescription.anticoagulant_zongliang : "/" }}</span>
                         </div>
                       </td>
@@ -665,8 +671,9 @@
                         <span v-if="prescription.anticoagulant == 3">iu</span>
                         <span v-if="prescription.anticoagulant == 2">iu</span>
                         <span v-if="prescription.anticoagulant == 1">mg</span>
+                        <span v-if="prescription.anticoagulant == 15">mg</span>
                       </td>
-                      <td width="40"></td>
+                     
                     </tr>
                   </tbody>
                 </table>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -742,6 +742,24 @@
                         <span v-if="prescription.anticoagulant == 13"><label-box
                             :isChecked="prescription.anticoagulant == 13 ? true : false"
                             showValue="那屈肝素钙"></label-box></span>
+                        <span v-if="prescription.anticoagulant == 14"><label-box
+                            :isChecked="prescription.anticoagulant == 14 ? true : false"
+                            showValue="肝素钙注射液"></label-box></span>
+                         <span v-if="prescription.anticoagulant == 15"><label-box
+                            :isChecked="prescription.anticoagulant == 15 ? true : false"
+                            showValue="甲磺酸萘莫司他"></label-box></span>
+                         <span v-if="prescription.anticoagulant == 16"><label-box
+                            :isChecked="prescription.anticoagulant == 16 ? true : false"
+                            showValue="低分子量肝素钙"></label-box></span>
+                        <span v-if="prescription.anticoagulant == 17"><label-box
+                            :isChecked="prescription.anticoagulant == 17 ? true : false"
+                            showValue="肝素钠"></label-box></span>
+                         <span v-if="prescription.anticoagulant == 18"><label-box
+                            :isChecked="prescription.anticoagulant == 18 ? true : false"
+                            showValue="贝米肝素钠注射液"></label-box></span>
+                        <span v-if="prescription.anticoagulant == 19"><label-box
+                            :isChecked="prescription.anticoagulant == 19 ? true : false"
+                            showValue="低分子量肝素钠"></label-box></span>
                       </td>
                       <!-- <td width='100'>
                                   <div class="under-line">
@@ -1173,6 +1191,9 @@
                 <span v-if="monitor.monitor_anticoagulant == 14">肝素钙注射液</span>
                 <span v-if="monitor.monitor_anticoagulant == 15">甲磺酸萘莫司他</span>
                 <span v-if="monitor.monitor_anticoagulant == 16">低分子量肝素钙</span>
+                <span v-if="monitor.monitor_anticoagulant == 17">肝素钠</span>
+                <span v-if="monitor.monitor_anticoagulant == 18">贝米肝素钠注射液</span>
+                <span v-if="monitor.monitor_anticoagulant == 19">低分子量肝素钠</span>
                 <span
                   v-if="monitor.monitor_anticoagulant_value != undefined && monitor.monitor_anticoagulant_value != ''">({{ monitor.monitor_anticoagulant_value }})</span>
               </td>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -62,7 +62,7 @@
 
           </el-form-item>
 
-          <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id != 10721 && org_id != 0">
+          <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id != 10721">
 
             <el-select style="width:100%;" v-model="diagnose" placeholder="" multiple filterable>
               <el-option

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610 ">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 10510 && org_id!=10653" v-bind:childResponse="childResponse"
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 10510 && org_id!=10653&& org_id!=0" v-bind:childResponse="childResponse"
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
         :prescription_id="prescription_id"></printOne>
@@ -27,7 +27,7 @@
           :prescription_id="prescription_id">
         </prinSeven>
 
-        <prineight v-if="org_id == 10644"
+        <prineight v-if="org_id == 10644 || org_id == 0"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -63,10 +63,15 @@
               <div style="flex: 1;">
                 临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
               </div>
+             
+            </div>
+            <div style="display: flex;line-height: 24px;padding: 0 10px;">
               <div style="flex: 1;">
                 过敏史:{{ item.patient.allergic_history }}
               </div>
+             
             </div>
+
             <div style="line-height: 24px;padding: 0 10px;">住址/电话:{{ item.patient.home_address }}&nbsp;<span>{{ item.patient.phone }}</span></div>
           </div>
           <!-- 精二 -->
@@ -232,7 +237,7 @@
                                 {{ites[0].drug.max_unit}}
                               </span>&nbsp;
                             </div>
-                            <div :style="{display: 'inline-block',position: 'absolute',left:'85%',top:((ins+1)*20)+'px','margin-left': '5px'}" >
+                            <div :style="{display: 'inline-block',position: 'absolute',left:'85%',width:'130px',top:((ins+1)*20)+'px','margin-left': '5px'}" >
                               &nbsp;共{{ ites[0].single_dose }}{{ ites[0].single_dose_unit }}
                             </div>
                           </div>
@@ -267,7 +272,7 @@
                     </div>
                   </div>
                   <template>
-                      <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" >
+                      <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;width:130px" >
                         &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
                       </div>
                   </template>

src/xt_pages/outpatientTool/labelPrint.vue

@@ -130,16 +130,16 @@
                   <div id="sign" class="signPrint" style="width: 500px;height: 250px;">
                       <div style="display:flex;margin-bottom:0px;">
                           <div style="margin-left:15px;">
-                              <div style="font-weight:bold;font-size:24px;">C</div>
-                              <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
-                              <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
+                              <div style="font-weight:bold;font-size:24px;"  v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217&& $store.getters.xt_user.org.id != 10278&& $store.getters.xt_user.org.id != 10610&& $store.getters.xt_user.org.id != 0">C</div>
+                              <div>{{getTime(current_ctime,'{m}-{d} {h}:{i}')}}</div>
+                              <div style="font-size:18px;margin-left:20px;font-weight: bold;max-width: 100%;">{{current_name}}</div>
                           </div>
-                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217&& $store.getters.xt_user.org.id != 10278&& $store.getters.xt_user.org.id != 0"  id="barcode">
+                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217&& $store.getters.xt_user.org.id != 10278&& $store.getters.xt_user.org.id != 10610&& $store.getters.xt_user.org.id != 0"  id="barcode">
                       </div>
                       <div style="margin-bottom:0px;">{{current_number}}</div>
-                      <div style="display:flex;">
-                          <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
-                          <div style="font-size:18px;margin-left:20px;font-weight: bold">{{current_name}}</div>
+                      <div style="display:flex;flex-wrap: wrap; word-wrap: break-word; overflow-wrap: break-word;">
+                        
+                          <div style="font-size:18px;padding-left:20px;font-weight: bold;max-width:5cm;">{{current_project_name}}</div>
                       </div>
                   </div>
             </div>

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

@@ -73,7 +73,12 @@
             :class="signAndWeighBoxPatients"
             border
             :cell-class-name="cellStyle"
-          >
+           >
+           <el-table-column label="药品ID号" align="center" style="width: 50px;">
+              <template slot-scope="scope">
+                 {{ scope.row.id?scope.row.id:"" }}
+              </template>
+            </el-table-column>
             <el-table-column label="药品类型" align="center">
               <template slot-scope="scope">
                 {{getDrugTypeName(scope.row.drug_type)}}

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -353,7 +353,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="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217 && org_id !=0">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getPrice(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">
@@ -365,8 +365,9 @@
                       
                       </span>
                     </span>
-                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
-                        {{ scope.row.min_price }}
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id == 0">
+                        <!-- {{ scope.row.min_price }} -->
+                        {{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
                     </span>
                     
                   </td>
@@ -378,7 +379,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="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=10088 && org_id!=10510">
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=10088 && org_id!=10510 && org_id!=0">
                     <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,scope.row.drug_id)}} </span>
                     <span v-if="is_sys == 0">
                       <!-- <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
@@ -387,9 +388,11 @@
                     </span>
                     </span>
 
-                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id ==10088 || org_id ==10510">
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id ==10088 || org_id ==10510 || org_id == 0">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
-                     <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
+                     <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">
+                      {{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id) * getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number) ).toFixed(2)}}
+                    </span>  
                      <span v-if="is_sys==0">
                        {{(scope.row.count * scope.row.price).toFixed(2)}}
                        <!-- {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}} -->
@@ -1322,7 +1325,7 @@ export default {
           var drugFlowList = response.data.data.drugFlowList;
           //流水详情
           var drugList = response.data.data.drugList
-         
+          
           this.tabList = drugList
           //按批号分组
           var drugListOne = response.data.data.drugListFlow
@@ -2127,6 +2130,8 @@ export default {
       }
       return price
     },
+
+
     getPriceOne(number,max_unit,min_unit,min_number){
       var arr = []
       var price = 0

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -966,7 +966,7 @@ export default {
             this.recordInfo.recordData[i].price = val.retail_price;
           }
 
-          this.recordInfo.recordData[i].manufacturer = val.manufacturer;
+          this.recordInfo.recordData[i].manufacturer = val.first_drug_warehouse_info.manufacturer;
           this.recordInfo.recordData[i].name =
             this.recordInfo.recordData[i].dose +
             this.recordInfo.recordData[i].dose_unit +
@@ -979,7 +979,7 @@ export default {
           if (val.dealer == 0) {
             this.recordInfo.recordData[i].dealer = "";
           } else {
-            this.recordInfo.recordData[i].dealer = val.dealer;
+            this.recordInfo.recordData[i].dealer = val.first_drug_warehouse_info.dealer;
           }
 
           console.log("hhahhahahwowowo",this.recordInfo.recordData)

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -27,6 +27,7 @@
               <td style="line-height: 50px" width="80">批号</td>
               <td style="line-height: 50px" width="80">生产日期</td>
               <td style="line-height: 50px" width="80">有效日期</td>
+              <td style="line-height: 50px" width="80">出库对象</td>
             </tr>
 
             <tr v-for="(item,i) in it.child" :key="i">
@@ -51,10 +52,11 @@
              <td>{{item.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
              <td>{{(getTime(item.expire_date))}}</td>
+             <td>{{getXuserName(item.admin_user_id) }}</td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>
-               <td colspan="7"></td>
+               <td colspan="8"></td>
                <td>{{getAllPrince(it.id).toFixed(2)}}</td>
              </tr>
             </tbody>
@@ -98,6 +100,7 @@
               <td style="line-height: 50px" width="80">批号</td>
               <td style="line-height: 50px" width="80">生产日期</td>
               <td style="line-height: 50px" width="80">有效日期</td>
+              <td style="line-height: 50px" width="80">出库对象</td>
             </tr>
 
             <tr v-for="(item,i) in it.xt_drug_warehouse_out_info" :key="i">
@@ -126,11 +129,12 @@
              <td>{{item.drug_warehouse_info.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
              <td>{{(getTime(item.expiry_date))}}</td>
+             <td>{{getXuserName(item.admin_user_id) }}</td>
             </tr>
 
              <tr>
                <td style="line-height:50px">合计</td>
-               <td colspan="7"></td>
+               <td colspan="8"></td>
                <td>{{getTotalPrice(it.xt_drug_warehouse_out_info)}}</td>
              </tr>
             </tbody>
@@ -167,6 +171,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
+  import { fetchAllAdminUsers } from "@/api/doctor";
   import {  getDrugWarehouseOutInfo,getDrugWarehouseOrderInfo,getDrugOutOrderDetailPrint } from '@/api/drug/drug_stock'
   import {getBaseDrugLibList} from '@/api/data'
   export default {
@@ -212,6 +217,7 @@
         loading:false,
         warehouseList:[],
         tableData:[],
+        adminUserOptions:[]
       }
     },
     methods: {
@@ -430,13 +436,44 @@
            count +=val[i].count * val[i].price
           }
          return count.toFixed(2)
+        },
+        getXuserName(id) {
+          if (id <= 0) {
+            return "";
+          }
+          var name = "";
+          if (
+            this.adminUserOptions == null ||
+            typeof this.adminUserOptions.length === "undefined"
+          ) {
+            return name;
+          }
+          var leng = this.adminUserOptions.length;
+          if (leng == 0) {
+            return name;
+          }
+          for (let index = 0; index < leng; index++) {
+            if (this.adminUserOptions[index].id == id) {
+              name = this.adminUserOptions[index].name;
+              break;
+            }
+          }
+          return name;
+      },
+     fetchAllAdminUsers() {
+      fetchAllAdminUsers().then((response) => {
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
         }
+      });
+    },
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
       const order_id = this.$route.query.id;
       this.orgId = this.$store.getters.xt_user.org.id;  
       this.getDrugOutOrderDetailPrint(order_id)
+      this.fetchAllAdminUsers();
     }
 
   }

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -1166,7 +1166,7 @@ export default {
             "/" +
             val.max_unit;
           this.recordInfo.recordData[i].price = val.retail_price;
-          this.recordInfo.recordData[i].manufacturer = val.manufacturer;
+          this.recordInfo.recordData[i].manufacturer = val.first_drug_warehouse_info.manufacturer;
           this.recordInfo.recordData[i].number = val.number;
           this.recordInfo.recordData[i].max_unit = val.max_unit;
           this.recordInfo.recordData[i].min_unit = val.min_unit;
@@ -1190,7 +1190,7 @@ export default {
           if (val.dealer == 0) {
             this.recordInfo.recordData[i].dealer = "";
           } else {
-            this.recordInfo.recordData[i].dealer = val.dealer;
+            this.recordInfo.recordData[i].dealer = val.first_drug_warehouse_info.dealer;
           }
         }
       }

src/xt_pages/stock/query/goodNewQuery.vue

@@ -59,7 +59,12 @@
             border
            :cell-class-name="cellStyle"
           >
-          <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
+          <el-table-column label="耗材ID号" align="center" style="width: 50px;">
+              <template slot-scope="scope">
+                 {{ scope.row.id?scope.row.id:"" }}
+              </template>
+            </el-table-column>
+           <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
               <template slot-scope="scope">
                  {{ scope.row.good_number?scope.row.good_number:"" }}
               </template>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -919,6 +919,7 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
+        console.log("val000000000",val)
         var arr = []
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            arr.push(this.recordInfo.recordData[i].good_id)
@@ -942,7 +943,7 @@ export default {
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-            this.recordInfo.recordData[i].manufacturer = val.manufacturer
+            this.recordInfo.recordData[i].manufacturer = val.first_xt_warehouse_info.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
@@ -979,16 +980,9 @@ export default {
             if(val.dealer == 0){
              this.recordInfo.recordData[i].dealer = ""
             }else{
-             this.recordInfo.recordData[i].dealer = val.dealer
+             this.recordInfo.recordData[i].dealer = val.first_xt_warehouse_info.dealer
             }
 
-            // for(let i=0;i<this.recordInfo.recordData.length;i++){
-            //   this.recordInfo.recordData[i].warehouse_info_str = ""
-            //   for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
-            //     this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
-            //   }
-            // }
-
             console.log("日期我我我哦我",  this.recordInfo.recordData)
          }
 

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -36,6 +36,7 @@
                                     <td width="80">批号</td>
                                     <td width="80">生产日期</td>
                                     <td width="80">有效日期</td>
+                                    <td width="80">出库对象</td>
                                 </tr>
                             </thead>
                             <tbody>
@@ -49,10 +50,11 @@
                                     <td>{{item.number}}</td>
                                     <td>{{getTime(item.product_date)}}</td>
                                     <td>{{getTime(item.expiry_date)}}</td>
+                                    <td>{{getXuserName(item.admin_user_id)}}</td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>
-                                  <td colspan="7"></td>
+                                  <td colspan="8"></td>
                                   <td>{{getAllPice(it.id).toFixed(2)}}</td>
                                </tr>
                             </tbody>
@@ -82,7 +84,8 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList,getOrderDetailByOrderId,getStockDrugCount } from "@/api/stock";
+import { GetAllConfig,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList,getOrderDetailByOrderId,getStockDrugCount } from "@/api/stock";
+import { fetchAllAdminUsers  } from "@/api/doctor";
 import print from 'print-js'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
@@ -129,7 +132,8 @@ export default {
             countList:[],
             outCountList:[],
             autoCountList:[],
-            cancelCountList:[]
+            cancelCountList:[],
+            adminUserOptions:[]
         }
     },
     methods:{
@@ -395,6 +399,36 @@ export default {
       }
       return total;
     },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then((response) => {
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+        }
+      });
+    },
   
     },
     created(){
@@ -406,6 +440,7 @@ export default {
       this.GetOrderDetailOne(order_id)
       this.getList()
       this.getStockDrugCount()
+      this.fetchAllAdminUsers();
     }
 }
 </script>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -859,7 +859,7 @@ import patient from '../../router/modules/patient'
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name  +"/"+val.packing_unit
-            this.recordInfo.recordData[i].manufacturer = val.manufacturer
+            this.recordInfo.recordData[i].manufacturer = val.first_xt_warehouse_info.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].warehouse_info_id = 0
@@ -890,7 +890,7 @@ import patient from '../../router/modules/patient'
              if(val.dealer == 0){
                this.recordInfo.recordData[i].dealer = ""
              }else{
-               this.recordInfo.recordData[i].dealer = val.dealer
+               this.recordInfo.recordData[i].dealer = val.first_xt_warehouse_info.dealer
              }
 
          }
@@ -925,6 +925,7 @@ import patient from '../../router/modules/patient'
 
           this.manufacturerList = manufacturerList
           this.goodType = response.data.data.goodType
+          this.doctorList = []
           this.doctorList = response.data.data.doctorlist
          
           for (let i = 0; i < response.data.data.list.length; i++) {
@@ -939,7 +940,7 @@ import patient from '../../router/modules/patient'
             response.data.data.list[i].remark = response.data.data.list[i].remark
             response.data.data.list[i].buy_price = response.data.data.list[i].buy_price.toString()
             response.data.data.list[i].stock_count = response.data.data.list[i].stock_count.toString()
-
+          
             response.data.data.list[i].class_type = response.data.data.list[i].class_type
           
             // response.data.data.list[i].patient_id = this.getPatientName(response.data.data.list[i].patient_id)

src/xt_pages/user/components/PatientForm.vue

@@ -244,7 +244,16 @@
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="org_id!=10138 && org_id!=10278 && org_id!=10537 && org_id!=10610 && org_id!=0">
+                <el-form-item
+                  label="本人电话 : "
+                  prop="phone"
+                >
+                  <el-input v-model="form.phone" maxlength="20"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="(org_id==10138 || org_id==10278 || org_id==10537 || org_id==10610) && is_show == true">
                 <el-form-item
                   label="本人电话 : "
                   prop="phone"
@@ -260,7 +269,17 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="org_id!=10138 && org_id!=10278 && org_id!=10537 && org_id!=10610 && org_id!=0">
+                <el-form-item label="家属电话 : ">
+                  <el-input
+                    v-model="form.homeTelephone"
+                    maxlength="20"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+
+
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="(org_id==10138 || org_id==10278  || org_id==10537 || org_id==10610 || org_id==0) && is_show == true">
                 <el-form-item label="家属电话 : ">
                   <el-input
                     v-model="form.homeTelephone"
@@ -1574,6 +1593,7 @@ export default {
       formsubmit:false,
       loadingText:'',
       fileList:[],
+      is_show:true,
     };
   },
   components: {
@@ -1628,6 +1648,7 @@ export default {
     this.org_id =this.$store.getters.xt_user.org.id
 
     if (this.isEdit) {
+     
       this.submitMsg = "修改患者信息成功";
       const id = this.$route.params && this.$route.params.id;
       this.patientID = parseInt(id);
@@ -1640,9 +1661,11 @@ export default {
       }
       this.fetchPatient(id);
       this.avatarFlag = true;
+     
     } else {
       this.submitMsg = "新增患者成功";
       this.form = Object.assign({}, defaultForm);
+      this.is_show = true
       this.form.lapseto  = 1
       if(this.org_id == 0 || this.org_id ==9919 || this.org_id ==10571){
          this.form.diagnose = "1.慢性肾脏病5期  IgA肾病 维持性血液透析 肾性贫血 肾性高血压  继发性甲状旁腺功能亢进症  2.右前臂自体动静脉内瘘成形术后"
@@ -2069,6 +2092,18 @@ export default {
       fetchPatient(id)
         .then(response => {
           if (response.data.state == 1) {
+
+            var viewModels = response.data.data.viewModels
+            var is_sub_super_admin = false
+            var user_id = this.$store.getters.xt_user.user.id
+            console.log("user_id=====",user_id)
+            this.is_show = false
+            for(let i=0;i<viewModels.length;i++){
+              if(user_id == viewModels[i].user_id){
+                  is_sub_super_admin = is_sub_super_admin
+              }
+            }
+            this.is_show = is_sub_super_admin
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
             this.fileList = []

src/xt_pages/user/components/PatientSidebar.vue

@@ -231,6 +231,10 @@ export default {
               name: '1-8',
               label: '传染病管理'
             },
+            // {
+            //   name: '4-13',
+            //   label: '肾科检验'
+            // },
           ]
         },
          {
@@ -386,6 +390,8 @@ export default {
         this.$router.push({path:'/patients/ktv?id='+this.id})
       }else if(name == '4-12'){
         this.$router.push({path:'/patients/newInspection?id='+this.id})
+      }else if(name == '4-13'){
+        this.$router.push({path:'/patients/inspection/list?id='+this.id})
       }
       else if (name == '5-1') {
         this.$router.push({
@@ -429,7 +435,6 @@ export default {
       }else if(name == '7'){
         this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }else if(name == '8'){
-        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
        this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }
     },
@@ -598,6 +603,8 @@ export default {
        this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }else if(patientKey == '4-12'){
         this.$router.push({path:'/patients/newInspection?id='+this.id})
+      }else if(patientKey == '4-13'){
+        this.$router.push({path:'/patients/inspection/list?id='+this.id})
       }
 
      }else{

src/xt_pages/user/components/PatientSidebar_ord.vue

@@ -230,6 +230,10 @@ export default {
               name: '1-8',
               label: '传染病管理'
             },
+            // {
+            //   name: '4-13',
+            //   label: '肾科检验'
+            // },
           ]
         },
          {
@@ -385,6 +389,8 @@ export default {
         this.$router.push({path:'/patients/ktv?id='+this.id})
       }else if(name == '4-12'){
         this.$router.push({path:'/patients/newInspection?id='+this.id})
+      }else if(name == '4-13'){
+        this.$router.push({path:'/patients/inspection/list?id='+this.id})
       }
       else if (name == '5-1') {
         this.$router.push({
@@ -428,7 +434,6 @@ export default {
       }else if(name == '7'){
         this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }else if(name == '8'){
-        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
        this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }
     },
@@ -597,6 +602,8 @@ export default {
        this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }else if(patientKey == '4-12'){
         this.$router.push({path:'/patients/newInspection?id='+this.id})
+      }else if(name == '4-13'){
+        this.$router.push({path:'/patients/inspection/list?id='+this.id})
       }
 
      }else{

src/xt_pages/workforce/Patientshift.vue

@@ -876,14 +876,21 @@ export default {
       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('号', '')
+      console.log("names=======",names)
+      if(names!=null && names!=undefined){
+        name = names.join('')
+      
+        if (name.includes('区')) {
+          name = name.replace('区', '')
+        }
+        if (name.includes('号')) {
+          name = name.replace('号', '')
+        }
+        return name
+      }else{
+        return ""
       }
-      return name
+     
     },
     // 分区
     getZoneName(id) {

src/xt_pages/workforce/components/editTableData.vue

@@ -2628,19 +2628,20 @@ export default {
     // 透析次数
     chishuclick(row){
       // this.cishu_dialogVisible=true
-      // console.log('ddddddd',row);
+      console.log('ddddddd',row);
       this.Dialysis_patient=row.name
       this.patient_id = ""
       this.patient_id  = row.id
-      this.getPatientDialysisRecordList(row.id)
+      this.getPatientDialysisRecordList()
     },
-    getPatientDialysisRecordList(id){
+    getPatientDialysisRecordList(){
       var params= {
-        patient_id:id,
+        patient_id:this.patient_id,
         start_time:this.start_time,
         end_time:this.end_time,
       }
       console.log('tttt',params);
+    
       getPatientDialysisRecordList(params).then(response=>{
          if(response.data.state == 1){
            var list  = response.data.data.list

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
 //  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))