Commit Graph

245 Commits

Author SHA1 Message Date
纪寒
18ef1a9188 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/system/station/index.vue
2022-11-01 09:26:25 +08:00
纪寒
38d614a303 Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into dev 2022-11-01 09:22:13 +08:00
shidongli
80e5d0f4b9 耗材 校验 2022-10-31 17:37:02 +08:00
曹辉
3afafd012f 维护 2022-10-31 16:49:40 +08:00
shidongli
3a3bc7c6b8 Merge remote-tracking branch 'origin/dev' into dev 2022-10-31 16:46:35 +08:00
shidongli
6690717518 修改 2022-10-31 16:46:09 +08:00
纪寒
35db9e36f3 Merge remote-tracking branch 'origin/dev' into dev 2022-10-31 09:25:37 +08:00
曹辉
73036e7dbb 护理站 2022-10-31 08:58:42 +08:00
shidongli
abbbcc26d9 商品订单 2022-10-31 08:57:36 +08:00
shidongli
57ce8cdfec Merge branch 'sdl_20220916_护理站人员功能' into dev
# Conflicts:
#	src/views/system/goodsInfo/index.vue
2022-10-27 14:44:42 +08:00
shidongli
dc7275bce1 商品 2022-10-27 14:43:50 +08:00
shidongli
84cb0c9f58 商品管理 2022-10-27 14:43:02 +08:00
shidongli
69e1338bdd 商品 2022-10-27 14:38:23 +08:00
lijiahui
a06a8e37b4 修改访问地址 2022-10-25 11:14:27 +08:00
shidongli
86fb1ceb04 Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into sdl_20220916_护理站人员功能 2022-10-10 09:12:28 +08:00
shidongli
fa76299951 护理站 2022-10-10 09:11:55 +08:00
闫晓茹
e8e752b9f3 护理站护理项目修改校验 2022-10-09 09:12:48 +08:00
shidongli
8b816bda9e 护理站人员 input 2022-10-08 09:44:12 +08:00
闫晓茹
5c40260031 Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into sdl_20220916_护理站人员功能 2022-09-30 16:35:42 +08:00
闫晓茹
0d38d6ece3 订单 2022-09-30 16:35:14 +08:00
shidongli
7fd424cecc 居住社区 数字 2022-09-30 16:14:04 +08:00
shidongli
40101ba9b0 护理站信息 2022-09-30 10:26:47 +08:00
shidongli
e4f4caaa2a 被护理人信息 2022-09-29 16:22:55 +08:00
shidongli
8f5e144ae9 被护理人 修改 2022-09-29 11:42:38 +08:00
闫晓茹
6508e9851b 订单 2022-09-28 14:29:43 +08:00
闫晓茹
717ef57880 Merge remote-tracking branch 'origin/ch' into sdl_20220916_护理站人员功能 2022-09-28 14:25:30 +08:00
曹辉
c6101e12c1 工作提交 2022-09-28 14:15:42 +08:00
shidongli
49e5434487 居住社区 修改 2022-09-28 13:15:39 +08:00
shidongli
cf6cb4aee1 Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into sdl_20220916_护理站人员功能 2022-09-28 09:55:33 +08:00
shidongli
5166dc59f1 护理站人员 居住社区 区域修改 2022-09-28 09:54:37 +08:00
闫晓茹
1c0cfecb91 疾病类型信息 2022-09-27 10:24:33 +08:00
闫晓茹
cbf51d32ca 订单 2022-09-27 10:08:15 +08:00
shidongli
741a5f9f2b Merge remote-tracking branch 'origin/ch' into sdl_20220916_护理站人员功能 2022-09-27 09:08:34 +08:00
曹辉
e5fb95f3ab 工作提交 2022-09-27 09:05:46 +08:00
shidongli
cbe984ba7a 护理站信息 编辑框 2022-09-26 17:23:42 +08:00
shidongli
fca924ea45 Merge remote-tracking branch 'origin/yan_0916_护理类型信息' into sdl_20220916_护理站人员功能 2022-09-26 16:32:47 +08:00
shidongli
c96c11fa71 Merge remote-tracking branch 'origin/ch' into sdl_20220916_护理站人员功能
# Conflicts:
#	.env.development
2022-09-26 16:20:19 +08:00
曹辉
90d2ca7dbf 工作提交 2022-09-26 16:10:51 +08:00
闫晓茹
e15afdbbf9 修改 2022-09-26 14:04:54 +08:00
闫晓茹
26e6c30c65 Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into yan_0916_护理类型信息 2022-09-26 13:50:16 +08:00
闫晓茹
c6494148b7 更改护理站部门信息的手机号校验 2022-09-26 13:49:38 +08:00
shidongli
0bd0a3a5f1 被护理人信息 紧急联系人校验 2022-09-26 13:22:32 +08:00
闫晓茹
9aa3335264 更改订单信息页面的删除 2022-09-26 11:37:58 +08:00
shidongli
7eab12e9e4 修改 2022-09-26 10:56:07 +08:00
shidongli
98de6eb141 护理站人员 护理站部门 2022-09-26 10:51:02 +08:00
shidongli
63bd139913 删除修改 2022-09-26 09:58:10 +08:00
shidongli
e023e3ae7f Merge remote-tracking branch 'origin/yan_0916_护理类型信息' into sdl_20220916_护理站人员功能 2022-09-26 09:47:33 +08:00
闫晓茹
94a8d66b47 更改护理站信息 2022-09-23 17:27:30 +08:00
闫晓茹
6459f04081 Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into yan_0916_护理类型信息
# Conflicts:
#	src/api/baseurl.js
#	src/api/system/userlist.js
#	src/views/system/station/index.vue
#	src/views/system/userlist/index.vue
2022-09-23 17:27:06 +08:00
shidongli
f272a8ed76 被护理人信息 权限 2022-09-23 17:25:18 +08:00