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

package-lock.json

@@ -1602,6 +1602,14 @@
       "dev": true,
       "optional": true
     },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==",
+      "requires": {
+        "inherits": "~2.0.0"
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -1936,30 +1944,6 @@
         "ssri": "^5.2.4",
         "unique-filename": "^1.1.0",
         "y18n": "^4.0.0"
-      },
-      "dependencies": {
-        "chownr": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
-        }
       }
     },
     "cache-base": {
@@ -2069,15 +2053,15 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001538",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001538.tgz",
-      "integrity": "sha512-DpDWGDG9Jk7cjISKb8Rr0RSwZTSUepMQupS1HyON5KSslZn0EZj9rBOaAm3LVGGJ5jvuDaEcJkrz8GDzV4LF9A==",
+      "version": "1.0.30001535",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001535.tgz",
+      "integrity": "sha512-GqX/YYHUWIiK3H9wneyTqg7yfcMcXJ8mKHzt/m3qzB+u4Q84mVEh00lkk6jVdiTgXkxZEVOOh2AQEtQsV3IkXA==",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001538",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
+      "version": "1.0.30001535",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001535.tgz",
+      "integrity": "sha512-48jLyUkiWFfhm/afF7cQPqPjaUmSraEhK4j+FCTJpgnGGEZHqyLe3hmWH7lIooZdSzXL0ReMvHz0vKDoTBsrwg==",
       "dev": true
     },
     "canvg": {
@@ -2241,9 +2225,10 @@
       }
     },
     "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -2933,16 +2918,58 @@
       "dev": true,
       "requires": {
         "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+      "integrity": "sha512-eZ+m1WNhSZutOa/uRblAc9Ut5MQfukFrFMtPSm3bZCA888NmMd5AWXWdgRZ80zd+pTk1P2JrGjg9pUPTvl2PWQ==",
       "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "lru-cache": "^4.0.1",
+        "which": "^1.2.9"
       }
     },
     "crypto-browserify": {
@@ -3786,9 +3813,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.526",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.526.tgz",
-      "integrity": "sha512-tjjTMjmZAx1g6COrintLTa2/jcafYKxKoiEkdQOrVdbLaHh2wCt2nsAF8ZHweezkrP+dl/VG9T5nabcYoo0U5Q==",
+      "version": "1.4.523",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.523.tgz",
+      "integrity": "sha512-9AreocSUWnzNtvLcbpng6N+GkXnCcBR80IQkxRC9Dfdyg4gaWNUPBujAHUpKkiUkoSoR9UlhA4zD/IgBklmhzg==",
       "dev": true
     },
     "elegant-spinner": {
@@ -3875,11 +3902,6 @@
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
-    "env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
-    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -4232,33 +4254,12 @@
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-          "dev": true
-        },
         "semver": {
           "version": "6.3.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
           "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
           "dev": true
         },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-          "dev": true
-        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -4276,15 +4277,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
@@ -4509,41 +4501,6 @@
             "shebang-command": "^1.2.0",
             "which": "^1.2.9"
           }
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
         }
       }
     },
@@ -5073,9 +5030,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
     "font-awesome": {
       "version": "4.7.0",
@@ -5207,24 +5164,6 @@
         "readable-stream": "^2.0.0"
       }
     },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "requires": {
-        "minipass": "^3.0.0"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        }
-      }
-    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -5249,6 +5188,27 @@
       "dev": true,
       "optional": true
     },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -6020,6 +5980,11 @@
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true
     },
+    "in-publish": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
+      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="
+    },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
@@ -6917,16 +6882,6 @@
             "strip-eof": "^1.0.0"
           }
         },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
         "ms": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -6939,21 +6894,6 @@
           "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
           "dev": true
         },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-          "dev": true
-        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -6962,21 +6902,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
         }
       }
     },
@@ -7395,11 +7320,12 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "requires": {
-        "yallist": "^4.0.0"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
     "make-dir": {
@@ -7610,30 +7536,6 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
     },
-    "minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        }
-      }
-    },
     "mississippi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
@@ -7810,37 +7712,36 @@
       "dev": true
     },
     "node-gyp": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
-      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "requires": {
-        "env-paths": "^2.2.0",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
-        "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
-        "request": "^2.88.2",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.2",
-        "tar": "^6.0.2",
-        "which": "^2.0.2"
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
       },
       "dependencies": {
         "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
           "requires": {
             "glob": "^7.1.3"
           }
         },
         "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="
         }
       }
     },
@@ -7893,35 +7794,25 @@
         "semver": "^5.3.0",
         "shellwords": "^0.1.0",
         "which": "^1.2.12"
-      },
-      "dependencies": {
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
       }
     },
     "node-sass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-5.0.0.tgz",
-      "integrity": "sha512-opNgmlu83ZCF792U281Ry7tak9IbVC+AKnXGovcQ8LG8wFaJv6cLnRlc6DIHlmNxWEexB5bZxi9SZ9JyUuOYjw==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "requires": {
         "async-foreach": "^0.1.3",
         "chalk": "^1.1.1",
-        "cross-spawn": "^7.0.3",
+        "cross-spawn": "^3.0.0",
         "gaze": "^1.0.0",
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
         "lodash": "^4.17.15",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
         "nan": "^2.13.2",
-        "node-gyp": "^7.1.0",
+        "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
         "sass-graph": "2.2.5",
@@ -7978,9 +7869,9 @@
       }
     },
     "nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
       "requires": {
         "abbrev": "1"
       }
