clinic-v2
/
web
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
478 Commits 1 Branch 0 Tags 5.8 MiB
Commit Graph

316 Commits

Author SHA1 Message Date
LiJianZhao 4ab0ccbf17 dev 2025-05-17 13:17:11 +08:00
LiJianZhao 0599b5c62d dev 2025-05-17 13:15:02 +08:00
LiJianZhao 433aa048b6 dev 2025-05-17 13:10:40 +08:00
LiJianZhao 73d2554c98 dev 2025-05-17 12:58:00 +08:00
LiJianZhao b978006a69 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-17 11:40:45 +08:00
LiJianZhao f984aeb49e dev 2025-05-17 11:40:36 +08:00
ChenQiuYu 410d691fd7 dev 2025-05-17 10:53:19 +08:00
ChenQiuYu 230f32c508 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-17 10:29:14 +08:00
ChenQiuYu 54f61f0d86 dev 2025-05-17 10:29:01 +08:00
牛子源 970f012d69 dev 2025-05-17 09:36:59 +08:00
LiJianZhao 6819587701 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-16 17:15:15 +08:00
LiJianZhao 198cc88afd dev 2025-05-16 17:15:07 +08:00
ChenQiuYu 9121d98200 dev 2025-05-16 16:43:05 +08:00
ChenQiuYu 6af545669a Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-16 16:23:45 +08:00
ChenQiuYu 31ea8a4fac dev 2025-05-16 16:23:18 +08:00
LiJianZhao 55d78a50a9 dev 2025-05-16 16:18:36 +08:00
ChenQiuYu 8ee0dd89d7 dev 2025-05-16 15:04:58 +08:00
LiJianZhao 5a346e1b2d Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-16 14:24:15 +08:00
LiJianZhao ededbacb4b dev 2025-05-16 14:24:07 +08:00
ChenQiuYu 0676ad3d3e Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-16 14:14:43 +08:00
ChenQiuYu 38243fda48 dev 2025-05-16 14:14:34 +08:00
LiJianZhao f3a089dbfe dev 2025-05-16 13:21:34 +08:00
LiJianZhao fc7e7ee768 dev 2025-05-16 12:09:03 +08:00
ChenQiuYu 05a38825f9 dev 2025-05-16 11:00:04 +08:00
ChenQiuYu 63f1e1f64e Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/components/inventory/purchase/AddOrder.vue
 2025-05-16 09:33:04 +08:00
ChenQiuYu 5c01c7a88f dev 2025-05-16 09:31:42 +08:00
LiJianZhao b849738d4e dev 2025-05-15 17:00:19 +08:00
LiJianZhao 15d62eaa32 dev 2025-05-15 16:11:58 +08:00
LiJianZhao 3fb54390ef dev 2025-05-15 15:07:31 +08:00
LiJianZhao fe8d7fda28 dev 2025-05-15 14:53:52 +08:00
LiJianZhao 3ea97ef532 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-15 13:20:53 +08:00
LiJianZhao e6c320539c dev 2025-05-15 13:20:43 +08:00
ChenQiuYu ba7af95399 dev 2025-05-15 13:06:28 +08:00
ChenQiuYu dce3fb558d Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-15 12:00:50 +08:00
ChenQiuYu 8277e8d784 dev 2025-05-15 12:00:37 +08:00
LiJianZhao 5ccb88f4fc Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-15 11:29:34 +08:00
LiJianZhao c332008877 dev 2025-05-15 11:29:28 +08:00
ChenQiuYu e7c7a50392 dev 2025-05-15 11:28:40 +08:00
ChenQiuYu 3329690de8 dev 2025-05-15 10:41:09 +08:00
ChenQiuYu 1936df69b7 dev 2025-05-15 10:23:28 +08:00
LiJianZhao 0c2957ce04 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-15 10:23:03 +08:00
LiJianZhao 96d6c104b9 dev 2025-05-15 10:22:53 +08:00
ChenQiuYu acb47d04ce dev 2025-05-15 09:33:00 +08:00
ChenQiuYu 2814cc4da7 dev 2025-05-14 17:03:47 +08:00
ChenQiuYu eec5c6d258 dev 2025-05-14 16:46:07 +08:00
牛子源 3340e5f3fd Merge remote-tracking branch 'origin/main' 2025-05-14 16:31:44 +08:00
牛子源 a69f1c39a6 dev 2025-05-14 16:31:37 +08:00
ChenQiuYu 966c0ae05b dev 2025-05-14 16:30:03 +08:00
ChenQiuYu a09446e907 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/views/inventory/inventory.vue
 2025-05-14 15:37:00 +08:00
