hyyy
|
4467865b86
|
取消 -> 放弃保存
|
2025-01-13 17:04:00 +08:00 |
|
hy
|
614447d56e
|
解开屏蔽的方法
|
2025-01-02 10:28:40 +08:00 |
|
黄焱
|
9e5dbc0104
|
Accept Merge Request #1688: (feature/前端样式修改 -> develop)
Merge Request: 修复表格对不齐问题
Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1688?initial=true
|
2024-12-31 10:00:18 +08:00 |
|
hy
|
1816f1a497
|
修复表格对不齐问题
|
2024-12-31 09:45:56 +08:00 |
|
胡尧
|
c124e2962c
|
屏蔽前端代码
|
2024-12-30 16:32:36 +08:00 |
|
hy
|
f1868168af
|
修复会计列表表头少了列bug
|
2024-12-30 14:38:45 +08:00 |
|
hy
|
dc68ecb584
|
计划排程列表和工单列表筛选项和数量显示重叠了
|
2024-11-29 16:26:32 +08:00 |
|
mgw
|
786fca2937
|
调整“驾驶舱”的机床状态与工厂产线实际不一致的问题
|
2024-10-10 14:01:39 +08:00 |
|
胡嘉莹
|
b1fbf4344e
|
Accept Merge Request #1385: (feature/临时分支 -> develop)
Merge Request: 修改custom_many2many_checkboxes组件，优化图片展示方式，及点击图片放大的预览样式
Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1385
|
2024-10-09 16:28:52 +08:00 |
|
hujiaying
|
75e1f5387d
|
修改coustom_many2many_checkboxes组件的展示方式，控制图片展示大小，修改点击预览图展示的样式优化
|
2024-10-09 16:01:12 +08:00 |
|
胡尧
|
457f0aa2ac
|
修复login页logo不显示的问题
|
2024-10-08 09:19:06 +08:00 |
|
胡尧
|
eba9ccf083
|
屏蔽title写死JIKIMO的代码
|
2024-09-26 15:33:39 +08:00 |
|
胡尧
|
0082a308fa
|
修改屏蔽登录页footer
|
2024-09-23 16:37:36 +08:00 |
|
胡尧
|
dd5c9775fc
|
去掉修改网页标题的代码
|
2024-09-23 11:18:40 +08:00 |
|
hy
|
3c50f19e2d
|
保存、取消按钮增加文字提示
|
2024-08-20 10:48:42 +08:00 |
|
hy
|
3e61e31314
|
修改刀具拆解时选择目标货位会出现重叠的现象
|
2024-07-26 15:44:52 +08:00 |
|
hy
|
1c8644983b
|
去除 根据进度条设置水印
修复切换产品3D图bug
修改表格下拉框会被表格下面数据框覆盖的bug
|
2024-07-05 16:02:32 +08:00 |
|
hy
|
2ba9695c34
|
// 修复表格内容覆盖表头bug
|
2024-07-01 09:47:50 +08:00 |
|
黄焱
|
09c56b2c07
|
设置表单页面label文本不换行
|
2024-06-05 17:35:07 +08:00 |
|
黄焱
|
c7df18ace6
|
设置表格横向滚动
|
2024-05-24 14:35:22 +08:00 |
|
黄焱
|
2ba53bbb02
|
// 功能刀具组装单 弹窗样式
|
2024-05-21 17:38:54 +08:00 |
|
黄焱
|
f3c98c9727
|
// 修改 【批量排程】【配送】 按钮UI
|
2024-05-09 11:18:01 +08:00 |
|
mgw
|
be18124186
|
优化制造订单号界面展示效果
|
2024-04-25 09:36:05 +08:00 |
|
黄焱
|
d2f59f6c6a
|
设置【已完成】【报废】等状态的水印
|
2024-04-23 15:38:32 +08:00 |
|
黄焱
|
761d0b0417
|
修复列表总计合计与单项合计错开了一列
|
2024-04-19 15:41:05 +08:00 |
|
黄焱
|
48cba4274b
|
修改因添加表格必填而出现报错问题
|
2024-04-15 17:04:43 +08:00 |
|
黄焱
|
4c9fbab471
|
修改制造模块子页面样式问题
|
2024-04-08 17:17:27 +08:00 |
|
mgw
|
f7f9cf1e43
|
控制cnc只能看到cnc产线；增加必填标识
|
2024-03-27 10:26:46 +08:00 |
|
mgw
|
1212ea0930
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
# Conflicts:
# jikimo_frontend/static/src/js/custom_form_status_indicator.js
|
2024-03-25 16:18:42 +08:00 |
|
mgw
|
ed8c39d005
|
修复员工模块js问题、能力特征哭js问题、设备处问题
|
2024-03-25 16:17:19 +08:00 |
|
黄焱
|
57bfec02eb
|
修改field错误问题
|
2024-03-25 09:07:45 +08:00 |
|
mgw
|
2407d2cfc7
|
移除系统中odoo相关标识、信息
|
2024-03-20 16:15:00 +08:00 |
|
黄焱
|
f639e59b91
|
解决频繁报错弹窗，新增判断
|
2024-03-15 10:10:17 +08:00 |
|
黄焱
|
cdf8e7227c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改
# Conflicts:
# sf_maintenance/views/equipment_maintenance_standards_views.xml
增加owl监听必填标识功能
|
2024-03-14 16:47:20 +08:00 |
|
马广威
|
8117715a02
|
Accept Merge Request #895: (feature/制造代码优化 -> develop)
Merge Request: 修复能力特征库报错：no placeholder
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/895?initial=true
|
2024-03-13 09:44:07 +08:00 |
|
mgw
|
cf5fa70f28
|
修复能力特征库报错：no placeholder
|
2024-03-13 09:42:46 +08:00 |
|
黄焱
|
a705d805c9
|
设置设备模块页面强制必填字段及标识需求【表格】
|
2024-03-11 15:39:15 +08:00 |
|
黄焱
|
d9cbc52928
|
Merge branch refs/heads/develop into refs/heads/feature/前端样式修改
|
2024-03-08 15:14:07 +08:00 |
|
黄焱
|
62e5105191
|
更改表格底部按钮样式
|
2024-03-08 15:11:59 +08:00 |
|
mgw
|
457035e464
|
修改按钮样式、优化权限
|
2024-03-07 11:53:57 +08:00 |
|
mgw
|
3ca5c02880
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2024-03-04 11:52:29 +08:00 |
|
mgw
|
3c0649392e
|
优化代码
|
2024-03-04 11:52:04 +08:00 |
|
黄焱
|
98103bac73
|
修改必填标识js，修改之前必填标识样式
|
2024-03-04 11:21:50 +08:00 |
|
黄焱
|
1c6544ffbf
|
修改，增加强制必填字段方法
|
2024-02-28 14:42:57 +08:00 |
|
黄焱
|
f2c8bd7333
|
修改*样式，增加扫码枪判断
|
2024-02-27 17:57:00 +08:00 |
|
yuxianghui
|
0f8bee120b
|
1、新增必填字段前添加 * 的样式；2、给刀具管理模块的必填字段添加红星样式；
|
2024-02-27 17:15:22 +08:00 |
|
qihao.gong@jikimo.com
|
6461e3a423
|
修改货架货位看板颜色
|
2024-01-25 17:36:34 +08:00 |
|
mgw
|
cffda26ed0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2024-01-18 09:14:25 +08:00 |
|
mgw
|
eefabbd5b3
|
添加列表框，但暂时不启用
|
2024-01-18 09:13:41 +08:00 |
|
黄焱
|
fc2c1e06d9
|
设置modal弹窗样式
|
2024-01-11 15:47:39 +08:00 |
|