Commit Graph

2492 Commits

Author SHA1 Message Date
shijing 208c0aee5c fix:coding#560二、1性能检验改动 2024-11-27 14:28:27 +08:00
zty 52aa3b167b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-27 09:51:58 +08:00
zty cdf271877d feat:tkx 页面修改 2024-11-27 09:51:34 +08:00
shijing 29597f1348 #502coding:13、添加批次序号 预备用 2024-11-27 09:28:24 +08:00
shijing cc1bc5c129 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-27 09:22:38 +08:00
shijing cea727a691 fix:大屏动态获取公告 2024-11-27 09:22:35 +08:00
caoqianming 3b7458d683 feat: 外协和磨抛一次抛2 2024-11-26 22:31:27 +08:00
caoqianming ae365ee383 feat: 外协和磨抛一次抛 2024-11-26 22:23:04 +08:00
caoqianming 03780360ac feat: 设备取消是否删除的筛选 2024-11-26 17:51:03 +08:00
caoqianming 17dc188e25 fix: 车间入库时depts查询报错 2024-11-26 16:58:52 +08:00
zty a9cb7c918b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-25 18:33:11 +08:00
zty 893f7a6cd7 fix : 修改 tkx 工序内容 2024-11-25 18:32:52 +08:00
shijing 63c7929ea3 feat:新增返工统计页面,车间库存检验统计 2024-11-25 17:24:10 +08:00
shijing a4eeb13b2f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-25 10:25:08 +08:00
shijing 78d82b6f3f fix:字段更正 2024-11-25 10:25:05 +08:00
caoqianming eabdabcf3a feat: mlog不再进行审计 2024-11-24 17:42:32 +08:00
caoqianming 4c003251c1 feat: base 修改xtui名称 2024-11-24 17:41:22 +08:00
shijing 61c03414c0 fix:article中form清空与复现 2024-11-22 17:24:32 +08:00
shijing 34d3099ed6 feat:添加公告视频列表页面 2024-11-22 15:46:41 +08:00
shijing 5c0f9acf2f fix:gx获取工段用name查询 2024-11-22 11:32:47 +08:00
shijing 37eacdadfe fix:光芯大屏更新 2024-11-22 11:21:17 +08:00
shijing 4e1a6901fd fix:tool中修改格式化日期方法 2024-11-22 10:00:29 +08:00
shijing b92937fb9b fix:交接记录手动添加时多选物料 2024-11-22 09:59:32 +08:00
shijing 6a7975e6ce fix:大屏更改 2024-11-21 13:28:28 +08:00
shijing 0752000f24 fix:coding交接变动 2024-11-21 13:27:54 +08:00
shijing 4d8bf81be3 fix:成品检验车间库存放开检验 2024-11-21 13:27:18 +08:00
shijing 6a50019343 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-21 13:24:42 +08:00
shijing 431fcf4bd8 fix:尺寸外观(成品)检验添加检验设备和备注 2024-11-21 13:24:38 +08:00
caoqianming 78053dac34 fix: 标记位置加载js报错的问题 2024-11-20 17:39:05 +08:00
caoqianming fed5c23a28 fix: user处element升级导致的switch颜色处理 2024-11-20 15:52:10 +08:00
caoqianming 014da8f587 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-20 15:49:31 +08:00
caoqianming 5cefd84ded feat: 设备管理is_deleted可查 2024-11-20 15:49:16 +08:00
shijing 05649491ab Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-19 16:31:22 +08:00
shijing 38c84fa1e9 fix:高echarts改动 2024-11-19 16:31:18 +08:00
caoqianming e94d3194ef feat: 成品检验依据子项确定抽检数等 2024-11-19 15:23:04 +08:00
caoqianming 1849fe6eef feat: 修改xtSelect 的高度 2024-11-19 15:16:02 +08:00
caoqianming 7fe603dbc2 fix: scTable refresh问题 2024-11-15 18:51:51 +08:00
caoqianming 3376d9c5af Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 18:31:56 +08:00
caoqianming 234e5ca216 feat: mtask查看可用批次 2024-11-15 18:31:35 +08:00
shijing 231b306829 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 14:46:27 +08:00
shijing 4d21ef3a65 fix:大屏优化 2024-11-15 14:46:24 +08:00
caoqianming cbd7ec9e8d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 14:39:51 +08:00
caoqianming 04d4129f98 feat: 图标展示优化 2024-11-15 14:39:30 +08:00
zty 3b71931f3a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-15 14:07:54 +08:00
zty cc5df7b2b3 feat:修改 tkx 计算系数 和 backup --delete 2024-11-15 14:07:50 +08:00
caoqianming 890a344082 feat: base 系统路由中dashboard函数获取 2024-11-15 09:27:56 +08:00
zty b0d0df97be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-14 17:45:08 +08:00
zty b7a420c576 fix tkx bug 2024-11-14 17:44:54 +08:00
shijing feeeaf423e fix:光芯大屏更新视频公告 2024-11-14 11:23:08 +08:00
shijing bfd3f5e7f9 fix:coding#502-2 2024-11-14 11:21:46 +08:00