ChenQiuYu 759b2befcc dev 2025-05-14 15:34:27 +08:00
LiJianZhao 25089742d5 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-14 15:34:08 +08:00
LiJianZhao 50375899e2 dev 2025-05-14 15:33:59 +08:00
ChenQiuYu eca9201949 dev 2025-05-14 14:31:21 +08:00
ChenQiuYu 5445d67d33 dev 2025-05-14 13:55:41 +08:00
ChenQiuYu bf0dfcea3b Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/views/inventory/goods.vue
 2025-05-14 13:21:00 +08:00
ChenQiuYu a6adfb6300 dev 2025-05-14 13:18:13 +08:00
牛子源 87c79ea0fc Merge remote-tracking branch 'origin/main' 2025-05-14 13:17:20 +08:00
牛子源 c9d1e4fd28 dev 2025-05-14 13:17:13 +08:00
LiJianZhao 188f98c590 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-14 12:04:44 +08:00
LiJianZhao 6646386ceb dev 2025-05-14 12:04:35 +08:00
ChenQiuYu 2bc30d1833 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-14 11:11:31 +08:00
ChenQiuYu a1e86fcf7b dev 2025-05-14 11:11:20 +08:00
LiJianZhao 8f4576f503 dev 2025-05-14 10:27:28 +08:00
LiJianZhao ed0a67507f dev 2025-05-13 17:04:03 +08:00
ChenQiuYu c5cdd9af01 dev 2025-05-13 15:31:13 +08:00
ChenQiuYu cbcec95d0c Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-13 14:23:31 +08:00
ChenQiuYu 984bd4a60c dev 2025-05-13 14:23:17 +08:00
LiJianZhao a296b3330e dev 2025-05-13 14:23:12 +08:00
LiJianZhao 842b0e7624 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-13 12:09:29 +08:00
LiJianZhao a99c5e654b Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/views/charge/index.vue
 2025-05-13 11:32:42 +08:00
LiJianZhao 31473b7f44 dev 2025-05-13 11:31:26 +08:00
ChenQiuYu e899aaa2d3 dev 2025-05-13 11:31:07 +08:00
ChenQiuYu 78e9cef909 dev 2025-05-13 09:54:57 +08:00
ChenQiuYu dfa2b25f4f dev 2025-05-13 09:22:15 +08:00
ChenQiuYu 6b3e2385c9 dev 2025-05-13 09:21:22 +08:00
LiJianZhao 8e73cedda7 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/views/charge/index.vue
 2025-05-12 17:05:40 +08:00
LiJianZhao d7386a3936 dev 2025-05-12 17:03:29 +08:00
ChenQiuYu 23e6670277 dev 2025-05-12 17:02:50 +08:00
LiJianZhao 77b913e017 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-12 16:57:19 +08:00
LiJianZhao 7df8b4dbbe dev 2025-05-12 16:57:07 +08:00
ChenQiuYu 4638683b01 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/views/charge/index.vue
 2025-05-12 16:56:32 +08:00
ChenQiuYu 184ac04d2f dev 2025-05-12 16:55:00 +08:00
LiJianZhao d77b9c6a93 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-12 14:56:44 +08:00
LiJianZhao bf0940105e dev 2025-05-12 14:56:37 +08:00
ChenQiuYu bcf2c28319 dev 2025-05-12 14:47:30 +08:00
LiJianZhao 9f5f4d6d25 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/components/charge/TotalPrice.vue
#	src/views/charge/index.vue
 2025-05-12 13:33:39 +08:00
LiJianZhao 51c11beda3 dev 2025-05-12 13:31:12 +08:00
ChenQiuYu 6f8e68fa7a dev 2025-05-12 13:30:59 +08:00
ChenQiuYu 8b78c320b1 dev 2025-05-12 12:56:32 +08:00
ChenQiuYu 31700fcfaa dev 2025-05-09 16:50:36 +08:00
LiJianZhao ac01ae7507 dev 2025-05-09 16:23:13 +08:00
LiJianZhao 1eb7d76288 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-09 15:00:53 +08:00
LiJianZhao 8f3983e100 dev 2025-05-09 15:00:44 +08:00
ChenQiuYu c4e690f6ec Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/views/outpatient/index.vue
 2025-05-09 11:26:53 +08:00
