diff --git a/index.html b/index.html index 0eb2d5c..40f2e75 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + 药慧精灵智慧诊所 diff --git a/public/static/iconfont/iconfont.css b/public/static/iconfont/iconfont.css new file mode 100644 index 0000000..aa1d1ff --- /dev/null +++ b/public/static/iconfont/iconfont.css @@ -0,0 +1,38 @@ +@font-face { + font-family: "iconfont"; /* Project id 4921806 */ + src: url('iconfont.woff?t=1748312335696') format('woff'), + url('iconfont.ttf?t=1748312335696') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-yuyueh:before { + content: "\e60d"; +} + +.icon-yuyue:before { + content: "\e606"; +} + +.icon-qunzutaozhuang:before { + content: "\eac9"; +} + +.icon-jia:before { + content: "\e6a9"; +} + +.icon-RectangleCopy:before { + content: "\e6a2"; +} + +.icon-RectangleCopy1:before { + content: "\e6a4"; +} + diff --git a/public/static/iconfont/iconfont.ttf b/public/static/iconfont/iconfont.ttf new file mode 100644 index 0000000..b2f6fd7 Binary files /dev/null and b/public/static/iconfont/iconfont.ttf differ diff --git a/public/static/iconfont/iconfont.woff b/public/static/iconfont/iconfont.woff new file mode 100644 index 0000000..c183d12 Binary files /dev/null and b/public/static/iconfont/iconfont.woff differ diff --git a/src/assets/config/API.ts b/src/assets/config/API.ts new file mode 100644 index 0000000..ef52a26 --- /dev/null +++ b/src/assets/config/API.ts @@ -0,0 +1,296 @@ +export namespace API { + export namespace Charge { + export namespace Log { + export const List = 'charge/log/list'//收费记录; + export const ReportWithDays = 'charge/log/reportWithDays'//每日收费报表; + export const ListByPatientId = 'charge/log/listByPatientId'//病人付费记录; + export const ListByDatetime = 'charge/log/listByDatetime'//获取收退费记录; + } + + export namespace Order { + export const List = 'charge/order/list'//查询list 只有订单信息; + export const Save = 'charge/order/save'//保存收费订单; + export const Complete = 'charge/order/complete'//完成订单; + export const GetPrintInfoByCode = 'charge/order/getPrintInfoByCode'//根据订单号获取订单详情,小票打印用; + export const GetByCode = 'charge/order/getByCode'//根据code查询订单详情; + export const Refund = 'charge/order/refund'; + export const ListWithDetail = 'charge/order/listWithDetail'//查询list 带详情; + export const GetByDiagnosisCode = 'charge/order/getByDiagnosisCode'//根据诊断code和状态获取诊断信息; + } + + export namespace Social { + export const PrePay = 'charge/social/prePay'//医保预支付; + export const RealPay = 'charge/social/realPay'//医保真实支付; + export const Upload = 'charge/social/upload'//医保上传支付明细; + } + + } + + export namespace Common { + export namespace Auth { + export const Get = 'common/auth/get'//获取认证信息; + export const Set = 'common/auth/set'//设置认证信息; + export const Check = 'common/auth/check'; + } + + export namespace Config { + export const Get = 'common/config/get'//根据key获取配置信息; + export const List = 'common/config/list'//查询配置信息; + export const GetAll = 'common/config/getAll'//查询所有配置信息; + export const SavePrinter = 'common/config/savePrinter'//保存打印机配置; + export const Edit = 'common/config/edit'//修改配置信息; + export const GetPrintConfig = 'common/config/getPrintConfig'//获取打印机配置; + } + + export namespace Log { + export const List = 'common/log/list'//查询操作日志; + } + + export namespace File { + export const GetImage = 'common/file/getImage'//获取图片; + export const Download = 'common/file/download'//下载文件; + export const Upload = 'common/file/upload'//上传文件; + export const UploadToTemp = 'common/file/uploadToTemp'//上传临时文件; + } + + export namespace ManagerUser { + export const List = 'common/ManagerUser/list'//所有人员信息; + export const Verify = 'common/ManagerUser/verify'//验证token; + export const Login = 'common/ManagerUser/login'//登录; + } + + export namespace Sign { + export const SignOut = 'common/sign/signOut'//医保签退; + export const SignIn = 'common/sign/signIn'//医保签到; + } + + } + + export namespace Diagnosis { + export namespace Base { + export const Save = 'diagnosis/base/save'//保存诊断; + export const GetByDiagnosisCode = 'diagnosis/base/getByDiagnosisCode'//获取诊断信息; + export const GetByRegisId = 'diagnosis/base/getByRegisId'//根据挂单号回显病历详情; + export const ChargeQueueList = 'diagnosis/base/ChargeQueueList'//获取收费队列; + export const ListByPatient = 'diagnosis/base/listByPatient'//查询患者病历; + export const GetRegistrationDetail = 'diagnosis/base/getRegistrationDetail'//获取挂号信息; + } + + } + + export namespace Goods { + export namespace Cate { + export const List = 'goods/cate/list'//根据type获取商品二级分类列表; + export const Save = 'goods/cate/save'//保存二级分类; + export const Del = 'goods/cate/del'//删除二级分类; + export const GetAllList = 'goods/cate/getAllList'//获取所有分类; + } + + export namespace Base { + export const Get = 'goods/base/get'//根据商品id获取商品; + export const Save = 'goods/base/save'//商品建档或修改; + export const Search = 'goods/base/search'//商品搜索一键建档内的搜索; + export const ReturnInit = 'goods/base/returnInit'//商品重新初始化医保库存; + export const DetailWithSearch = 'goods/base/DetailWithSearch'//商品搜索; + export const EnableSale = 'goods/base/enableSale'//起售商品; + export const DisableSale = 'goods/base/disableSale'//停售商品; + export const AddIdCode = 'goods/base/addIdCode'//商品添加标识码; + export const GetByCateId = 'goods/base/getByCateId'//获取二级分类绑定的商品数量; + } + + } + + export namespace Inventory { + export namespace Apply { + export const List = 'inventory/apply/list'//分页查询领用单; + export const Create = 'inventory/apply/create'//创建领用单并领用; + export const GetDetail = 'inventory/apply/getDetail'//获取领用单详情; + } + + export namespace Check { + export const List = 'inventory/check/list'//盘点列表分页查询; + export const Save = 'inventory/check/save'//保存盘点记录; + export const GetDetail = 'inventory/check/getDetail'//获取盘点单详情; + } + + export namespace Goods { + export const Log = 'inventory/goods/log'//获取库存日志; + export const Update = 'inventory/goods/update'//修改库存采购信息; + export const Statistics = 'inventory/goods/statistics'//库存统计; + export const GetByGoodsId = 'inventory/goods/getByGoodsId'//获取商品库存信息 根据goodsId; + export const ListByOrderCode = 'inventory/goods/listByOrderCode'//获取采购单信息 根据code; + export const ListByIds = 'inventory/goods/listByIds'//根据库存id集合获取库存信息; + export const ListByGoodsId = 'inventory/goods/listByGoodsId'//获取商品库存信息 根据goodsId; + } + + export namespace Order { + export const Update = 'inventory/order/update'//更新采购单基本信息; + export const List = 'inventory/order/list'//分页查询采购单; + export const Create = 'inventory/order/create'//创建采购单; + export const Refund = 'inventory/order/refund'//采购单退货; + export const Detail = 'inventory/order/detail'//获取采购单详情; + export const ToExcel = 'inventory/order/toExcel'//采购一键导入，生成excel; + export const FromExcel = 'inventory/order/fromExcel'//采购一键导入，解析excel; + export const AddGoods = 'inventory/order/addGoods'//采购单修改时 添加采购的商品; + } + + export namespace Supplier { + export const List = 'inventory/supplier/list'//分页查询供货商; + export const Save = 'inventory/supplier/save'//保存供货商; + } + + } + + export namespace Item { + export const Get = 'item/get'//获取项目详情; + export const Search = 'item/search'//搜索项目; + export const Del = 'item/del'//删除项目; + export const Edit = 'item/edit'//修改项目; + export const GroupList = 'item/groupList'//获取组套列表; + export const GetGroup = 'item/getGroup'//获取组套; + export const Add = 'item/add'//添加项目; + export const DeleteGroup = 'item/deleteGroup'//删除组套; + export const SaveGroup = 'item/saveGroup'//保存组套; + export const List = 'item/list'//获取非组套列表; + } + + export namespace Organization { + export namespace Member { + export const Get = 'organization/member/get'//获取成员信息; + export const List = 'organization/member/list'//分页查询成员列表; + export const Save = 'organization/member/save'//保存成员信息; + export const Search = 'organization/member/search'//搜索成员; + export const Del = 'organization/member/del'//删除成员; + export const ListBySectionId = 'organization/member/listBySectionId'//获取当前科室的所有医生; + } + + export namespace Section { + export const Add = 'organization/section/add'//添加科室; + export const Get = 'organization/section/get'//获取科室信息; + export const List = 'organization/section/list'; + export const AllList = 'organization/section/allList'//获取所有科室; + export const Del = 'organization/section/del'//删除科室; + export const Edit = 'organization/section/edit'//修改科室信息; + export const ListByMemberId = 'organization/section/listByMemberId'//获取当前成员的所属科室; + } + + } + + export namespace Patient { + export namespace Base { + export const Get = 'patient/base/get'//获取患者信息; + export const Update = 'patient/base/update'//修改患者信息; + export const Create = 'patient/base/create'//创建患者; + export const Search = 'patient/base/search'//搜索患者; + export const Del = 'patient/base/del'//删除患者; + export const List = 'patient/base/list'//分页查询患者列表; + export const ChangeLevel = 'patient/base/changeLevel'//改变会员等级; + } + + export namespace Integral { + export const Add = 'patient/integral/add'//添加会员积分; + export const List = 'patient/integral/list'//分页查询会员积分记录; + } + + export namespace LevelConfig { + export const Get = 'patient/levelConfig/get'//根据leveId获取会员等级配置; + export const Save = 'patient/levelConfig/save'//保存会员等级配置; + export const Create = 'patient/levelConfig/create'//新增会员等级配置; + export const Del = 'patient/levelConfig/del'//删除一个会员等级配置; + export const Edit = 'patient/levelConfig/edit'//修改会员等级配置; + export const List = 'patient/levelConfig/list'//分页查询会员等级配置; + } + + export namespace Registration { + export const Add = 'patient/registration/add'//挂号; + export const Get = 'patient/registration/get'//获取挂号信息 根据挂号id; + export const List = 'patient/registration/list'//分页查询挂号列表; + export const Cancel = 'patient/registration/cancel'//取消挂号; + export const AllList = 'patient/registration/allList'//获取挂号信息列表; + export const Del = 'patient/registration/del'//删除挂号信息; + export const Edit = 'patient/registration/edit'//修改挂号信息; + export const ListByType = 'patient/registration/listByType'//挂号信息分页搜索; + export const ChangeStatus = 'patient/registration/changeStatus'//更改挂号单状态; + export const GetWithPatient = 'patient/registration/getWithPatient'//根据id返回挂号详细信息 包含患者信息; + } + + } + + export namespace Social { + export namespace Recipe { + export const Download = 'social/recipe/download'//下载中药颗粒; + } + + export namespace Disease { + export const Download = 'social/disease/download'; + } + + export namespace Diagnose { + export const Search = 'social/diagnose/search'//诊断搜索; + } + + export namespace Directory { + export const Search = 'social/directory/search'//搜索目录信息; + export const GetByCode = 'social/directory/getByCode'//根据医保码，获取医保商品信息; + export const Download = 'social/directory/download'//下载目录; + export const SearchProducer = 'social/directory/searchProducer'//搜索企业信息; + export const Column_list = 'social/directory/column_list'//获取目录列 列表; + export const GetItemByCode = 'social/directory/getItemByCode'//根据医保码，获取医保服务项目信息; + export const ItemSearch = 'social/directory/itemSearch'//服务项目搜索; + export const Get_doc_list = 'social/directory/get_doc_list'//获取目录列表; + export const SyncToMongo = 'social/directory/syncToMongo'//同步到MongoDB; + } + + export namespace Directory_limit { + export const Get_page = 'social/directory_limit/get_page'//分页查询目录限制信息; + } + + export namespace Directory_self { + export const Get_page = 'social/directory_self/get_page'//分页查询自付比例信息; + } + + export namespace Directory_upinfo { + export const Get_page = 'social/directory_upinfo/get_page'//分页查询更新信息; + } + + export namespace Directory_version { + export const List = 'social/directory_version/list'//获取医保目录版本列表; + export const Get_current = 'social/directory_version/get_current'//获取当前医保目录版本; + } + + export namespace Person { + export const GetCustomSocialInfo = 'social/person/getCustomSocialInfo'//获取社保人员信息; + export const GetSocialInfoByPsnNo = 'social/person/getSocialInfoByPsnNo'//根据社保人员编号获取医保人员信息 redis; + } + + export namespace Reconciliation { + export const List = 'social/reconciliation/list'//医保-对账列表; + export const DoTotal = 'social/reconciliation/doTotal'//对总账; + export const HistoryList = 'social/reconciliation/historyList'//自动对账历史记录列表; + export const Reversal = 'social/reconciliation/reversal'//冲正; + export const DoDetail = 'social/reconciliation/doDetail'//明细对账; + } + + export namespace Upload { + export const Get3501List = 'social/upload/get3501List'//分页查询 商品初始化数据; + export const Get3502List = 'social/upload/get3502List'//分页查询 商品库存变更记录; + export const Get3505List = 'social/upload/get3505List'//获取3505列表; + export const QuickUpload = 'social/upload/quickUpload'//进销存一键上报接口; + export const Get3503List = 'social/upload/get3503List'//分页查询 库存采购数据; + export const GetNotDoNumber = 'social/upload/getNotDoNumber'//获取进销存 3501-3506 未上报数量; + } + + } + + export namespace Statistics { + export const GetSalesVolumeOverview = 'statistics/getSalesVolumeOverview'//销售人次趋势; + export const ExpiryDateWarning = 'statistics/expiryDateWarning'//有效期预警; + export const GoodsStatistics = 'statistics/goodsStatistics'//商品统计; + export const NumberEarlyWarning = 'statistics/numberEarlyWarning'//库存预警; + export const GetRevenueOverview = 'statistics/getRevenueOverview'//营收概况; + export const SalePerson = 'statistics/salePerson'//销售人员统计; + export const GetQueueCount = 'statistics/getQueueCount'//获取收费队列 就诊队列数量; + export const GetPayOverview = 'statistics/getPayOverview'//经营概况; + } + +} diff --git a/src/assets/config/apiConfig.ts b/src/assets/config/apiConfig.ts index f1120ed..6482e3d 100644 --- a/src/assets/config/apiConfig.ts +++ b/src/assets/config/apiConfig.ts @@ -1,38 +1,47 @@ -export enum apiConfig{ +export enum apiConfig { /** * 用户操作 */ - "ManagerUserLogin"="manager/user/login",//登录 - "signIn"="sign/in",//签到 - "signOut"="sign/out",//签退 - "managerUserVerify"="manager/user/verify",//获取用户信息 + "ManagerUserLogin" = "manager/user/login",//登录 + "signIn" = "sign/in",//签到 + "signOut" = "sign/out",//签退 + "managerUserVerify" = "manager/user/verify",//获取用户信息 + /** + * 挂号操作 + */ + "RegistrationList" = "registration/list",//挂号列表 + "RegistrationAdd" = "registration/add",//添加挂号 + "RegistrationEdit" = "registration/edit",//修改挂号 + /** * 接诊操作 */ - "RegistrationDetail" ="medical/record/getDetailByRegisId",//详情 - "RegistrationList" ="registration/getListByType",//患者列表 - "RegistrationChangeStatus"="registration/changeStatus", - + "RegistrationChangeStatus" = "registration/changeStatus",//挂号状态 + "MedicalDetailByRegisId" = "medical/record/getDetailByRegisId",//患者详情 + "RegistrationListByType" = "registration/getListByType",//患者列表 + "StatisticsGetTipCount" = "statistics/getTipCount",//患者状态数量 + "MedicalRecordSave" = "medical/record/save",//保存接诊信息 + "SocialDiagnoseSearch" = "social/diagnose/search",//接诊详情 /** * 科室成员信息 */ - "OrganizationMemberSave"="organization/member/save",//添加 编辑成员信息 - "OrganizationMemberSearch"="organization/member/search",//搜索成员 - "OrganizationSectionAllList"="organization/section/allList",//获取所有科室列表 - "OrganizationSectionListByMemberId"="organization/section/listByMemberId",//获取当前成员所属科室列表 - "OrganizationMemberListBySectionId"="organization/member/listBySectionId",//获取当前科室的所有医生列表 + "OrganizationMemberSave" = "organization/member/save",//添加 编辑成员信息 + "OrganizationMemberSearch" = "organization/member/search",//搜索成员 + "OrganizationSectionAllList" = "organization/section/allList",//获取所有科室列表 + "OrganizationSectionListByMemberId" = "organization/section/listByMemberId",//获取当前成员所属科室列表 + "OrganizationMemberListBySectionId" = "organization/member/listBySectionId",//获取当前科室的所有医生列表 /** * 商品 */ - "GoodsDisableSale"="goods/goods/disableSale", - "GoodsEnableSale"="goods/goods/enableSale", - + "GoodsDisableSale" = "goods/goods/disableSale", + "GoodsEnableSale" = "goods/goods/enableSale", + /** * 收费接口 */ - "ChargeListChargeLog"="charge/listChargeLog",//查询收费记录 - "RecordGetChargeQueue"="medical/record/getChargeQueue"//查询收费记录 + "ChargeListChargeLog" = "charge/listChargeLog",//查询收费记录 + "RecordGetChargeQueue" = "medical/record/getChargeQueue"//查询收费记录 } diff --git a/src/assets/config/directory/drugMedcWayCode.json b/src/assets/config/directory/drugMedcWayCode.json new file mode 100644 index 0000000..435476f --- /dev/null +++ b/src/assets/config/directory/drugMedcWayCode.json @@ -0,0 +1,26 @@ +{ + "1": "口服", + "2": "直肠给药", + "3": "舌下给药", + "4": "注射给药", + "401": "皮下注射", + "402": "皮内注射", + "403": "肌肉注射", + "404": "静脉注射或静脉滴注", + "5": "吸入给药", + "6": "局部用药", + "601": "椎管内用药", + "602": "关节腔内用药", + "603": "胸膜腔用药", + "604": "腹腔用药", + "605": "阴道用药", + "606": "气管内用药", + "607": "滴眼", + "608": "滴鼻", + "609": "喷喉", + "610": "含化", + "611": "敷伤口", + "612": "擦皮肤", + "699": "其他局部给药途径", + "9": "其他给药途径" +} diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css deleted file mode 100644 index 6b5ed31..0000000 --- a/src/assets/iconfont/iconfont.css +++ /dev/null @@ -1,22 +0,0 @@ -@font-face { - font-family: "iconfont"; /* Project id 4921806 */ - src: url('iconfont.woff?t=1747274949107') format('woff'), - url('iconfont.ttf?t=1747274949107') format('truetype'); -} - -.iconfont { - font-family: "iconfont", serif !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-RectangleCopy:before { - content: "\e6a2"; -} - -.icon-RectangleCopy1:before { - content: "\e6a4"; -} - diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf deleted file mode 100644 index dd739fc..0000000 Binary files a/src/assets/iconfont/iconfont.ttf and /dev/null differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff deleted file mode 100644 index 357b10f..0000000 Binary files a/src/assets/iconfont/iconfont.woff and /dev/null differ diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index c92070e..6e6bcec 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -143,23 +143,77 @@ $lighter-color: rgba(#4D6DE4, 0.5); color: #FFF; font-size: 16px; text-align: center; + margin-left: 9px; &:hover{ background: $lighter-color; } - } -.small-btn{ - display: inline-block; - width: 72px; - height: 24px; - line-height: 24px; - background: $btn-color; - border-radius: 3px; - color: #FFF; - font-size: 12px; - text-align: center; +.default-close-btn{ cursor: pointer; + display: inline-block; + width: 119px; + height: 42px; + line-height: 42px; + background: #fff; + border-radius: 6px; + color: #333333; + font-size: 16px; + text-align: center; + margin-left: 9px; + border:1px solid #D8D8D8; &:hover{ background: $lighter-color; + color: #fff; + border:none; } -} \ No newline at end of file +} + +.small-btn{ + cursor: pointer; + display: inline-block; + line-height: 1; + background: $btn-color; + border-radius: 4px; + color: #FFF; + font-size: 14px; + text-align: center; + margin-left: 9px; + padding: 8px 15px; + &:hover{ + background: $lighter-color; + } +} + +.danger-btn{ + cursor: pointer; + display: inline-block; + line-height: 1; + background: #EB5757; + border-radius: 4px; + color: #FFF; + font-size: 14px; + text-align: center; + margin-left: 9px; + padding: 8px 15px; + &:hover{ + background: rgba(#EB5757, 0.5); + } +} +.close-btn{ + cursor: pointer; + display: inline-block; + line-height: 1; + background: #fff; + border-radius: 4px; + color: #333; + font-size: 14px; + text-align: center; + margin-left: 9px; + padding: 7px 14px; + border:1px solid #D8D8D8; + &:hover{ + background: rgba(#4D6DE4, 0.5); + color: #fff; + border:1px solid rgba(#4D6DE4, 0.5); + } +} diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue index f5e398a..ba13c44 100644 --- a/src/components/SearchInput.vue +++ b/src/components/SearchInput.vue @@ -17,47 +17,25 @@ @click="changeInput" /> -
- - - - - - - - - - - - - - -
- {{ item.label }} -
- {{ item[showItem.prop] }} -
- +
+ + + + /> +
\ No newline at end of file diff --git a/src/components/common/service/ServiceDetail.vue b/src/components/common/service/ServiceDetail.vue index 2560f89..00aee81 100644 --- a/src/components/common/service/ServiceDetail.vue +++ b/src/components/common/service/ServiceDetail.vue @@ -37,7 +37,7 @@ @@ -168,18 +168,16 @@ const hide = () => { } diff --git a/src/components/inventory/goods/SocialInfo.vue b/src/components/inventory/goods/SocialInfo.vue index 275ae15..5aaf9b6 100644 --- a/src/components/inventory/goods/SocialInfo.vue +++ b/src/components/inventory/goods/SocialInfo.vue @@ -8,7 +8,7 @@
{{ hilistInfo.name }} - {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '-' }} + {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '' }}
{{ hilistInfo.code }} @@ -86,17 +86,16 @@ onMounted(() => { .hilist-code { cursor: pointer; width: 100%; - height: 25px; - border: 1px #ddd solid; + height: 38px; display: flex; justify-content: space-between; align-items: center; - padding: 8px; - border-radius: 10px; + padding: 16px; + border-radius: 6px; + border: 1px solid #EAEAEC; .name { display: flex; - } .code { @@ -107,14 +106,15 @@ onMounted(() => { } .hilist-detail { - padding: base.$padding-base; - margin-top: 3px;; + padding: 16px; + margin-top: 8px; width: 100%; - height: 250px; - border: 1px base.$border-color-base solid; font-size: 12px; - border-radius: 8px; + background: #F5F6F7; + border-radius: 6px; + border: 1px solid #EAEAEC; + display: flex; + flex-direction: column; + justify-content: space-between; } - - \ No newline at end of file diff --git a/src/components/inventory/purchase/CodeNumEditDialog.vue b/src/components/inventory/purchase/CodeNumEditDialog.vue index 3b893d3..7a564c2 100644 --- a/src/components/inventory/purchase/CodeNumEditDialog.vue +++ b/src/components/inventory/purchase/CodeNumEditDialog.vue @@ -1,27 +1,26 @@ \ No newline at end of file diff --git a/src/components/inventory/purchase/TraceabilityCodeInput.vue b/src/components/inventory/purchase/TraceabilityCodeInput.vue index cc03b1d..adfb42f 100644 --- a/src/components/inventory/purchase/TraceabilityCodeInput.vue +++ b/src/components/inventory/purchase/TraceabilityCodeInput.vue @@ -11,7 +11,7 @@ {{ row.code.slice(0, 7) }} {{ row.code.slice(7) }} - + @@ -122,6 +122,7 @@ const reduceIntegral = () => { flex-direction: column; justify-content: center; margin-left: 16px; + .name { font-weight: bold; font-size: 24px; diff --git a/src/components/member/memberProfile/Grant.vue b/src/components/member/memberProfile/Grant.vue index 04dc01c..7721768 100644 --- a/src/components/member/memberProfile/Grant.vue +++ b/src/components/member/memberProfile/Grant.vue @@ -45,8 +45,8 @@ diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue index b2b212c..3f4aad0 100644 --- a/src/components/member/memberProfile/VipEdit.vue +++ b/src/components/member/memberProfile/VipEdit.vue @@ -186,10 +186,8 @@ 退出医保
- 取消 - - 保存 - + 取消 + 保存
diff --git a/src/components/outpatient/Case.vue b/src/components/outpatient/Case.vue index 6d5f54a..71f9402 100644 --- a/src/components/outpatient/Case.vue +++ b/src/components/outpatient/Case.vue @@ -40,7 +40,7 @@ - + @@ -75,7 +75,8 @@ import { import Panel from "@/components/common/Panel.vue"; import PopoverInput from "@/components/PopoverInput.vue"; import DiagnosisSearchInput from "@/components/outpatient/DiagnosisSearchInput.vue"; -import PhysiqueExamInuput from "@/components/outpatient/PhysiqueExamInuput.vue"; +import PhysiqueExamInput from "@/components/outpatient/PhysiqueExamInput.vue"; +import {apiConfig} from "@/assets/config/apiConfig.ts"; const props = defineProps({ disabled: { @@ -94,7 +95,7 @@ interface ShowConfig { prop: string; } -const diagnosisSearchApi = "social/diagnose/search" +const diagnosisSearchApi = apiConfig.SocialDiagnoseSearch const diagnosisShowConfig: ShowConfig[] = [ { label: "诊断名称", diff --git a/src/components/outpatient/MedicalHistory.vue b/src/components/outpatient/MedicalHistory.vue index afd51a3..2b965d5 100644 --- a/src/components/outpatient/MedicalHistory.vue +++ b/src/components/outpatient/MedicalHistory.vue @@ -34,7 +34,6 @@ const props = defineProps({ default: 0 } }) -console.log(props.status) const list = ref([]) const init = (patientId: any) => { post("medical/record/listByPatient", {patientId: patientId}).then((res: any) => { diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue index 3a7db4e..5d105d8 100644 --- a/src/components/outpatient/MedicalQueue.vue +++ b/src/components/outpatient/MedicalQueue.vue @@ -30,15 +30,16 @@
  • - - 头像 - 头像 - +
    + 头像 + 头像 + +
    {{ item.name }} - {{ formatListTime(item.createDatetime)}} + {{ formatListTime(item.appointmentTime) }} {{ item.type == 2 ? '医保' : '自费' }}
    • @@ -104,7 +105,7 @@ onMounted(() => { // 启动定时器，每秒更新一次 refreshInterval = setInterval(() => { initList() - }, 60*1000); // 每1000毫秒（即1秒）执行一次 + }, 60 * 1000); // 每1000毫秒（即1秒）执行一次 }) onUnmounted(() => { // 组件卸载时清除定时器 @@ -143,7 +144,7 @@ const init = async () => { clickLi(null) loading.value = true try { - let data: any = await post(apiConfig.RegistrationList, { + let data: any = await post(apiConfig.RegistrationListByType, { query: { status: curStatus.value, beginTime: selectedDate.value, @@ -167,7 +168,7 @@ const init = async () => { initStatusList() } const initStatusList = () => { - post('statistics/getTipCount', { + post(apiConfig.StatisticsGetTipCount, { beginTime: selectedDate.value, endTime: getEndOfDay(new Date(selectedDate.value)) }).then((res: any) => { @@ -191,11 +192,12 @@ const clickLi = (item: any, showBox: any = true) => { return } if (action == "confirm") { - post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => { + post(apiConfig.RegistrationChangeStatus, {id: item.id, status: 2}).then((res: any) => { curStatus.value = 2 curItem.value = res initStatusList() emit('clickItem', curItem.value) + selectedDate.value = getCurrentDate() }) } }, @@ -206,16 +208,28 @@ const clickLi = (item: any, showBox: any = true) => { } const changeCurItemOrStatus = (item: any, status: any) => { - clickLi(item, false) - if (curStatus != null) { - curStatus.value = status + curStatus.value = status + curItem.value = item + clickTab({status: status}) + if (status == 1) { + // selectedDate.value = formatDate(item.appointmentTime) init() + return } + if (item != null && status != 1) { + clickLi(item); + } + init() } defineExpose({changeCurItemOrStatus}) watch(() => curStatus.value, () => { init() // 重新初始化数据 }) +const formatDate = (isoStr: any) => { + if (!isoStr) return '' + const date = new Date(isoStr); + return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`; +} const setDateTip = () => { const seletctedDateObj = new Date(selectedDate.value); //如果选择的日期是今天 @@ -234,7 +248,7 @@ const setDateTip = () => { } watch(() => selectedDate.value, (newValue, oldValue) => { - curItem.value=null + curItem.value = null emit('clickItem', curItem.value) if (newValue == oldValue) { init() @@ -329,6 +343,21 @@ watch(() => selectedDate.value, (newValue, oldValue) => { .item-avatar { width: 26px; margin-right: 10px; + position: relative; + + .yuYueIcon { + display: inline-block; + width: 12px; + height: 12px; + position: absolute; + bottom: 11px; + right: -1px; + color: #31e3ca; + font-size: 12px; + z-index: 99; + background: #fff; + border-radius: 12px; + } .avatar { margin-top: 11px; @@ -403,5 +432,4 @@ watch(() => selectedDate.value, (newValue, oldValue) => { right: 0; top: 50px; } - \ No newline at end of file diff --git a/src/components/outpatient/PhysiqueExamInuput.vue b/src/components/outpatient/PhysiqueExamInput.vue similarity index 100% rename from src/components/outpatient/PhysiqueExamInuput.vue rename to src/components/outpatient/PhysiqueExamInput.vue diff --git a/src/components/outpatient/Settlement.vue b/src/components/outpatient/Settlement.vue index 25e5367..f813114 100644 --- a/src/components/outpatient/Settlement.vue +++ b/src/components/outpatient/Settlement.vue @@ -20,7 +20,7 @@ const editItem= () => {
    总金额：￥{{ totalAmount || '0' }}
    - 取消接诊 + 取消接诊 完成接诊
    diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue index d2acb07..38ed523 100644 --- a/src/components/registration/Edit.vue +++ b/src/components/registration/Edit.vue @@ -2,128 +2,126 @@ @@ -227,11 +227,7 @@ import Quick from "@/components/charge/RecordsLog/Quick.vue"; import {getCurrentTime, getToday} from "@/utils/dateUtils.ts"; const height = ref(570) -const certTypeList = ref( - Object.entries(psnCertTypes) - .map(([id, name]) => ({id: Number(id), name})) - .sort((a, b) => a.id - b.id) -) +const certTypeList = ref([]) const edit_data = ref({ timeList: [] }) @@ -252,11 +248,11 @@ const rules = ref({ phone: [ {required: true, message: '请输入手机号', trigger: 'blur'}, ], - organzationDoctorId: [ - {required: true, message: '请选择医生', trigger: 'blur'}, + organizationDoctorId: [ + {required: true, message: '请选择医生', trigger: 'change'}, ], certType: [ - {required: true, message: '请选择证件类型', trigger: 'blur'}, + {required: true, message: '请选择证件类型', trigger: 'change'}, ], certNo: [ {required: true, message: '请输入证件码', trigger: 'blur'}, @@ -278,9 +274,7 @@ const close = () => { isBtnShow.value = true time.value = '' edit_data.value = { - timeList: [], insutype: '', - appointmentTime: '' } isShowCard.value = true nextTick(() => { @@ -297,26 +291,27 @@ const disabledDate = (date: Date) => { today.setHours(0, 0, 0, 0); // 将时间设置为今天的 00:00:00 return date < today; // 禁用今天之前的日期 }; +const timeList = ref([]) const dateName = defineModel() const save = () => { - if (dateName.value == '现在') { - edit_data.value.timeList = '' - edit_data.value.appointmentTime = '' - } else { - edit_data.value.timeList.push(edit_data.value.date, time.value) - edit_data.value.appointmentTime = edit_data.value.timeList.join(' ') - } - let data = { - ...edit_data.value, - psnNo: socialCard.value?.data?.baseinfo.psn_no, - insutype: edit_data.value.insutype || socialCard.value?.data?.insuinfo[0].insutype, - insuBalance: socialCard.value?.data?.insuinfo[0].balc, - - } form.value.validate((v: any) => { if (v) { + let combinedDateTime = '' + if (edit_data.value.date == undefined || edit_data.value.time == undefined) { + combinedDateTime = '' + } else { + combinedDateTime = `${edit_data.value.date} ${edit_data.value.time}` + } + let data = { + ...edit_data.value, + appointmentTime: combinedDateTime || '', + psnNo: socialCard.value?.data?.baseinfo.psn_no, + insutype: edit_data.value.insutype || socialCard.value?.data?.insuinfo[0].insutype, + insuBalance: socialCard.value?.data?.insuinfo[0].balc, + + } if (edit_data.value.id) { - post('registration/edit', { + post(apiConfig.RegistrationEdit, { data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo, mdtrtCertType: socialCard.value?.mdtrtCertType }).then(() => { @@ -324,7 +319,7 @@ const save = () => { close() }) } else { - post('registration/add', { + post(apiConfig.RegistrationAdd, { data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo, mdtrtCertType: socialCard.value?.mdtrtCertType @@ -368,6 +363,9 @@ const socialCard: any = ref({ }) const quickShow = ref(false) const init = (doctorId: any = "", id: any = null, show: any = false) => { + certTypeList.value = Object.entries(psnCertTypes) + .map(([id, name]) => ({id, name})) + .sort((a, b) => Number(a.id) - Number(b.id)) isShow.value = true quickShow.value = show edit_data.value.organizationDoctorId = doctorId || "" @@ -376,7 +374,6 @@ const init = (doctorId: any = "", id: any = null, show: any = false) => { if (id) { post('registration/getById', {id: id}).then((res: any) => { edit_data.value = res - edit_data.value.certType = Number(edit_data.value.certType) time.value = edit_data.value.timeList[edit_data.value.timeList.length - 1] }) } @@ -388,31 +385,24 @@ const tableData = ref([]) const multipleTable = ref() const socialCardUpdate = (e: any) => { isShowCard.value = false - if (e) { - isShowCard.value = false - edit_data.value.gender = Number(e.data.baseinfo.gend) - edit_data.value.name = e.data.baseinfo.psn_name - edit_data.value.certType = Number(e.data.baseinfo.psn_cert_type) - edit_data.value.certNo = e.data.baseinfo.certno - edit_data.value.age = Math.floor(e.data.baseinfo.age) - tableData.value = e.data.insuinfo - edit_data.value.type = 2 - if (edit_data.value.certNo) { - post('vip/vip/list', { - keyword: edit_data.value.certNo, - page: 1, - pageSize: 50 - }).then((res: any) => { - edit_data.value.name = res.list[0].name - edit_data.value.gender = res.list[0].sex - edit_data.value.phone = res.list[0].phone - edit_data.value.certType = Number(res.list[0].certType) - edit_data.value.certNo = res.list[0].certNo - edit_data.value.memo = res.list[0].remark - edit_data.value.visitType = 1 - }) - } - } + if (!e) return; + isShowCard.value = false + edit_data.value.gender = Number(e.data.baseinfo.gend) + edit_data.value.name = e.data.baseinfo.psn_name + edit_data.value.certType = e.data.baseinfo.psn_cert_type + edit_data.value.certNo = e.data.baseinfo.certno + edit_data.value.age = Math.floor(e.data.baseinfo.age) + tableData.value = e.data.insuinfo + edit_data.value.type = 2 + if (!edit_data.value.certNo) return; + post('vip/vip/list', { + keyword: edit_data.value.certNo, + page: 1, + pageSize: 50 + }).then((res: any) => { + edit_data.value.phone = res.list[0].phone + }) + nextTick(() => { if (tableData.value.length > 0) { height.value = 820 @@ -464,7 +454,12 @@ const changeLoading = (e: any) => { } const isBtnShow = ref(true) const changeBtn = () => { + if (edit_data.value.status == 1 || edit_data.value.status == 3 || edit_data.value.status == 0) return isBtnShow.value = !isBtnShow.value + if (isBtnShow.value) { + time.value = '' + timeList.value = [] + } } const handleCurrentChange = (val: any) => { edit_data.value.insutype = val.insutype @@ -556,10 +551,8 @@ defineExpose({init}) margin-bottom: 2px !important; } -.small-btn { - width: 51px; - height: 32px; - line-height: 32px; - margin-left: 5px; +.disabled { + cursor: not-allowed; + background: rgba(#4D6DE4,.5); } \ No newline at end of file diff --git a/src/components/registration/List.vue b/src/components/registration/List.vue index c5d6b7a..e4820b4 100644 --- a/src/components/registration/List.vue +++ b/src/components/registration/List.vue @@ -7,10 +7,11 @@ > diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue index cf00939..855cbc0 100644 --- a/src/components/settings/MemberEdit.vue +++ b/src/components/settings/MemberEdit.vue @@ -120,9 +120,9 @@ diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue index 0c64d2f..335c4f2 100644 --- a/src/components/settings/SectionEdit.vue +++ b/src/components/settings/SectionEdit.vue @@ -115,9 +115,9 @@ diff --git a/src/components/settings/item/ItemEdit.vue b/src/components/settings/item/ItemEdit.vue index 6f19364..5ab2dad 100644 --- a/src/components/settings/item/ItemEdit.vue +++ b/src/components/settings/item/ItemEdit.vue @@ -5,10 +5,7 @@
    - - 一键建档 - + 一键建档
    @@ -77,7 +74,7 @@ import {post} from "@/utils/request.ts"; import {ElMessage} from "element-plus"; import Mask from "@/components/common/Mask.vue"; import ItemSearch from "@/components/settings/item/ItemSearch.vue"; -import UnitSelector from "@/components/inventory/UnitSelector.vue"; +import UnitSelector from "@/components/UnitSelector.vue"; import {itemUnitList} from "@/utils/unitList.ts" const props = defineProps({ diff --git a/src/components/settings/item/ItemSearch.vue b/src/components/settings/item/ItemSearch.vue index d713d90..f41c4dc 100644 --- a/src/components/settings/item/ItemSearch.vue +++ b/src/components/settings/item/ItemSearch.vue @@ -10,7 +10,7 @@ placeholder="请输入药品名称或者编号" @keydown.enter="searchSocialItem" clearable/> - 搜索 + 搜索
    @@ -34,8 +34,8 @@ v-model:current-page="searchResult.pageNum" @current-change="changePage"/>
    - 确认 - 关闭 + 确认 + 关闭
    @@ -137,15 +137,15 @@ const close = () => { display: flex; margin-bottom: 24px; - span { - line-height: 42px; - } - .input { display: block; flex: 1; } + span { + line-height: 1; + } + .default-btn { margin-left: 24px; } @@ -181,7 +181,6 @@ const close = () => { :deep(.el-input__wrapper) { width: 100%; - height: 42px; } .btn { diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue index 863dc14..000a50c 100644 --- a/src/components/settings/item/group/GroupAdd.vue +++ b/src/components/settings/item/group/GroupAdd.vue @@ -76,7 +76,7 @@ @@ -101,7 +101,7 @@ import ItemSearch from "@/components/settings/item/ItemSearch.vue"; const createSearchRef = ref('') import {itemUnitList} from "@/utils/unitList.ts" -import UnitSelector from "@/components/inventory/UnitSelector.vue"; +import UnitSelector from "@/components/UnitSelector.vue"; import {post} from "@/utils/request.ts"; const isShow = ref(false) @@ -225,7 +225,4 @@ defineExpose({init}) padding: 0 24px; } -.small-btn { - width: 50px; -} \ No newline at end of file diff --git a/src/components/settings/item/group/GroupList.vue b/src/components/settings/item/group/GroupList.vue index 915fd4b..6384c03 100644 --- a/src/components/settings/item/group/GroupList.vue +++ b/src/components/settings/item/group/GroupList.vue @@ -3,10 +3,13 @@