@@ -8044,17 +7935,6 @@
       "dev": true,
       "requires": {
         "which": "^1.2.10"
-      },
-      "dependencies": {
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
       }
     },
     "npm-run-path": {
@@ -8063,13 +7943,6 @@
       "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "requires": {
         "path-key": "^2.0.0"
-      },
-      "dependencies": {
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
-        }
       }
     },
     "npm-which": {
@@ -8088,15 +7961,6 @@
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
           "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
           "dev": true
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
@@ -8414,8 +8278,7 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="
     },
     "os-locale": {
       "version": "2.1.0",
@@ -8430,8 +8293,16 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
     },
     "p-finally": {
       "version": "1.0.0",
@@ -8568,9 +8439,9 @@
       "dev": true
     },
     "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
     },
     "path-parse": {
       "version": "1.0.7",
@@ -12256,17 +12127,17 @@
       }
     },
     "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "requires": {
-        "shebang-regex": "^3.0.0"
+        "shebang-regex": "^1.0.0"
       }
     },
     "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
     },
     "shelljs": {
       "version": "0.8.5",
@@ -12760,9 +12631,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz",
-      "integrity": "sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ=="
+      "version": "3.0.14",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.14.tgz",
+      "integrity": "sha512-U0eS5wcpu/O2/QZk6PcAMOA8H3ZuvRe4mFHA3Q+LNl1SRDmfQ+mD3RoD6tItqnvqubJ32m/zV2Z/ikSmxccD1Q=="
     },
     "spdy": {
       "version": "4.0.2",
@@ -13457,23 +13328,13 @@
       "dev": true
     },
     "tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-        }
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
       }
     },
     "text-segmentation": {
@@ -14248,27 +14109,11 @@
         "vue-template-es2015-compiler": "^1.6.0"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
         }
       }
     },
