Commit Graph

1476 Commits

Author SHA1 Message Date
gmhao 689abd905d 设备标签二改 新增下拉框 2023-12-22 18:49:20 +08:00
zhouxain01 69496ef5fb Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 18:26:55 +08:00
zhouxain01 5adcc35655 修改标签绑定按钮判断 2023-12-22 18:26:50 +08:00
liuchuan 0abdca2751 后台代码提交 2023-12-22 17:59:58 +08:00
zhouxain01 1a7fac7cb9 修改标签绑定代码提交 2023-12-22 17:29:57 +08:00
zhouxain01 aa2a2a7ab0 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 17:14:02 +08:00
zhouxain01 5ead43e5df 修改基础管理代码提交 2023-12-22 17:13:57 +08:00
gmhao 2495ce88f5 设备标签二改 新增下拉框 2023-12-22 17:07:32 +08:00
syruan 04d79ac8b0 完善领料申请修改逻辑 2023-12-22 16:24:25 +08:00
cwchen d51ec0bbf3 统一下拉选-设备树添加company_id 2023-12-22 16:17:57 +08:00
bns_han 0172196653 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 15:58:14 +08:00
bns_han b71ca1e957 后台-退料申请与审核 2023-12-22 15:57:59 +08:00
wlikett 7898ac0abd Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 15:57:36 +08:00
wlikett 7bcd950052 设备级联搜索处理 2023-12-22 15:57:21 +08:00
bns_han 5275483a0e 后台-退料申请与审核 2023-12-22 15:57:10 +08:00
13218645326 2a4b8420f6 退料 2023-12-22 15:55:19 +08:00
wlikett 9d8bd6d94b 领料任务详情接口对接 对接 2023-12-22 15:33:24 +08:00
syruan 9fa297de47 合并分支,解决异常冲突 2023-12-22 15:23:07 +08:00
syruan 3e1839ce64 合并分支,处理冲突异常 2023-12-22 15:21:18 +08:00
syruan bf0c462853 删除领料明细接口提交 2023-12-22 15:10:27 +08:00
sliang 6d642b7edf 获取领料申请-详情列表 2023-12-22 14:48:58 +08:00
bns_han 7f1e051e42 后台-退料申请与审核 2023-12-22 14:13:53 +08:00
zhouxain01 0ec118efb4 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 14:06:04 +08:00
zhouxain01 8aa87bdec8 修改标签相关代码 2023-12-22 14:05:57 +08:00
gmhao 54eed165b5 设备标签缺陷 2023-12-22 13:56:28 +08:00
cwchen 54a6c380d0 修试入库 2023-12-22 13:43:58 +08:00
cwchen f92c7f4489 修试入库 2023-12-22 13:40:46 +08:00
cwchen 1bbfc1dd73 修试入库 2023-12-22 12:32:01 +08:00
cwchen 308d8e343c 修试入库 2023-12-22 11:21:10 +08:00
bns_han 8d7e961f80 后台-退料申请与审核 2023-12-22 11:05:45 +08:00
cwchen f7ef5c629e 修试入库修改 2023-12-22 10:03:23 +08:00
bns_han a4850f1d40 后台-退料申请与审核 2023-12-22 00:16:53 +08:00
bns_han a428cf7658 后台-退料申请与审核 2023-12-22 00:13:15 +08:00
13218645326 5c50ce4706 编辑禁用上级选项 2023-12-21 20:44:28 +08:00
13218645326 4990efa585 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2023-12-21 20:31:37 +08:00
13218645326 2ab516141f 接口调试配件管理 2023-12-21 20:31:22 +08:00
dingjie 2380e9a695 配置文件修改 2023-12-21 20:29:12 +08:00
dingjie 1e77850c42 Merge remote-tracking branch 'origin/dev' into dev 2023-12-21 20:28:46 +08:00
dingjie 881b8b80df 新购验收模块 2023-12-21 20:28:01 +08:00
liuchuan d2760e9d66 Merge remote-tracking branch 'origin/dev' into dev 2023-12-21 20:25:21 +08:00
liuchuan 04bb0c890f 后台维修代码提交 2023-12-21 20:24:45 +08:00
zhouzy062 bb40579796 新购验收编码管理-1221-zzy 2023-12-21 20:24:30 +08:00
bns_han 5564d3d391 后台-退料申请 2023-12-21 20:17:36 +08:00
sliang b19a375a4b 工机具管理-库管员配置;维修班配置 2023-12-21 18:35:36 +08:00
gmhao 3a5e6f503a 修改 2023-12-21 18:09:56 +08:00
wlikett bd608032e0 对接领料申请列表时间字段更新 2023-12-21 17:59:42 +08:00
wlikett 610ec741be 对接领料申请列表 和 提交领料申请 2023-12-21 17:57:21 +08:00
zhouxain01 e570a174d0 Merge remote-tracking branch 'origin/dev' into dev 2023-12-21 17:54:34 +08:00
zhouxain01 87f8d807f8 修改修试相关代码 2023-12-21 17:54:28 +08:00
cwchen 31ffacfc04 下拉选-设备类型树修改 2023-12-21 16:34:28 +08:00