jinling.yang
|
0b7dc6d09a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）
|
2023-11-01 17:46:24 +08:00 |
|
龚启豪
|
aa9464face
|
Accept Merge Request #505: (feature/修改机床参数bug -> develop)
Merge Request: 修改维保项目多图片展示
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/505?initial=true
|
2023-11-01 17:35:05 +08:00 |
|
qihao.gong@jikimo.com
|
0c788df2f2
|
修改维保项目多图片展示
|
2023-11-01 17:33:50 +08:00 |
|
mgw
|
74523c710f
|
本地测试优化完序号展示问题，准备线上测试
|
2023-11-01 16:52:26 +08:00 |
|
mgw
|
fc35ef687b
|
优化序号导致字段label变形的问题
|
2023-11-01 12:15:26 +08:00 |
|
mgw
|
869b389420
|
研究下载模板和列宽问题
|
2023-11-01 09:01:49 +08:00 |
|
mgw
|
f81ee155e7
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
|
2023-10-30 15:45:21 +08:00 |
|
mgw
|
76368398ba
|
解决row number导致字段label变形的问题
|
2023-10-30 15:44:45 +08:00 |
|
qihao.gong@jikimo.com
|
4634393f6c
|
修改form全局宽度
|
2023-10-30 11:14:29 +08:00 |
|
jinling.yang
|
46807003e1
|
产品新增刀具物料为刀片，刀盘，刀杆，夹头，刀柄，相关联的字段，及对应页面的优化
|
2023-10-27 17:44:12 +08:00 |
|
qihao.gong@jikimo.com
|
8346f40b79
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
|
2023-10-24 09:41:43 +08:00 |
|
qihao.gong@jikimo.com
|
a9ba65ec17
|
去除输入框居中的样式
|
2023-10-24 09:41:28 +08:00 |
|
马广威
|
a5cb2dc93b
|
Merge branch refs/heads/develop into refs/heads/feature/制造-计划优化
|
2023-10-23 00:21:20 +08:00 |
|
mgw
|
749473f9dc
|
form视图的丢弃按钮增加二次确认功能
|
2023-10-23 00:17:05 +08:00 |
|
qihao.gong@jikimo.com
|
93a6b4ccb4
|
修改设备table布局
|
2023-10-16 17:23:04 +08:00 |
|
马广威
|
cbc298f6ad
|
Accept Merge Request #480: (feature/制造-计划优化 -> develop)
Merge Request: tree视图记录左侧增加序号展示记录数
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/480?initial=true
|
2023-10-16 15:19:08 +08:00 |
|
mgw
|
e02ab7fd95
|
tree视图记录左侧增加序号展示记录数
|
2023-10-16 15:18:18 +08:00 |
|
qihao.gong@jikimo.com
|
53e307cd55
|
修改设备table的样式 修改关联品牌根据各不同类别展示
|
2023-10-12 14:10:29 +08:00 |
|
jinling.yang
|
e586ed8e3b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
|
2023-10-08 17:19:22 +08:00 |
|
qihao.gong@jikimo.com
|
af05d3ec30
|
设备增加AGV小车,机械臂,检测设备参数
|
2023-10-07 17:26:09 +08:00 |
|
mgw
|
9217372097
|
调整代码结构
|
2023-09-26 14:09:25 +08:00 |
|
WEB许何哲\xuhez
|
aba664375f
|
表头固定bug修改
|
2023-09-25 15:10:50 +08:00 |
|
WEB许何哲\xuhez
|
d8363f2637
|
看板添加字段并调整样式
|
2023-09-22 17:33:56 +08:00 |
|
jinling.yang
|
ab42bde8f2
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
|
2023-09-18 17:42:13 +08:00 |
|
jinling.yang
|
a96c7a34c1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复
|
2023-09-18 17:40:30 +08:00 |
|
WEB许何哲\xuhez
|
0ae5d724d6
|
表头固定优化
|
2023-09-15 17:15:35 +08:00 |
|
WEB许何哲\xuhez
|
38331f1501
|
优化表头固定
|
2023-09-15 14:42:12 +08:00 |
|
mgw
|
42cc64db74
|
表头固定
|
2023-09-15 11:17:07 +08:00 |
|
mgw
|
5148ad3952
|
工作中心看板样式修改
|
2023-09-15 10:58:53 +08:00 |
|
mgw
|
db5d9863b1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
# Conflicts:
# jikimo_frontend/static/src/scss/custom_style.scss
# sf_manufacturing/views/mrp_workcenter_views.xml
|
2023-09-15 10:40:30 +08:00 |
|
mgw
|
2cc03c21ed
|
优化图文展示样式
|
2023-09-15 10:37:20 +08:00 |
|
WEB许何哲\xuhez
|
69506af2ab
|
sf看板样式统一
|
2023-09-14 17:23:50 +08:00 |
|
mgw
|
c1739feabb
|
优化现有逻辑
|
2023-09-13 15:40:36 +08:00 |
|
WEB许何哲\xuhez
|
b76c192f33
|
many2many图文展示及点击交互效果
|
2023-09-08 16:31:06 +08:00 |
|
mgw
|
121217d70f
|
custom_many2many widget整合到前端包中
|
2023-09-07 17:54:07 +08:00 |
|
WEB许何哲\xuhez
|
7ea997219b
|
对sf的css样式进行集中管理
|
2023-09-05 17:22:37 +08:00 |
|