@@ -15264,9 +15109,9 @@
       "dev": true
     },
     "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -15462,9 +15307,9 @@
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
     },
     "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
     },
     "yargs": {
       "version": "13.3.2",

package.json

@@ -59,12 +59,12 @@
     "jszip": "^3.10.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "^5.0.0",
+    "node-sass": "^4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",
     "qrcodejs2": "0.0.2",
-    "sass-loader": "^7.0.0",
+    "sass-loader": "^7.3.1",
     "screenfull": "4.2.0",
     "serve-static": "1.13.2",
     "showdown": "1.8.5",

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -122,6 +122,44 @@
                 {{ "/" }}
               </div>
             </div>
+            <div class="inline_block" style="flex: 1">
+              本次透析日期：
+              <div
+                class="under_line"
+                style="width: 120px; text-align: center"
+              >
+                {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
+              </div>
+            </div>
+            <div class="inline_block" style="flex: 1">
+              透析次数：
+              <div
+                class="under_line"
+                style="width: 70px; text-align: center"
+              >
+                {{
+                  record.patient.total_dialysis +
+                  record.patient.user_sys_before_count
+                    ? record.patient.total_dialysis +
+                      record.patient.user_sys_before_count
+                    : "/"
+                }}
+              </div>
+
+              <div
+                v-if="org_id ==10234 || org_id ==10121"
+                class="under_line"
+                style="width: 70px; text-align: center"
+              >
+                {{
+                    record.Count +
+                    record.patient.user_sys_before_count
+                      ?  record.Count +
+                        record.patient.user_sys_before_count
+                      : "/"
+                  }}
+              </div>
+            </div>
           </div>
           <div class="row">
             <div class="inline_block">
@@ -176,66 +214,6 @@
                 </tr>
                 <tr>
                   <td colspan="2">
-                    <div
-                      class="row"
-                      style="padding: 2px 0; line-height: 23px; display: flex"
-                    >
-                      <div class="inline_block" style="flex: 1">
-                        本次透析日期：
-                        <div
-                          class="under_line"
-                          style="width: 120px; text-align: center"
-                        >
-                          {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
-                        </div>
-                      </div>
-                      <div class="inline_block" style="flex: 1">
-                        透析次数：
-                        <div
-                          v-if="org_id!=10234 && org_id!=10121"
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          {{
-                            record.patient.total_dialysis +
-                            record.patient.user_sys_before_count
-                              ? record.patient.total_dialysis +
-                                record.patient.user_sys_before_count
-                              : "/"
-                          }}
-                        </div>
-
-                        <div
-                          v-if="org_id ==10234 || org_id ==10121"
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          {{
-                              record.Count +
-                              record.patient.user_sys_before_count
-                                ?  record.Count +
-                                  record.patient.user_sys_before_count
-                                : "/"
-                            }}
-                        </div>
-                      </div>
-                      <div class="inline_block" style="flex: 1">
-                        透前症状：
-                        <div
-                          class="under_line"
-                          style="width: 150px; text-align: center"
-                        >
-                          {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis
-                              .symptom_before_dialysis
-                              ? record.assessment_before_dislysis
-                                  .symptom_before_dialysis
-                              : "/"
-                          }}
-                        </div>
-                      </div>
-                    </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px">
                       <div class="inline_block">
@@ -851,68 +829,22 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
-                        衣物重：
+                      <div class="inline_block" style="flex: 1">
+                        透前症状：
                         <div
                           class="under_line"
-                          style="width: 70px; text-align: center"
+                          style="width: 150px; text-align: center"
                         >
                           {{
                             record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis.additional_weight
-                              ? record.assessment_before_dislysis.additional_weight
+                            record.assessment_before_dislysis
+                              .symptom_before_dialysis
+                              ? record.assessment_before_dislysis
+                                  .symptom_before_dialysis
                               : "/"
                           }}
                         </div>
                       </div>
-                      <div
-                        class="inline_block"
-                        style="flex: 1"
-                        v-if="org_id == 9538"
-                      >
-                        血浆分离器：
-                        <div
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          <span
-                            v-if="
-                              record.prescription.plasma_separator
-                                ? record.prescription.plasma_separator != 0 &&
-                                  record.prescription.plasma_separator != '0'
-                                : false
-                            "
-                            >{{ record.prescription.plasma_separator }}</span
-                          >
-                          <span v-else>/</span>
-                        </div>
-                      </div>
-                      <div
-                        class="inline_block"
-                        style="flex: 1"
-                        v-if="org_id == 9538"
-                      >
-                        胆红素吸附柱：
-                        <div
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          <span
-                            v-if="
-                              record.prescription.bilirubin_adsorption_column
-                                ? record.prescription
-                                    .bilirubin_adsorption_column != 0 &&
-                                  record.prescription
-                                    .bilirubin_adsorption_column != '0'
-                                : false
-                            "
-                            >{{
-                              record.prescription.bilirubin_adsorption_column
-                            }}</span
-                          >
-                          <span v-else>/</span>
-                        </div>
-                      </div>
                     </div>
 
                     <div
@@ -1261,6 +1193,7 @@
                           >mg</span
                         >
                       </div>
+                      
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：
                         <div
@@ -1746,7 +1679,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402">
+                <tr >
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1919,150 +1852,6 @@
                   </td>
                 </tr>
 
-                 <tr v-if="org_id == 10402">
-                  <td style="padding: 0; position: relative" colspan="2">
-                    <table class="inside_table">
-                      <tbody>
-                        <tr style="line-height: 35px; padding: 8px 5px">
-                          <td
-                            colspan="7"
-                            style="
-                              letter-spacing: 5px;
-                              text-align: center;
-                              font-weight: 520;
-                              font-size: 16px;
-                              padding: 6px 8px;
-                              line-height: 30px;
-                            "
-                          >
-                            医嘱内容
-                          </td>
-                        </tr>
-                        <!-- <tr style="line-height:35px;padding:8px 5px;">
-                                            <td colspan="4" style="font-size: 16px">开医嘱</td>
-                                            <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                            </tr> -->
-                        <tr style="line-height: 35px; padding: 8px 5px">
-                          <td style="font-size: 16px" width="10%">时间</td>
-                          <td style="font-size: 16px" colspan="2" width="45%">
-                            医嘱内容
-                          </td>
-                          <td style="font-size: 16px" width="10%">医生签名</td>
-                          <td style="font-size: 16px" width="10%">时间</td>
-                          <td style="font-size: 16px" width="10%">
-                            执行人签名
-                          </td>
-
-                        </tr>
-                        <!-- <template v-for="group in doctor_advices" > -->
-
-                        <template v-if="record.advices">
-                          <tr
-                            v-for="(advice, advice_index) in record.his_advices"
-                            :key="advice_index"
-                          >
-                            <td height="35px">
-                              <span v-if="advice.start_time">
-                                {{ getTime(advice.start_time, "{h}:{i}") }}
-                              </span>
-                            </td>
-
-                            <td
-                              height="35px"
-                              colspan="2"
-                              class="advice-name"
-                              style="padding-left: 7px"
-                            >
-                              <span v-if="advice.parent_id > 0">---></span>
-                              <span>{{ advice.advice_name }}</span>
-
-                              <span
-                               v-if="advice && advice.advice_desc"
-                              >
-                                ({{ advice.advice_desc
-                                }}{{ advice.drug_spec_unit }} )
-                              </span>
-
-                              <span v-if="advice.prescribing_number"
-                                >&nbsp;&nbsp; {{ advice.prescribing_number
-                                }}{{ advice.prescribing_number_unit }}</span
-                              >
-                              <span v-if="advice.single_dose != 0">
-                                {{ advice.single_dose
-                                }}{{ advice.single_dose_unit }}</span
-                              >
-
-                              <span v-if="advice.parent_id == 0">{{
-                                advice.delivery_way
-                              }}</span>
-                              <span v-if="advice.parent_id == 0">{{
-                                advice.execution_frequency
-                              }}</span>
-                              <span
-                                v-if="
-                                  advice.parent_id == 0 &&
-                                  advice.remark.length > 0
-                                "
-                                >({{ advice.remark }})</span
-                              >
-                            </td>
-
-                            <td height="35px">
-                              <span
-                                v-if="
-                                  setAdminUserES(advice, 'advice_doctor') ==
-                                  ''
-                                "
-                                >{{
-                                  getAdminUser(advice, "advice_doctor")
-                                }}</span
-                              >
-                              <img
-                                class="es-img"
-                                :src="
-                                  setAdminUserES(advice, 'advice_doctor')
-                                "
-                                alt=""
-                                srcset=""
-                                v-else
-                                style="height: 40px"
-                              />
-                            </td>
-                            <td height="35px">
-                              <span v-if="advice.execution_time">{{
-                                getTime(advice.execution_time, " {h}:{i}")
-                              }}</span>
-                            </td>
-                            <td height="35px">
-                              <span
-                                v-if="
-                                  setAdminUserES(
-                                    advice,
-                                    'execution_staff'
-                                  ) == ''
-                                "
-                                >{{
-                                  getAdminUser(advice, "execution_staff")
-                                }}</span
-                              >
-                              <img
-                                class="es-img"
-                                :src="
-                                  setAdminUserES(advice, 'execution_staff')
-                                "
-                                alt=""
-                                srcset=""
-                                v-else
-                                style="height: 40px"
-                              />
-                            </td>
-                           
-                          </tr>
-                        </template>
-                      </tbody>
-                    </table>
-                  </td>
-                </tr>
               </tbody>
             </table>
           </div>
@@ -2113,6 +1902,7 @@
               <div class="inline_block" style="margin-left: 10px">
                 年龄：
                 <div class="under_line" style="width: 30px; text-align: center">
+                  <!-- {{ record.patient.age }} -->
                   {{ getAge(record.patient) }}
                 </div>
                 岁
@@ -2126,25 +1916,25 @@
               <div class="inline_block" v-if="record.receive_assessment.condition!=1">
                 门特：
                 <div class="under_line" style="width: 30px; text-align: center">
-                  <check-box :checked="record.patient.source == 1"></check-box>
+                  <check-box :checked="record.patient.source == 3"></check-box>
                 </div>
               </div>
               <div class="inline_block" v-if="record.receive_assessment.condition==1">
                 住院：
                 <div class="under_line" style="width: 30px; text-align: center">
-                  <check-box :checked="record.patient.source == 1"></check-box>
+                  <check-box :checked="record.patient.source == 2"></check-box>
                 </div>
               </div>
-              <div class="inline_block">
+              <div class="inline_block" v-if="org_id!=10510">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_zone.name}}
                 </div>
               </div>
