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

333 Commits

Author SHA1 Message Date
牛子源 6fd2c14396 Merge remote-tracking branch 'origin/main' 2025-05-14 14:29:55 +08:00
牛子源 b1160b4976 dev 2025-05-14 14:29:47 +08:00
ChenQiuYu ce0e355981 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-14 13:55:57 +08:00
ChenQiuYu 5445d67d33 dev 2025-05-14 13:55:41 +08:00
LiJianZhao baafcfd1e3 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-14 13:55:00 +08:00
LiJianZhao 05584a4fb4 dev 2025-05-14 13:54:52 +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 eeb3c909e3 dev 2025-05-14 11:42:42 +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 11b5197c29 dev 2025-05-13 17:07:17 +08:00
LiJianZhao ed0a67507f dev 2025-05-13 17:04:03 +08:00
LiJianZhao d3033c10a1 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-13 15:31:25 +08:00
LiJianZhao b552a68b07 dev 2025-05-13 15:31:16 +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
ChenQiuYu ce371abd82 dev 2025-05-13 12:08:04 +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
牛子源 1aabf6a82a Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-12 17:10:51 +08:00
牛子源 29e96a7a31 dev 2025-05-12 17:10:28 +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 035e715bda Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-12 17:03:01 +08:00
ChenQiuYu 23e6670277 dev 2025-05-12 17:02:50 +08:00
牛子源 7facb0adc2 Merge remote-tracking branch 'origin/main' 2025-05-12 17:01:38 +08:00
牛子源 2562377b7f dev 2025-05-12 17:01:30 +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 44e929cfda Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-12 13:38:36 +08:00
ChenQiuYu d9ed6c04c3 dev 2025-05-12 13:38:14 +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 99e7985ab9 dev 2025-05-09 16:53:05 +08:00
ChenQiuYu 31700fcfaa dev 2025-05-09 16:50:36 +08:00
LiJianZhao 503b33ba3b dev 2025-05-09 16:46:38 +08:00
LiJianZhao ac01ae7507 dev 2025-05-09 16:23:13 +08:00
LiJianZhao 2b15353bda Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-09 15:03:41 +08:00
ChenQiuYu de9996de14 dev 2025-05-09 15:02:52 +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 2fc45d13a3 dev 2025-05-09 12:02:58 +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 ed7f9dba4c Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-09 09:48:12 +08:00
LiJianZhao deaac0bde3 dev 2025-05-09 09:48:03 +08:00
ChenQiuYu 7dc1cd81b0 dev 2025-05-08 17:06:41 +08:00
ChenQiuYu 69f127aa25 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 16:57:17 +08:00
ChenQiuYu f65ccabe83 dev 2025-05-08 16:56:54 +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
ChenQiuYu b4c33c8583 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/components/common/goods/GoodsDetail.vue
 2025-05-08 15:33:27 +08:00
LiJianZhao 62b0a3e246 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 15:33:11 +08:00
ChenQiuYu 70d5eb5f72 dev 2025-05-08 15:32:40 +08:00
LiJianZhao 7afb585a14 dev 2025-05-08 15:32:22 +08:00
ChenQiuYu ae598d2287 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 15:20:36 +08:00
ChenQiuYu 19ba9ab94b dev 2025-05-08 15:20:27 +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
LiJianZhao 293a34114f Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 12:56:33 +08:00
LiJianZhao 02e6b54f49 dev 2025-05-08 12:56:25 +08:00
ChenQiuYu 37081fe3f4 Merge remote-tracking branch 'origin/main' 2025-05-08 12:52:16 +08:00
ChenQiuYu b6fecc55d6 dev 2025-05-08 12:52:08 +08:00
LiJianZhao ae284f92cc Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 11:50:30 +08:00
LiJianZhao b69849a3b7 dev 2025-05-08 11:50:20 +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 44a6a90e9f Merge remote-tracking branch 'origin/main' 2025-05-08 09:20:01 +08:00
ChenQiuYu 95ad3e16d2 dev 2025-05-08 09:19:49 +08:00
LiJianZhao 9340bfd9e3 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-08 09:19:42 +08:00
LiJianZhao 18daae22d2 dev 2025-05-08 09:19:35 +08:00
ChenQiuYu 04cd3b953c dev 2025-05-07 17:34:25 +08:00
ChenQiuYu e86b0b920a dev 2025-05-07 17:27:12 +08:00
LiJianZhao 067499bb03 dev 2025-05-07 17:21:30 +08:00
ChenQiuYu fadd3101b0 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-07 16:43:54 +08:00
ChenQiuYu 39eaabc902 dev 2025-05-07 16:43:46 +08:00
LiJianZhao 3e84d52685 dev 2025-05-07 16:06:53 +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 fa22f2934b dev 2025-05-07 16:05:09 +08:00
LiJianZhao f303c58767 dev 2025-05-07 16:03:44 +08:00
ChenQiuYu 9b60a81802 dev 2025-05-07 15:34:46 +08:00
ChenQiuYu a6c6f3fb64 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-07 15:31:31 +08:00
LiJianZhao 304d8d2cf3 dev 2025-05-07 15:31:23 +08:00
ChenQiuYu aa4c5fe72d dev 2025-05-07 15:31:20 +08:00
LiJianZhao ad67e3a2aa dev 2025-05-07 15:19:44 +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
ChenQiuYu 9edee03ccf dev 2025-05-07 10:40:19 +08:00
ChenQiuYu 36619d5bce dev 2025-05-06 16:45:32 +08:00
LiJianZhao 42a123e58b dev 2025-05-06 16:43:50 +08:00
ChenQiuYu 215c69a5cb dev 2025-05-06 16:32:19 +08:00
ChenQiuYu fc3fe2e825 dev 2025-05-06 16:14:28 +08:00
LiJianZhao 759fc69fd7 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/components/outpatient/DiagnosisSearchInput.vue
 2025-05-06 14:55:56 +08:00
LiJianZhao 227ea607cb dev 2025-05-06 14:54:51 +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
LiJianZhao 0ddc4ee58d Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-05-06 12:11:30 +08:00
LiJianZhao 72c3c25618 dev 2025-05-06 12:11:22 +08:00
ChenQiuYu a961680501 dev 2025-05-06 12:02:29 +08:00
LiJianZhao e98fc8cca8 dev 2025-05-06 09:56:49 +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 b869d8eab7 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 
# Conflicts:
#	src/components/registration/Edit.vue
 2025-04-30 16:59:54 +08:00
LiJianZhao 6a598389fc dev 2025-04-30 16:58:16 +08:00
ChenQiuYu 689157875f Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-30 16:23:52 +08:00
ChenQiuYu c56467749e dev 2025-04-30 16:23:42 +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