Commit Graph

766 Commits (498069b3d7d50dd55146e8c71450572d441d2643)

Author SHA1 Message Date
wj ae556b2c77 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
wj 348f5c87f3 文件格式判断 2 years ago
wangwei 83fe55b767 发票修改 2 years ago
wj 15ffb201d1 测试自动触发 2 years ago
wj 11439f10bf Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
wj a310ed4f9d 检验报告去除pdf和doc 2 years ago
anthonywj 07461dc75a Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 78ec4af3f8 新增字段排序 2 years ago
wangwei 440c3f12cf 发票优化调整 2 years ago
CTP 72f3eb5514 发票登记 按钮大小优化 2 years ago
CTP e02c1328d5 发票登记按钮优化 2 years ago
wangwei ca33251466 发票修改 2 years ago
wangwei 02bb4ca48f 发票修改 2 years ago
anthonywj ecbc552596 同步界面修改 2 years ago
CTP 879b458a21 Merge branch 'CTP' 2 years ago
CTP 7517e4a27b 操作日志 修改操作状态bug 2 years ago
CTP d2b76cfe40 登录日志 优化代码 2 years ago
wangwei 2473e562dc 发票修改 2 years ago
anthonywj c18a159f88 新增DI版本更新,单据类型修改 2 years ago
wj 099d99767f 同步按钮 2 years ago
wj a8c62fcfe3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/sync/SysUdimsData.vue
2 years ago
wj df9884913c 按钮 2 years ago
CTP 82f3c5b229 页面注释 2 years ago
CTP 4509e12005 添加注释 2 years ago
anthonywj dfb14d2f97 bug修改 2 years ago
anthonywj a2f288f0ad 界面优化备份 2 years ago
anthonywj 2bd4195f23 bug修改 2 years ago
郑明梁 10fe2316d2 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 a429a22628 第三方仓库关闭报错问题 2 years ago
anthonywj 017a8a1c14 bug修改 2 years ago
wj 2166328173 测试环境调整 2 years ago
wj 0ff5ef9b02 Merge remote-tracking branch 'origin/master' 2 years ago
wj 3de15f5611 测试环境调整 2 years ago
CTP 72bc4d6c07 物资分类 样式问题 2 years ago
CTP 71fab3d42e 加点注释 2 years ago
CTP ef27491d40 引入采购部门 收货仓库 接口 2 years ago
wangwei 8c14224b59 修改异常单据中 仓库 和单据类型没有联动问题 2 years ago
郑明梁 9f51db02fa 模板打印修改类型 2 years ago
CTP 96b5801f38 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP 1664afe312 物资字典维护 下方横向滚动条隐藏 2 years ago
wj 8448a9d03e Merge remote-tracking branch 'origin/master' 2 years ago
wj d1e1c39ef0 增加下载文件 2 years ago
CTP 1dc45a42f8 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP d5eedc2d25 物资字典维护 表格内滚动条隐藏 2 years ago
anthonywj 43d0bed4bd 拣货字段修改 2 years ago
anthonywj b35aac7217 新增三期拣货,无三期拣货,为配货等页面 2 years ago
曹晨晨 86fab2bb90 取消分页滚动顶部效果 2 years ago
CTP 1e5f232337 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP 0b018f6aae 物资字典维护 侧边树形展示 2 years ago
wangwei 79cfe14333 修改内部码 查询的时候 子表数据未清空 2 years ago
wangwei fb0eea6537 修改供应商物资字典 进入页面显示数据 问题 2 years ago
wangwei bae65e478f 修改字典导入 查询问题 2 years ago
wangwei be9a62eb14 修改 资质预警信息搜索问题 2 years ago
wj 5e06beed6f Merge remote-tracking branch 'origin/master' 2 years ago
wj 4c598205d9 同步任务页面调整 2 years ago
x_z 1c4b8cd1e5 1.修复bug 2 years ago
CTP 70b2954286 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP ed5dada8af 仓库信息 页面改动 2 years ago
wangwei 43e316414d 修改 物资分类 绑定重置之后数据与初始数据不符合 2 years ago
wangwei d129c20613 修改bug 2 years ago
anthonywj 2572425673 新增三期拣货,无三期拣货,为配货等页面 2 years ago
wangwei a7f2865935 同步 修改关联仓库问题 2 years ago
x_z f080d9ffc2 1.同步货位功能代码调整 2 years ago
wangwei 79e7a45877 关联第三方仓库 添加重置按钮 2 years ago
anthonywj 59ca76d301 发票登记数量 2 years ago
anthonywj a03ed7bd0f 相关bug收尾 2 years ago
anthonywj 8d026cc9d8 Merge remote-tracking branch 'origin/master' 2 years ago
CTP 1bb61a936d Merge branch 'CTP' 2 years ago
CTP b128d7af1e 底部a标签 水平居中 2 years ago
CTP fd2e7c35ad 登录页面 滑动验证和禁止滚动优化 2 years ago
曹晨晨 32d6ff4530 仓库类型修改 2 years ago
anthonywj d0013638ac Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 1600c63093 修改 仓库查询问题 2 years ago
郑明梁 81024af59f Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 5a6990d3b2 模板打印修改筛选 2 years ago
wangwei 9919a0651d 不能对一级部门移除 2 years ago
CTP 486da451f0 注册页面 统一社会信用号 校验 2 years ago
anthonywj 1ca3248031 Merge remote-tracking branch 'origin/master' 2 years ago
CTP 91e49843a1 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP ebeaa2e3f2 点击删除选中当前行 2 years ago
CTP e9cf297ddd 删除选中当前行 2 years ago
anthonywj f83987ba9b Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 b80e244d0d 资质修改bug 2 years ago
郑明梁 6c46433cb7 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 fb9791ba6a 去除没用代码 2 years ago
wangwei c167ed3283 修改 bug 2 years ago
anthonywj 18e4d4fe18 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	vue.config.js
2 years ago
anthonywj dd2b8f3a45 过期校验 2 years ago
CTP c6923e7bf5 同步设置 下拉框禁用 2 years ago
CTP 6f47023516 拉取主分支 2 years ago
anthonywj a0767fda37 同步修改 2 years ago
anthonywj cd73415433 库存产品修改 2 years ago
anthonywj de84549490 库存产品修改 2 years ago
CTP 2e8c0618e6 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP 520cd925eb 部门信息 点击新增 编辑按钮 选中当前行 2 years ago
CTP dfeb0b354f 部门信息 点击新增 编辑按钮 选中当前行 2 years ago
曹晨晨 de52881cca 修改bug 2 years ago
曹晨晨 f25276f639 部门信息初版优化 2 years ago
曹晨晨 550778d417 Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
曹晨晨 116f50f812 修改运行参数设置bug 2 years ago
CTP 7d994ef3ac Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP 4b31c1131a Merge branch 'CTP' 2 years ago
CTP a38661ac0b 撤销默认显示 2 years ago
郑明梁 ec7ea1c452 修改物资表格显示字段 2 years ago
CTP c71c627b14 Merge branch 'CTP' of http://116.204.71.86:3000/UDI/udi-spms-vue into CTP 2 years ago
CTP cadf2371ad 回退版本 2 years ago
郑明梁 46db6a5ee9 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 f6f1d3c0c5 修改下载模块代码 2 years ago
wj eab8f08ed0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	vue.config.js
2 years ago
wj 29321708a6 同步任务页面调整 2 years ago
wangwei 17a67276aa Merge remote-tracking branch 'origin/master' 2 years ago
wangwei eb111d4a86 修改 内部码问题 2 years ago
郑明梁 6247b8d7cb 物质分类代码提交 2 years ago
CTP bf1a61a241 Merge branch 'CTP' 2 years ago
CTP d2cb430198 部门信息 进入页面第一行默认高亮 2 years ago
wangwei 6933a43dad 修改bug 2 years ago
郑明梁 8a9909bef0 内部码打印代码提交 2 years ago
wangwei b8bb37f6ed 修改bug 2 years ago
CTP 131f6d1b43 console.log注释 2 years ago
CTP da10e18b7b Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue 2 years ago
CTP 3ea122603d 同步设置 同步代码 2 years ago
anthonywj ef1c22f0a1 预验收,寄售库存查询,自动建出入库单修改 2 years ago
郑明梁 9f2dfa497f 内部码打印代码提交 2 years ago
wangwei 36dca1d91e 修改bug 2 years ago
CTP 05f6ea29d3 标签丢失 2 years ago
wangwei ad1d03df92 修改bug 2 years ago
CTP 33904345ac 解决登录输入框样式覆盖问题 2 years ago
CTP b7db354fee 拉取代码 2 years ago
曹晨晨 e16bac071e 单据类型文字修改 2 years ago
anthonywj 1bcb58eee8 仓库类型调整 2 years ago
曹晨晨 04c34f2ca0 添加仓库类型 2 years ago
郑明梁 8fcb57f02e 内部码打印代码提交 2 years ago
CTP d5a6fac79d 注册页面表单校验 2 years ago
CTP 79e1091fa8 1级医院表格删除按钮禁用 2 years ago
anthonywj e2b95ab3d7 扫码相关bug修改 2 years ago
x_z 55c2dab3f3 1.修复带票库存查询页面供应商名称查询不到数据的问题 2 years ago
anthonywj 56f9bfff14 新增创建单据模式 2 years ago
曹晨晨 e17f5d4a37 tabel默认首条选中部门信息页测试 2 years ago
郑明梁 00df6ef8dd 单据类型界面修改 2 years ago
anthonywj 6ff5b2a359 排序 2 years ago
x_z a4c6541780 1.修复bug 2 years ago
wangwei 23825fdb2f 生成内部吗问题 2 years ago
郑明梁 3d3a14fa5c Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 6ffbd44cf5 单据类型界面修改 2 years ago
wangwei 999702784c 修改bug 2 years ago
wangwei 23c8f26b9a 修改bug 2 years ago
wangwei df0b9c1c21 调整仓库 2 years ago
郑明梁 97e4d637b1 供应商发票确认功能提交 2 years ago
曹晨晨 7ef7963fb1 全局表格样式优化 2 years ago
曹晨晨 a191022eef data值修改 2 years ago
曹晨晨 ab2c468ad5 运行参数分类校验 2 years ago
郑明梁 96e8ca81da 修改打印界面 2 years ago
郑明梁 617e12a336 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei e97ece79e9 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj d54284282c 新增预验收库存查询,预验收明细查询 2 years ago
wangwei a34b8f7435 调整单据类型设置 2 years ago
郑明梁 380e20d9e1 默认用户给一级部门 2 years ago
郑明梁 2fa57459a7 仓库修改寄售功能代码提交 2 years ago
郑明梁 6f673f4449 部门仓库添加供应商字段显示 2 years ago
郑明梁 65b9fcdd01 部门一级不允许修改状态 2 years ago
曹晨晨 211a67fb29 修复token过期未清除bug 2 years ago
x_z a4594ad8ff 1.修复库存预警信息,预验收入库查询bug 2 years ago
郑明梁 baf0bfc16f 用户拉取部门修复 2 years ago
wangwei d364ffccb0 修改bug 2 years ago
郑明梁 e61ba4d880 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 256fe1ad91 单据类型编辑关闭页面刷新 2 years ago
wangwei a2f3faa28f 发票页面调整 2 years ago
郑明梁 bfdea283a2 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 2560c42e4c 部门点击编辑出现数据错乱修复 2 years ago
x_z 3a5ab5a4b9 1.修复库存查询供应商名称候选数据查不到的问题 2 years ago
郑明梁 85abafc129 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 80e3ceff5e 资质打印修改 2 years ago
wangwei 1416eae44d 物资字典维护 页面调整 2 years ago
wangwei 2c5c98863e 页面调整 2 years ago
郑明梁 4a2f5db5ca 仓库和部门功能修改 2 years ago
wangwei 1f0378e1a9 输入框可清除 2 years ago
anthonywj 699a14f2d8 单据撤回,耗材字典删除 2 years ago
wangwei f44e952e82 修改bug 2 years ago
anthonywj a38b2e34f4 单据扫码单据过滤 2 years ago
wangwei 6cd6c15821 修改bug 2 years ago
x_z 9226a22b06 1.修改部分bug 2 years ago
wangwei a320b99ed0 对输入框输入的内容做验证 2 years ago
郑明梁 7c6cc57a12 修改仓库新增修改问题 2 years ago
郑明梁 6dc130bd32 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 6e22378715 资质证书去掉doc提示 2 years ago
wangwei 872ce97167 修改 核对送货单 点击重置创建时间清空 2 years ago
anthonywj aff599171e Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj a40f2d00fd 内部平衡调拨候选问题 2 years ago
wangwei b30262141f 修改 供应商账号中 启用使用单元 科室多次使用出库 显示错误问题 2 years ago
郑明梁 aff910758f 物资申请没有耗材备注字段 2 years ago
x_z 748b72eb46 1.修改样式 2 years ago
x_z 6370603e99 1.修改导出文件格式为UDI 2 years ago
wangwei 42550fa7cc Merge remote-tracking branch 'origin/master' 2 years ago
wangwei dfe97329ae 物资字典导出 输入框调整为可清除 2 years ago
郑明梁 4e092b7aa4 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 48408159b4 物质字典参数设置bug修复 2 years ago
wangwei 04b4cc93ea 调整物资字典导入按钮 2 years ago
郑明梁 a5093eaddc Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 c80329dbaa 院内分类名字重复修复 2 years ago
wangwei 57fadb3fa8 带校验单据 业务扫码校验 去除搜索框 2 years ago
郑明梁 f02112a8bb Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 bc45eefeb5 基础数据bug修改 2 years ago
x_z 612d3ffdd4 1.修复bug 2 years ago
wangwei 4077aa17a1 修改bug 2 years ago
wangwei 96822524b8 修改分页bug 2 years ago
郑明梁 f723cf41ef Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 2564b0288f 资质产品选入修改 2 years ago
wangwei 3cc47682cd 库存预警调整 2 years ago
郑明梁 a34792a666 单据类型bug 2 years ago
郑明梁 449f9aca72 修改审核拉取角色问题 2 years ago
郑明梁 82d9db225f Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 02289174e8 修改资质审核问题 2 years ago
wangwei b23dda2693 修改bug 2 years ago
x_z 95ccc12d6a 1.修复部分bug 2 years ago
wangwei 401f0f5bbd 修改用户管理bug 2 years ago
anthonywj 331a58af7d 单据核对,审核扫码问题 2 years ago
x_z 0273eea91e 1.修复物资分类问题 2 years ago
wangwei 83e1749d08 修改bug 2 years ago
郑明梁 64ed518727 内部码打印问题 2 years ago
wangwei 9fda17a24e 新用户审核 校验角色 2 years ago
x_z 200e003cd5 1.修复单据类型导入上传文件URL拼接方式 2 years ago
wangwei 1740a666c9 操作日志 登录日志 删除类型状态 状态字段 2 years ago
x_z 0537c8b525 1.修复部门用户页面问题
2.修复耗材字典关联解绑失效问题
2 years ago
郑明梁 087fb6783f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/supplier/company/basicCompanyProducts.vue
2 years ago
郑明梁 7cd2b210f8 产品和资质问题修改 2 years ago
wangwei efb3f4d724 物资字典分类 列表添加备注字段 耗材字典物品编码输入框删除多余信息 选入DI信息 过滤掉产品列表 2 years ago
wangwei 08b8d73bac 入院物资维护 修改列表字段 2 years ago
wangwei 69fb56c08f 修改帮助设置预览 2 years ago
郑明梁 088c34d8e8 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 acc62fc743 资质bug修改 2 years ago
x_z 46c047f417 1.库存查询页面添加库存预警设置 2 years ago
wangwei dc1889e316 修改 新增用户 选中不到仓库问题 2 years ago
郑明梁 74df2703b2 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 80043df1a9 耗材bug修复 2 years ago
wangwei 74881f6f4e 新用户审核 角色设置必选 修改审核页面 2 years ago
郑明梁 b8c2583bd8 修改页面样式问题 2 years ago
anthonywj 240499fd66 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 8cbe3fc649 数据同步相关问题 2 years ago
wangwei 072ce1c374 资质审核 输入框可清除 2 years ago
wangwei 86c1b820fe 修改bug 2 years ago
wangwei ba04be815b Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 610e6ec350 修改单据类型设置 输入框可清除 2 years ago
x_z 17504e1c1a 1.修复字典导出失败的问题 2 years ago
wangwei 043e7aed4b 运行参数设置页面 增加重置按钮 2 years ago
郑明梁 56b3dd4eb8 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 d37491f19b 业务管理重置时间问题 2 years ago
wangwei 496c83fe4c 修改用户管理bug 2 years ago
x_z e3d37695b4 1.完善页面细节,修复选入耗材无效问题 2 years ago
郑明梁 f3e190ff90 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 2ee9518201 修改页面样式 2 years ago
x_z 304e3d0c5d 1.修改部分页面的细节 2 years ago
wangwei ab8a18c45d 修改bug 2 years ago
wangwei 04b1a1f4b5 修改bug 2 years ago
wangwei c66d8529aa 修改bug 2 years ago
wangwei 20aed13ec1 修改bug 2 years ago
wangwei 2e38a086d7 修改bug 2 years ago
郑明梁 6fa06ff4a9 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 911ccd3260 仓库功能页面修改 2 years ago
anthonywj e313a78d1a Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 6eaebd3e92 供应商角色与内部角色错乱问题 2 years ago
郑明梁 91674281fa Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 58c6b4392b 修改打印和内部码问题 2 years ago
anthonywj ed3dfd096c 企业证书审核,编号问题 2 years ago
wangwei 5e4e4b61ce 修改bug 2 years ago
wangwei 732d04874b 修改bug 2 years ago
wangwei 09dc97207f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/system/dept/invWarehouse.vue
2 years ago
wangwei ac49343f61 修改bug 2 years ago
郑明梁 64bffcba15 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 eec4e04eda 修改部门和仓库页面问题 2 years ago
wangwei 61a3975100 修改bug 2 years ago
wangwei eace895085 修改bug 2 years ago
wangwei 772cb33242 耗材字典详情添加重置按钮 2 years ago
wangwei b2d2e4eaa5 修改bug 2 years ago
anthonywj 65be7612a2 部门,用户,同步修改 2 years ago
anthonywj c42d1b5b55 同步问题 2 years ago
郑明梁 ed3d229a1b Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 555facb099 修改打印单据问题 2 years ago
anthonywj 6963b2887d 单据条码编辑问题 2 years ago
郑明梁 ff38322edd 修改打印单据问题 2 years ago
anthonywj 8dfdd4c989 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj cd6146acb5 单据类型初始化,去掉默认校验库存 2 years ago
wangwei 6d71e7332b 调整发票登记 2 years ago
wangwei 33dbdc87e4 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 4765a7ee4f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/inout/InvoiceRegistration.vue
2 years ago
x_z 7caf028ce5 1.修复供应商新增送货单可以查到禁用单据类型问题 2 years ago
wangwei c256c8f93d 修改bug 2 years ago
anthonywj 89fb04f56e 界面修改,发票登记相关问题 2 years ago
wangwei 49e159b946 修改bug 2 years ago
anthonywj 06e75285fd 发票登记插入,查询修改 2 years ago
anthonywj ea783fe42b Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj e32822b5e7 界面字段相关修改 2 years ago
wangwei 88119a635e 修改bug 2 years ago
郑明梁 40137d325c Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 a6fce272c9 优化页面代码提交 2 years ago
wangwei a6a4238fcc 修改用户管理 2 years ago
wangwei 622906b0da 修改审核送货单 查询出入库的审核人 2 years ago
wangwei 76a1aadc1b 修改用户管理 角色管理 登陆页面 2 years ago
anthonywj 32cdbdf3a3 新增选入采购订单 2 years ago
anthonywj aa7e48cf0c Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 72dc857549 验收问题修改 2 years ago