-              <div class="inline_block" v-if="org_id!=10460">
+              <div class="inline_block" v-if="org_id!=10510 && org_id!=10460">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_number.number }}
                 </div>
               </div>
               <div class="inline_block">
@@ -2158,18 +1948,56 @@
                 <div
                   class="under_line"
                   style="width: 70px; text-align: left"
-                  v-if="record.patient.admission_number"
+                  v-if="record.receive_assessment.admission_number"
                 >
-                  {{ record.patient.admission_number }}
+                  {{ record.receive_assessment.admission_number }}
                 </div>
                 <div
                   class="under_line"
-                  style="width: 70px; text-align: left"
+                  style="width: 70px; text-align: le ft"
                   v-else
                 >
                   {{ "/" }}
                 </div>
               </div>
+              <div class="inline_block" style="flex: 1">
+                本次透析日期：
+                <div
+                  class="under_line"
+                  style="width: 120px; text-align: center"
+                >
+                  {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
+                </div>
+              </div>
+              <div class="inline_block" style="flex: 1">
+                透析次数：
+                <div
+                  class="under_line"
+                  style="width: 70px; text-align: center"
+                >
+                  {{
+                    record.patient.total_dialysis +
+                    record.patient.user_sys_before_count
+                      ? record.patient.total_dialysis +
+                        record.patient.user_sys_before_count
+                      : "/"
+                  }}
+                </div>
+
+                <div
+                  v-if="org_id ==10234 || org_id ==10121"
+                  class="under_line"
+                  style="width: 70px; text-align: center"
+                >
+                  {{
+                      record.Count +
+                      record.patient.user_sys_before_count
+                        ?  record.Count +
+                          record.patient.user_sys_before_count
+                        : "/"
+                    }}
+                </div>
+              </div>
             </div>
             
             <div class="row">
@@ -2734,37 +2562,7 @@
                   
                     </div>
 
-                    <div
-                      class="row"
-                      style="padding: 2px 0; line-height: 23px; display: flex"
-                      v-if="org_id == 0 || org_id ==10375"
-                    >
-                      <div
-                        class="inline_block"
-                        style="flex: 1; display: inline-block"
-                      >
-                        宣教知识：
-                        <div
-                          class="under_line"
-                          style="
-                            width: 840px;
-                            line-height: 25px;
-                            text-align: left;
-                            margin-left: 2px;
-                            display: inline-block;
-                            white-space: normal;
-                          "
-                        >
-                          {{
-                            record.summer && record.summer.mission
-                              ? record.summer.mission
-                              : "/"
-                          }}
-                        </div>
-                      </div>
-
-                  
-                    </div>
+                   
                   </td>
                 </tr>
                 <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -127,6 +127,30 @@
               {{ "/" }}
             </div>
           </div>
+          <div class="inline_block" style="flex: 1">
+            本次透析日期：
+            <div
+              class="under_line"
+              style="width: 100px; text-align: center"
+            >
+              {{ xtdate }}
+            </div>
+          </div>
+          <div class="inline_block" style="flex: 1">
+            透析次数：
+            <div
+              class="under_line"
+              style="width: 70px; text-align: center"
+            >
+              {{
+                patientInfo.total_dialysis +
+                patientInfo.user_sys_before_count
+                  ? patientInfo.total_dialysis +
+                    patientInfo.user_sys_before_count
+                  : "/"
+              }}
+            </div>
+          </div>
         </div>
         <div class="row">
           <div class="inline_block">
@@ -212,7 +236,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <!-- <div class="inline_block" style="flex: 1">
                       本次透析日期：
                       <div
                         class="under_line"
@@ -235,20 +259,8 @@
                             : "/"
                         }}
                       </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      透前症状：