ChenQiuYu 69d835a428 dev 2025-05-09 11:25:04 +08:00
LiJianZhao 366d67dab5 dev 2025-05-09 11:21:52 +08:00
LiJianZhao deaac0bde3 dev 2025-05-09 09:48:03 +08:00
LiJianZhao 36f2b13a82 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 16:53:05 +08:00
LiJianZhao c92a7bba32 dev 2025-05-08 16:52:57 +08:00
ChenQiuYu 4b3c0a8912 dev 2025-05-08 16:52:45 +08:00
ChenQiuYu 1386dbaf3d dev 2025-05-08 16:49:32 +08:00
ChenQiuYu cc18ac3f52 dev 2025-05-08 15:51:16 +08:00
LiJianZhao 7afb585a14 dev 2025-05-08 15:32:22 +08:00
LiJianZhao 056428efce Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 15:17:42 +08:00
LiJianZhao d6474e2629 dev 2025-05-08 15:17:34 +08:00
ChenQiuYu 3cc94b2430 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 14:57:59 +08:00
ChenQiuYu c4c85fcd78 dev 2025-05-08 14:57:50 +08:00
LiJianZhao 1ea49774bb dev 2025-05-08 14:57:44 +08:00
LiJianZhao b5c4408ac8 dev 2025-05-08 13:19:49 +08:00
ChenQiuYu b6fecc55d6 dev 2025-05-08 12:52:08 +08:00
ChenQiuYu 00f1cc5c53 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 11:49:33 +08:00
ChenQiuYu 7c6c4f4531 dev 2025-05-08 11:49:23 +08:00
LiJianZhao 8d1da786ca Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/assets/config/apiConfig.ts
 2025-05-08 11:47:52 +08:00
LiJianZhao 1e1e2e21cf dev 2025-05-08 11:47:33 +08:00
ChenQiuYu 95ad3e16d2 dev 2025-05-08 09:19:49 +08:00
LiJianZhao 067499bb03 dev 2025-05-07 17:21:30 +08:00
ChenQiuYu 39eaabc902 dev 2025-05-07 16:43:46 +08:00
ChenQiuYu e53f73aab5 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-07 16:05:38 +08:00
ChenQiuYu 28ce5fb6df dev 2025-05-07 16:05:30 +08:00
LiJianZhao f303c58767 dev 2025-05-07 16:03:44 +08:00
ChenQiuYu a6c6f3fb64 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-07 15:31:31 +08:00
ChenQiuYu aa4c5fe72d dev 2025-05-07 15:31:20 +08:00
LiJianZhao 75d5734566 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-07 14:25:26 +08:00
LiJianZhao f4de43ac6a dev 2025-05-07 14:25:17 +08:00
ChenQiuYu a601da3426 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-07 14:15:27 +08:00
ChenQiuYu 1d472c090f dev 2025-05-07 14:15:17 +08:00
LiJianZhao ad012dfcab dev 2025-05-07 13:45:57 +08:00
ChenQiuYu 5c0c2e73bd Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-07 11:46:27 +08:00
ChenQiuYu af01d2d0ef dev 2025-05-07 11:46:17 +08:00
LiJianZhao 2b44eb8ce7 dev 2025-05-07 11:45:10 +08:00
LiJianZhao 42a123e58b dev 2025-05-06 16:43:50 +08:00
ChenQiuYu 72d91f981f Merge remote-tracking branch 'origin/main' 2025-05-06 14:53:00 +08:00
ChenQiuYu bffb3fcaa6 dev 2025-05-06 14:52:50 +08:00
LiJianZhao 3a8c371e9c Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-06 14:19:17 +08:00
LiJianZhao 596edf273f 历史病历修改 2025-05-06 14:19:08 +08:00
牛子源 af846cd274 dev 2025-05-06 13:26:33 +08:00
ChenQiuYu a961680501 dev 2025-05-06 12:02:29 +08:00
ChenQiuYu 521eea2445 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-30 17:01:07 +08:00
ChenQiuYu 6c41701881 dev 2025-04-30 17:00:56 +08:00
LiJianZhao 6a598389fc dev 2025-04-30 16:58:16 +08:00
LiJianZhao 5adbb2f037 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-30 16:00:58 +08:00
LiJianZhao 5b27bc5364 dev 2025-04-30 16:00:49 +08:00
ChenQiuYu b20616b20a dev 2025-04-30 15:10:05 +08:00
LiJianZhao 491ffeabd6 dev 2025-04-30 14:18:25 +08:00
LiJianZhao fe4770143c dev 2025-04-30 13:48:48 +08:00
ChenQiuYu b5b89e7fa1 dev 2025-04-30 11:55:52 +08:00
ChenQiuYu 32da952250 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-30 10:52:10 +08:00
ChenQiuYu ad0003ad7b dev 2025-04-30 10:52:02 +08:00
LiJianZhao 9ac4a9ab3e dev 2025-04-30 10:42:34 +08:00
LiJianZhao 799a858f72 dev 2025-04-30 10:42:13 +08:00