Commit Graph

1619 Commits

Author SHA1 Message Date
mashuai 4a62788ad7 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-14 18:03:04 +08:00
mashuai 2a8e060652 bug 2024-05-14 18:02:58 +08:00
binbin_pan e95995911c fix: 1594 报废列表中部分搜索条件无法进行搜索 2024-05-14 17:59:05 +08:00
liang.chao 4ff2059cc6 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-14 17:51:43 +08:00
liang.chao c20ea17df3 宁夏流程及数据权限修改 2024-05-14 17:51:35 +08:00
binbin_pan 0509f94523 fix: 1601 地图没有海南省 2024-05-14 17:47:01 +08:00
liang.chao 95b87226fa 宁夏流程及数据权限修改 2024-05-14 16:44:16 +08:00
BianLzhaoMin 2a284b8d52 合并冲突 2024-05-14 15:54:22 +08:00
BianLzhaoMin 5316d97e2b 优化权限数据流程 2024-05-14 15:53:42 +08:00
binbin_pan 0ce4cc37be 宁夏大屏跳转链接 2024-05-13 14:13:07 +08:00
binbin_pan 4e397af959 bug修复 2024-05-13 13:48:05 +08:00
binbin_pan e64b972cb6 样式问题 2024-05-13 12:06:42 +08:00
binbin_pan ada8e96ccd 宁夏大屏不显示问题 2024-05-13 10:11:43 +08:00
mashuai 602054580a test 2024-05-13 09:27:11 +08:00
BianLzhaoMin 12a1c479ee 优化审核问题 2024-05-11 18:05:49 +08:00
BianLzhaoMin 25586feb2f 优化大屏二级页面不显示问题 2024-05-11 14:38:15 +08:00
liang.chao 86dc06dd54 代码codeview 2024-05-10 17:05:24 +08:00
liang.chao 2c14888e0d 领料申请代码codeview 2024-05-10 15:22:15 +08:00
liang.chao ecdacc0143 领料管理列表展示问题提交 2024-05-10 11:06:49 +08:00
liang.chao 54d057f5b2 领料申请删除bug修改 2024-05-10 09:59:04 +08:00
liang.chao 7ef53ff9fe app退料接收无数据bug修改 2024-05-09 13:29:20 +08:00
mashuai eda8eac15d 权限 2024-05-08 18:43:46 +08:00
mashuai 99761fb49c 权限 2024-05-08 18:23:47 +08:00
BianLzhaoMin f31c01c045 优化流程 2024-05-08 17:43:00 +08:00
BianLzhaoMin 360f2fc5cc 优化权限流程问题 2024-05-08 17:26:31 +08:00
BianLzhaoMin 3db5bbb1f0 优化权限流程 2024-05-08 16:50:01 +08:00
BianLzhaoMin 1272ccda12 优化流程 2024-05-08 15:59:37 +08:00
BianLzhaoMin 8731cdc995 优化 2024-05-07 21:17:16 +08:00
BianLzhaoMin d0d700208f 优化 2024-05-07 17:37:03 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
BianLzhaoMin 8ab553727b Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-07 16:31:11 +08:00
BianLzhaoMin 2463392124 测试问题优化 2024-05-07 16:31:07 +08:00
liang.chao 8b5519223f 测试问题bug修改 2024-05-07 16:29:36 +08:00
BianLzhaoMin b340c8ec01 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-07 11:14:15 +08:00
BianLzhaoMin 5a7856a150 测试问题优化 2024-05-07 11:14:11 +08:00
15856 d92af0df79 导出预报废审核列表 2024-05-07 11:02:36 +08:00
mashuai 0f3675df58 bug 2024-05-07 10:21:12 +08:00
binbin_pan b5e0736479 fix: 1478 待报废中,先输写必填项内容,再将内容删除,点击保存按钮,页面提示操作成功 2024-05-07 09:15:23 +08:00
BianLzhaoMin 4686425fbb 冲突合并 2024-05-06 19:37:14 +08:00
BianLzhaoMin bbd4cd5409 优化测试问题 2024-05-06 19:32:16 +08:00
mashuai 75d2b02422 bug 2024-05-06 18:20:45 +08:00
liang.chao c0394d1f59 Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug 2024-05-06 17:59:58 +08:00
liang.chao 25ad01ce71 bug修改提交 2024-05-06 17:59:30 +08:00
hhui b86f8fd839 fix:报废明细图片添加无数据展示 2024-05-06 17:56:22 +08:00
binbin_pan 2051c7c8d2 fix: 1474 待报废上传图片时,若选择超过3张图片,弹出2次提示 2024-05-06 17:52:21 +08:00
hhui e3c493cfaf fix:修饰入库查询清空 2024-05-06 17:49:02 +08:00
hhui 40ec1a1fc7 fix:维修数量校验 2024-05-06 17:34:41 +08:00
binbin_pan f502ec3294 fix: 1454 内部维修只能添加配件不能删除多余页 2024-05-06 17:30:53 +08:00
liang.chao d3ecfdeaa0 Merge branch 'dev' into dev-cq-bug 2024-05-06 17:09:37 +08:00
liang.chao faab921dae Merge remote-tracking branch 'origin/dev' into dev 2024-05-06 17:07:50 +08:00