-                      <div
-                        class="under_line"
-                        style="width: 150px; text-align: center"
-                      >
-                        {{
-                          predialysis.symptom_before_dialysis
-                            ? predialysis.symptom_before_dialysis
-                            : "/"
-                        }}
-                      </div>
-                    </div>
+                    </div> -->
+                   
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px">
@@ -823,7 +835,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
+                    <div class="inline_block" style="flex: 1">
                       透析(滤)器：
                       <!--  透析(滤)器分开取值 -->
                       <div v-if="org_id!=10414"
@@ -856,7 +868,7 @@
 
                     </div>
 
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
+                    <div class="inline_block" style="flex: 1" >
                       灌流器：
                       <div
                         class="under_line"
@@ -870,82 +882,19 @@
                       </div>
                     </div>
 
-                     <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
-                      衣物重：
+                    <div class="inline_block" style="flex: 1">
+                      透前症状：
                       <div
                         class="under_line"
-                        style="width: 70px; text-align: center"
+                        style="width: 150px; text-align: center"
                       >
                         {{
-                          predialysis.additional_weight
-                            ? predialysis.additional_weight
+                          predialysis.symptom_before_dialysis
+                            ? predialysis.symptom_before_dialysis
                             : "/"
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id==10290">
-                      透析器/灌流器：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        {{
-                          prescription.dialyzer_perfusion_apparatus
-                            ? prescription.dialyzer_perfusion_apparatus
-                            : ""
-                        }}
-                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
-                        {{
-                          prescription.dialysis_dialyszers
-                            ? prescription.dialysis_dialyszers
-                            : ""
-                        }}
-                      </div>
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                      v-if="org_id == 9538"
-                    >
-                      血浆分离器：
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        <span
-                          v-if="
-                            prescription.plasma_separator
-                              ? prescription.plasma_separator != 0 &&
-                                prescription.plasma_separator != '0'
-                              : false
-                          "
-                          >{{ prescription.plasma_separator }}</span
-                        >
-                        <span v-else>/</span>
-                      </div>
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                      v-if="org_id == 9538"
-                    >
-                      胆红素吸附柱：
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        <span
-                          v-if="
-                            prescription.bilirubin_adsorption_column
-                              ? prescription.bilirubin_adsorption_column != 0 &&
-                                prescription.bilirubin_adsorption_column != '0'
-                              : false
-                          "
-                          >{{ prescription.bilirubin_adsorption_column }}</span
-                        >
-                        <span v-else>/</span>
-                      </div>
-                    </div>
                   </div>
 
                   <div
@@ -1263,140 +1212,56 @@
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
-                      透析机号：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          dialysisOrder &&
-                          dialysisOrder.DeviceNumber &&
-                          dialysisOrder.DeviceNumber.number.length > 0
-                            ? dialysisOrder.DeviceNumber.number
-                            : patientInfo.DialysisSchedule.device_number.number
-                        }}
-                      </div>
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 20px"
-                    >
-                      透析机型：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                       {{predialysis.machine_type ? predialysis.machine_type : ""}}
-                      </div>
-                    
-                    </div>
-                  </div>
-
-
-                  <div class="row" style="padding: 2px 0; line-height: 23px">
-                    <div
-                      class="inline_block"
-                      style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5"
-                    >
-                      置换速度：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          prescription.displace_speed
-                            ? prescription.displace_speed
-                            : ""
-                        }}
-                      </div>
-                      <span>ml/h</span>
-                   
-                  
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5"
-                    >
-                    透析液流速：
+                      Ns冲洗量：
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{
-                          prescription.dialysis_fluid_flow
-                            ? prescription.dialysis_fluid_flow
-                            : ""
-                        }}
+                        {{prescription.warsh_count?prescription.warsh_count:""}}
                       </div>
-                      <span>ml/h</span>
-                   
-                  
+                      <span>ml</span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
-                      碳酸氢钠流速：
+                      q：
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
                         {{
-                          prescription.sodium_bicarbonate_flow
-                            ? prescription.sodium_bicarbonate_flow
+                          prescription.washing_time
+                            ? prescription.washing_time
                             : ""
                         }}
                       </div>
-                      <span>ml/h</span>
-                    </div>
-                    <div class="inline_block" style="margin-left: 20px">
-                      Ns冲洗量：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{prescription.warsh_count?prescription.warsh_count:""}}
-                      </div>
-                      <span>ml</span>
+                      <span>h</span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
-                      q：
+                      透析机号：
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
                         {{
-                          prescription.washing_time
-                            ? prescription.washing_time
-                            : ""
+                          dialysisOrder &&
+                          dialysisOrder.DeviceNumber &&
+                          dialysisOrder.DeviceNumber.number.length > 0
+                            ? dialysisOrder.DeviceNumber.number
+                            : patientInfo.DialysisSchedule.device_number.number
                         }}
                       </div>
-                      <span>h</span>
                     </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id != 10223"
-                  >
                     <div
                       class="inline_block"
-                      style="flex: 1; display: inline-block"
-                      v-if="org_id!=9675 && org_id!=10447"
+                      style="margin-left: 20px"
                     >
-                      备注：
+                      透析机型：
                       <div
                         class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
+                        style="width: 50px; text-align: center"
                       >
-                        {{ predialysis.remark ? predialysis.remark : "/" }}
+                       {{predialysis.machine_type ? predialysis.machine_type : ""}}
                       </div>
+                    
                     </div>
                   </div>
                 </td>
@@ -1908,7 +1773,7 @@
             <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
               门特：
               <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="patientInfo_source_1"></check-box>
+                <check-box :checked="patientInfo_source_3"></check-box>
               </div>
             </div>
             <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
