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

361 Commits

Author SHA1 Message Date
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
LiJianZhao fe4770143c dev 2025-04-30 13:48:48 +08:00
ChenQiuYu 26c70fc4a7 dev 2025-04-30 11:57:43 +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
LiJianZhao f5718af4bc Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-30 10:39:45 +08:00
LiJianZhao bfbffd6664 dev 2025-04-30 10:39:36 +08:00
ChenQiuYu 44b7ee2c33 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-30 10:14:58 +08:00
ChenQiuYu c4434929f6 dev 2025-04-30 10:14:49 +08:00
LiJianZhao 66cd258069 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-30 10:12:59 +08:00
LiJianZhao 024adb7781 dev 2025-04-30 10:12:51 +08:00
牛子源 4b180c6da0 dev 2025-04-30 10:11:58 +08:00
ChenQiuYu 57486f8c6a dev 2025-04-29 16:47:41 +08:00
LiJianZhao d9dac5d824 dev 2025-04-29 16:46:39 +08:00
ChenQiuYu 062df7714d Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-29 16:27:46 +08:00
ChenQiuYu bdb62f0399 dev 2025-04-29 16:27:35 +08:00
LiJianZhao 7d16df6d1d dev 2025-04-29 16:24:50 +08:00
LiJianZhao e3885ac598 Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-29 15:26:38 +08:00
LiJianZhao 97585c15f2 dev 2025-04-29 15:26:27 +08:00
ChenQiuYu 5caab6347d dev 2025-04-29 13:44:33 +08:00
ChenQiuYu 85b4fa0efb Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-29 13:17:44 +08:00
ChenQiuYu 3de45ef2a3 dev 2025-04-29 13:17:21 +08:00
LiJianZhao 23a7ede76e Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-29 12:10:45 +08:00
LiJianZhao bc8e463602 dev 2025-04-29 12:10:35 +08:00
ChenQiuYu 79ab861858 dev 2025-04-29 11:16:53 +08:00
ChenQiuYu 3104a38229 dev 2025-04-29 10:12:58 +08:00
ChenQiuYu 256ba5ff10 dev 2025-04-29 09:50:31 +08:00
ChenQiuYu 64932e298d dev 2025-04-28 17:08:57 +08:00
LiJianZhao b774eb806b Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/components/common/Header.vue
#	src/components/common/Mask.vue
#	src/components/inventory/goods/Edit.vue
#	src/components/inventory/goods/Search.vue
#	src/components/outpatient/PharmaceuticalConsumables.vue
#	src/components/outpatient/ServiceItems.vue
#	src/components/settings/ItemEdit.vue
#	src/components/settings/Search.vue
#	src/components/settings/SectionEdit.vue
#	src/views/inventory/apply.vue
#	src/views/inventory/check.vue
#	src/views/inventory/goods.vue
#	src/views/inventory/supplier.vue
 2025-04-28 17:07:48 +08:00
LiJianZhao 212f4991ce dev 2025-04-28 17:06:06 +08:00
ChenQiuYu 44d92e37da dev 2025-04-28 16:26:23 +08:00
ChenQiuYu b47c0ee658 dev 2025-04-28 14:16:01 +08:00
ChenQiuYu 4980225f2f dev 2025-04-28 12:46:52 +08:00
LiJianZhao 2e844dd98e Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/components/inventory/purchase/AddOrder.vue
 2025-04-28 11:42:17 +08:00
LiJianZhao bbba5a165d dev 2025-04-28 11:41:53 +08:00
ChenQiuYu a1f4d16148 dev 2025-04-28 11:04:54 +08:00
ChenQiuYu 2a6e0dcdcd dev 2025-04-28 10:47:56 +08:00
LiJianZhao 38d8aa9090 Merge remote-tracking branch 'origin/main' 2025-04-27 17:05:59 +08:00
LiJianZhao c183c42525 dev 2025-04-27 17:05:54 +08:00
ChenQiuYu 6de7cf78b6 dev 2025-04-27 17:01:53 +08:00
ChenQiuYu c2b56ed357 dev 2025-04-27 16:16:24 +08:00
LiJianZhao e4b42268e5 Merge remote-tracking branch 'origin/main' 2025-04-27 15:47:32 +08:00
LiJianZhao 7d6ea12c52 dev 2025-04-27 15:47:26 +08:00
ChenQiuYu e07b429f3d dev 2025-04-27 15:40:51 +08:00
ChenQiuYu 8217b3a44f Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-27 14:46:26 +08:00
ChenQiuYu 30dd4a29f6 dev 2025-04-27 14:46:12 +08:00
LiJianZhao 53b508017a dev 2025-04-27 13:28:36 +08:00
LiJianZhao 255dbc15c0 Merge remote-tracking branch 'origin/main' 2025-04-27 12:40:37 +08:00
ChenQiuYu 0fa3bf802e Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-27 12:39:55 +08:00
ChenQiuYu 4d83e2d0f8 dev 2025-04-27 12:39:41 +08:00
LiJianZhao 00bfd318e1 dev 2025-04-27 11:41:19 +08:00
LiJianZhao 1ea523e4d5 Merge remote-tracking branch 'origin/main' 2025-04-27 11:28:43 +08:00
LiJianZhao 8cd43a043c dev 2025-04-27 11:28:37 +08:00
ChenQiuYu ef750bf196 dev 2025-04-27 10:06:29 +08:00
ChenQiuYu f1b356f7fc dev 2025-04-27 09:42:25 +08:00
牛子源 fd92dc315d dev 2025-04-27 09:08:17 +08:00
ChenQiuYu 9bddab3122 dev 2025-04-25 17:08:43 +08:00
LiJianZhao 853f552ae4 Merge remote-tracking branch 'origin/main' 2025-04-25 16:55:07 +08:00
LiJianZhao d5080a0bab dev 2025-04-25 16:53:49 +08:00
ChenQiuYu cefc091908 dev 2025-04-25 16:44:25 +08:00
ChenQiuYu 3b9d87ee3e dev 2025-04-25 16:12:41 +08:00
ChenQiuYu 570a0962f8 dev 2025-04-25 16:05:28 +08:00
ChenQiuYu e1ead5394f Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web 2025-04-25 15:00:54 +08:00
ChenQiuYu 0caad78089 dev 2025-04-25 15:00:39 +08:00
LiJianZhao 6fba365b12 Merge remote-tracking branch 'origin/main' 2025-04-25 14:56:17 +08:00
LiJianZhao acecc58013 dev 2025-04-25 14:56:11 +08:00
ChenQiuYu 0d8e8932f0 dev 2025-04-25 13:51:37 +08:00
ChenQiuYu f86c13b301 dev 2025-04-25 13:44:28 +08:00
ChenQiuYu 6714080a17 dev 2025-04-25 13:18:11 +08:00
ChenQiuYu 440849475b dev 2025-04-25 10:51:33 +08:00