@@ -1917,29 +1782,29 @@
                 <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
               </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510">
+            <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447 || org_id == 0 || org_id ==10460">{{
-                patientInfo.DialysisSchedule.device_zone.name
-                  ? patientInfo.DialysisSchedule.device_zone.name
-                  : ""
-              }}</span>
-              <span v-else>{{ "/" }}</span>
-            </div>
+                <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
+                  patientInfo.DialysisSchedule.device_zone.name
+                    ? patientInfo.DialysisSchedule.device_zone.name
+                    : ""
+                }}</span>
+                <span v-else>{{ "/" }}</span>
+              </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460" >
+            <div class="inline_block" v-if="org_id!=10460">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460">{{
-                dialysisOrder &&
-                dialysisOrder.DeviceNumber &&
-                dialysisOrder.DeviceNumber.number.length > 0
-                  ? dialysisOrder.DeviceNumber.number
-                  : patientInfo.DialysisSchedule.device_number.number
-              }}</span>
-              <span v-else>{{ "/" }}</span>
-            </div>
+                <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
+                  dialysisOrder &&
+                  dialysisOrder.DeviceNumber &&
+                  dialysisOrder.DeviceNumber.number.length > 0
+                    ? dialysisOrder.DeviceNumber.number
+                    : patientInfo.DialysisSchedule.device_number.number
+                }}</span>
+                <span v-else>{{ "/" }}</span>
+              </div>
             </div>
             <div class="inline_block">
               透析号：
@@ -1947,24 +1812,42 @@
                 {{ patientInfo.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px"
-            v-if="org_id!=9675 && org_id!=10447 && org_id!=10460">
-            住院号/门诊号：
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-if="receiverTreatmentAccess.admission_number"
-            >
-             {{ receiverTreatmentAccess.admission_number }}
+            <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447&&org_id!=10460">
+              住院号/门诊号：
+              <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
+                {{ receiverTreatmentAccess.admission_number }}
+              </div>
+              <div class="under_line" style="width: 70px;text-align: left" v-else-if="patientInfo.admission_number">
+                {{ patientInfo.admission_number }}
+              </div>
+              <div class="under_line" style="width: 70px;text-align: left" v-else>
+                {{ "/" }}
+              </div>
             </div>
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-else
-            >
-              {{ "/" }}
+            <div class="inline_block" style="flex: 1">
+              本次透析日期：
+              <div
+                class="under_line"
+                style="width: 100px; text-align: center"
+              >
+                {{ xtdate }}
+              </div>
+            </div>
+            <div class="inline_block" style="flex: 1">
+              透析次数：
+              <div
+                class="under_line"
+                style="width: 70px; text-align: center"
+              >
+                {{
+                  patientInfo.total_dialysis +
+                  patientInfo.user_sys_before_count
+                    ? patientInfo.total_dialysis +
+                      patientInfo.user_sys_before_count
+                    : "/"
+                }}
+              </div>
             </div>
-          </div>
           </div>
           <div class="row" style="margin-bottom: 10px">
             <div class="inline_block">
@@ -2433,110 +2316,6 @@
                       <span v-if="org_id ==9675||org_id==10447">L</span>
                     </div>
                   </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 10223"
-                  >
-                    <div class="inline_block" style="flex: 1">
-                      动脉管道：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.arterial_tube == 0">/</span>
-                        <span v-if="afterdialysis.arterial_tube == 1"
-                          >动脉管道0</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 2"
-                          >动脉管道+</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 3"
-                          >动脉管道++</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 4"
-                          >动脉管道+++</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      静脉管道：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.intravenous_tube == 0"
-                          >/</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 1"
-                          >静脉管道0</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 2"
-                          >静脉管道+</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 3"
-                          >静脉管道++</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 4"
-                          >静脉管道+++</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      并发症：
-                      <div
-                        class="under_line"
-                        style="width: 170px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.complication
-                            ? afterdialysis.complication
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 10223"
-                  >
-                    <div class="inline_block" style="flex: 1">
-                      穿刺处血肿：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 0"
-                          >/</span
-                        >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 1"
-                          >有</span
-                        >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 2"
-                          >无</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      中心静脉封管(肝素-A端):
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{ afterdialysis.cvc_a ? afterdialysis.cvc_a : "/" }}
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      中心静脉封管(肝素-V端):
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
-                      </div>
-                    </div>
-                  </div>
 
                   <div
                     class="row"
@@ -2618,98 +2397,6 @@
                       </div>
                     </div>
                   </div>
-                  <div
-                    v-if="org_id!=10460"
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      宣教知识：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{
-                          summary.mission
-                            ? summary.mission
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id != 10223&&org_id!=9538&&org_id!=9675"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                      v-if="org_id!=9675 && org_id!=10447"
-                    >
-                      备注：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.remark ? afterdialysis.remark : "/" }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 9538||org_id == 9675 || org_id == 0"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      中心静脉导管封管：A端<div
-                        class="under_line"
-                        style="
-                          width: 60px;
-                          line-height: 25px;
-                          text-align: center;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.cvc_a ? afterdialysis.cvc_a : "/" }}
-                      </div>ml,V端<div
-                        class="under_line"
-                        style="
-                          width: 60px;
-                          line-height: 25px;
-                          text-align: center;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
-                      </div>ml
-                      
-                    </div>
-                  </div>
                 </td>
               </tr>
               <tr>
@@ -2718,8 +2405,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                   <div v-if="org_id == 0 || org_id == 10440">
-    
+                   <!-- <div>
                     <div class="inline_block" style="flex: 1">
                       上机护士：
                       <div
@@ -2759,10 +2445,8 @@
                         />
                       </div>
                     </div>
-                  
-                  
-                  </div>
-                  <div v-if="org_id!=0 && org_id!=10440">
+                  </div> -->
+                  <div>
                     <div class="inline_block" style="flex: 1">
                       穿刺护士：
                       <div
@@ -2804,11 +2488,11 @@
                     </div>
                   </div>
                    
-                  <div v-if="org_id==0||org_id==10440">
+                  <!-- <div v-if="org_id==0||org_id==10440">
                     
                     <div class="inline_block" style="flex: 1">                 
                      <div>
-                      <span>责任护士：</span> 
+                      责任护士： 
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
@@ -2851,9 +2535,9 @@
 
                     </div>
 
-                  </div>
+                  </div> -->
 
-                  <div v-if="org_id!=0&&org_id!=10440">
+                  <div>
                     <div class="inline_block" style="flex: 1">
                       <span v-if="org_id==10414">责任护士：</span> 
                       <span v-else>治疗护士：</span> 
@@ -3098,7 +2782,7 @@
           <!-- <div  class="print-yema">1</div> -->
         </div>
         <!-- 患者签名 -->
-        <div style="position: relative; left: 70%;top: 30px;">
+        <div style="position: relative; left: 70%;top: 50px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
             <img

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,11 +10,11 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 "><!---->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id !=0" >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
             <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -33,7 +33,7 @@
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 0">
+    <div class="app-container" style="" v-if="org_id == 10217 ">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -103,8 +103,8 @@
                       <td class="start">自理能力</td>
                       <td>
                         <div class="jiange">
-                          <span v-for="item in zilinl" class="rightjiange">
-                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                          <span v-for="item in zilinl" class="rightjiange" @change="handleCheckedCitiesChange">
+                            <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
                           </span>
                         </div>
                         
@@ -143,7 +143,7 @@
                 <div>
                   <span>评估日期：</span>
                   <el-date-picker
-                    v-model="value1"
+                    v-model="pingdate"
                     type="date"
                     placeholder="选择日期"
                     :clearable="false"
@@ -152,7 +152,7 @@
                 </div>
                 <div>
                   <span>护士：</span>
-                  <el-select v-model="value" placeholder="请选择" >
+                  <el-select v-model="Nurse" placeholder="请选择" >
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -409,13 +409,13 @@
     data() {
       return {
         patient_id:0,
-        value1:'',
-        value:'',
+        pingdate:'',
+        Nurse:'',
         input:'',
         tumble_Totalpoints:0,
         options:[],
         checkList:[],
-        nianlin:['≥65岁（1分）','<65（1分）'],
+        nianlin:['≥65岁（1分）','<65（0分）'],
         jiwnag:['有跌倒史（2分）','有坠床史（2分）','晕厥（2分）','低血压（2分）'],
         yishizt:['烦躁（4分）','谵妄（3分）','嗜睡（2分）','模糊（2分）','痴呆（2分）','昏迷（1分）'],
         ganguan:['头晕（4分）','视觉障碍（2分）','听力障碍（2分）'],

src/xt_pages/workforce/components/editTableData.vue

@@ -160,7 +160,7 @@
               min-width="60"
               align="center"
               fixed
-              
+
           ></el-table-column>
           <el-table-column
               prop="cut"
@@ -168,7 +168,7 @@
               min-width="50"
               align="center"
               fixed
-              
+
           ></el-table-column>
           <el-table-column
               :label="'周一 (' + weekTitle[0] + ')'"
@@ -1345,7 +1345,7 @@
           </el-option>
         </el-select>
 
-       
+
       </div>
       <span slot="footer" class="dialog-footer" style="text-align: center">
         <el-button
@@ -1385,7 +1385,7 @@
           <el-form-item label="" prop="mode_id">
             <span>透析模式:</span>
             <el-select
-               filterable 
+               filterable
                 v-model="changeSchedule.mode_id"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1400,11 +1400,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-          
+
           <!-- <el-form-item>
             <span>透析班次:</span>
             <el-select
-                filterable 
+                filterable
                 v-model="changeSchedule.schedule_type"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1419,11 +1419,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-        
+
           <el-form-item>
             <span>透析分区:</span>
             <el-select
-            filterable 
+            filterable
               v-model="changeSchedule.partition_id"
               placeholder="请选择"
               style="width: 100%"
@@ -1442,7 +1442,7 @@
           <el-form-item>
             <span>透析床位:</span>
             <el-select
-               filterable 
+               filterable
                 v-model="changeSchedule.bed_id"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1753,7 +1753,7 @@
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
       </span>
     </el-dialog>
-    
+
   </div>
 </template>
 
@@ -3141,7 +3141,7 @@ export default {
       }else{
         this.cur_info.contagions = []
       }
-     
+
       this.patient_id_hover = row.id
     },
     // 选择透析模式
@@ -3238,6 +3238,7 @@ export default {
               id : row[key].schedule_id,
               contagions: row[key].patient_contagions,
             }
+            console.log('4444444',row[key].schedule_id);
           }else{
             this.cur_drag_obj = 3
             this.cur_drag_info={
@@ -3331,12 +3332,14 @@ export default {
           this.$message.error(response.data.msg);
           this.tipDialogVisibleTwo = false
         } else {
+          console.log('11111111111',response.data);
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
           this.getSchedules();
         }
       });
+
     },
     // 交换位置
     changeSchTwo(){
@@ -3352,6 +3355,7 @@ export default {
             this.$message.error(response.data.msg);
             this.tipDialogVisibleThree = false
           } else {
+            console.log('22222222',response.data);
             this.$message.success("交换成功");
             this.tipDialogVisible = false
             this.tipDialogVisibleThree = false
@@ -3382,6 +3386,7 @@ export default {
             id : row[key].schedule_id,
             partition_type : row.zone_type,
           }
+          console.log('ffffffffffff',this.currentData);
           // let nowDate = new Date();
           // let date = {
           //       year: nowDate.getFullYear(),
@@ -3391,8 +3396,8 @@ export default {
           //   let Month=date.month<10 ? '0'+ date.month :  date.month
           //   let Dateday= date.date<10 ? '0'+date.date : date.date
           //   this.systemDate = date.year + '-'+ Month + '-'+ Dateday;
-          // console.log('this.currentData的数据',this.currentData);
-          // console.log('this.cur_drag_info的数据',this.cur_drag_info);
+          console.log('this.currentData的数据',row[key].patient_id);
+          console.log('this.cur_drag_info的数据',key);
           // console.log('123453545',this.systemDate);
           // 当表格有数据
           if ( row[key].mode_id > 0 || row[key].patient_id > 0) {
@@ -3421,9 +3426,9 @@ export default {
                       that.currentData.patient_id = that.cur_drag_info.patient_id
                       that.currentData.patient = that.cur_drag_info.patient_name
                        that.currentData.contagions = that.cur_drag_info.contagions
-                        console.log("中国hshshshshhs",that.cur_drag_info.contagions)
+                        console.log("中国hshshshshhs",that.cur_drag_info.id)
+
 
-                      
                         that.setScheduleTwo(this.cur_drag_info.id);
                 }
               }else{ // 非同一天
@@ -3450,7 +3455,7 @@ export default {
         }
       }
     },
-    
+
     // 左边栏选中名字和模式拖动结束后
     taskDraggerEnd(e) {},
     //move回调方法
@@ -3765,8 +3770,8 @@ export default {
         //
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
-      // if(columnIndex==1 ){  
-      //   return 'border_bott ' 
+      // if(columnIndex==1 ){
+      //   return 'border_bott '
       // }
       // if(columnIndex==0){
       //   return 'border_left'
@@ -3795,7 +3800,7 @@ export default {
                 row[column.property].patient_id == this.patient_id_hover
             ) {
               return "hover-td schedule-table-cell-disable";
-            } 
+            }
             // if(column.label == '晚'){
             //   return 'evening_border schedule-table-cell-disable'
             // }
@@ -3839,7 +3844,7 @@ export default {
     //       // console.log('33333333333');
     //       return 'border-top: 1px solid aqua;'
     //     }
-    //   } 
+    //   }
     // },
     // 单元格的患者名称的回调方法
     patientClass({row,column, rowIndex,columnIndex}){
@@ -4573,14 +4578,12 @@ export default {
         this.currentData.contagions = row.contagions;
       }
     },
-    // 取消关闭弹窗
-    // closePatientPanel() {
-    //   this.dialogTableVisible = false;
-    //   this.currentData.patient_id = 0;
-    // },
+
     getSchedules() {
       var partionStr = this.partition_id;
+      console.log('66665555',partionStr);
       var arr = this.zoneIdList.join(",");
+      console.log('ccccccc',this.zoneIdList);
       var str = "";
       if (partionStr == 0) {
         str = arr;
@@ -4588,6 +4591,7 @@ export default {
       if (partionStr != 0) {
         str = partionStr.join(",");
       }
+      console.log('qqqqqqq',str);
       const params = {
         weekTime: this.theType,
         patitionid: str,
@@ -4597,7 +4601,7 @@ export default {
       getSchedulesOne(params).then((response) => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
-
+          console.log('999990000',response.data.data);
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
@@ -5138,7 +5142,7 @@ export default {
               });
               // this.msDialogVisible = false;
               // this.getAllZones()
-             
+
             }
             this.changing_mode = false;
           }).catch((err) => {
@@ -5402,7 +5406,7 @@ export default {
         default:
           break;
       }
-    },    
+    },
     setScheduleTwo(id_two) {
       console.log("1112222222",this.currentData.contagions.length)
       var that = this;
@@ -5509,7 +5513,7 @@ export default {
             cflag = true;
           }
         });
-      
+
         if (!cflag) {
           this.$confirm(
               "此患者有传染病，与此透析机不匹配，确定在此排班吗?",
@@ -5533,7 +5537,7 @@ export default {
         } else {
           this.CreateSchedule(this.currentData.patient_id, this.currentData);
         }
-        
+
       } else if (that.currentData.partition_type > 1) {
         this.$confirm(
             "此患者没有传染病，与此透析机不匹配，确定在此排班吗?",
@@ -5546,7 +5550,7 @@ export default {
         )
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
-              
+
             })
             .catch(() => {
               this.dialogTableVisible=false
@@ -5897,7 +5901,7 @@ export default {
     this.partitions = this.partitionsProp;
 
     var contagions = this.$store.getters.contagions;
- 
+
     if (contagions.length > 0) {
       var that = this;
       contagions.forEach(function (citem) {
@@ -6070,7 +6074,7 @@ textarea{
 .border_left{
   border-left: 1px solid aqua !important;
 }
- 
+
 .evening_border{
   border-right: 1px solid aqua !important;
 }