jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
613 Commits 134 Branches 31 Tags
aafa9317e09afca8e1c0080e30ab27c2cddf8e09
Commit Graph

613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WEB许何哲\xuhez
aafa9317e0 一级菜单点击收起 2023-07-18 09:26:02 +08:00
jinling.yang
21a594a81e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-07-17 16:51:10 +08:00
jinling.yang
253736221e Merge branch 'feature/页面展示优化' into develop 2023-07-17 16:50:41 +08:00
杨金灵
1252d11bba Accept Merge Request #258: (feature/页面展示优化 -> develop) 
Merge Request: 修复产品模板Bug

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/258?initial=true
 2023-07-17 16:50:17 +08:00
jinling.yang
b1da9ff18b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化 2023-07-17 16:48:44 +08:00
禹翔辉
c6d6937f21 Accept Merge Request #257: (feature/优化生成工作日历记录功能 -> develop) 
Merge Request: 优化产线设备资源设置新建bug 

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/257?initial=true
 2023-07-17 16:48:00 +08:00
yuxianghui
f40655b1af Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 2023-07-17 16:47:57 +08:00
jinling.yang
f68dce9ee2 修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug 2023-07-17 16:46:01 +08:00
yuxianghui
ebda457684 优化产线设备资源设置新建bug 2023-07-17 16:45:52 +08:00
禹翔辉
d9a6d1a803 Accept Merge Request #256: (feature/优化生成工作日历记录功能 -> develop) 
Merge Request: 优化工作日历设置开始时间和结束时间为根据所选班次自动生成

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/256?initial=true
 2023-07-17 16:40:30 +08:00
yuxianghui
fc5a3dcab4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 2023-07-17 16:40:03 +08:00
yuxianghui
5b0df0befd 优化工作日历设置开始时间和结束时间为根据所选班次自动生成 2023-07-17 16:39:30 +08:00
龚启豪
0dd5e5086d Accept Merge Request #255: (feature/修改设备基础参数 -> develop) 
Merge Request: 修改设备参数布局

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/255?initial=true
 2023-07-17 15:45:38 +08:00
qihao.gong@jikimo.com
bb464a2351 修改设备参数布局 2023-07-17 15:44:04 +08:00
马广威
c03d683dcb Accept Merge Request #254: (feature/修改缺陷 -> develop) 
Merge Request: 修复工作中心计划报错的问题，修改制造模块目录结构

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/254?initial=true
 2023-07-17 15:38:49 +08:00
mgw
344fe1b58b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷 2023-07-17 15:37:47 +08:00
mgw
c0d14daf44 修复工作中心计划报错的问题，修改制造模块目录结构 2023-07-17 15:37:23 +08:00
许何哲
cf22c6f6fc Accept Merge Request #253: (feature/表头固定 -> develop) 
Merge Request: 修改表头固定

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/253?initial=true
 2023-07-17 11:10:43 +08:00
WEB许何哲\xuhez
f579875b35 修改表头固定 2023-07-17 11:09:26 +08:00
禹翔辉
b49677d5ba Accept Merge Request #252: (feature/优化生成工作日历记录功能 -> develop) 
Merge Request: 对工作日历设置的name字段进行限制，优化工作日历form视图的显示   

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/252?initial=true
 2023-07-17 11:04:21 +08:00
马广威
6389186851 Accept Merge Request #251: (feature/修改制造目录结构 -> develop) 
Merge Request: 修改制造菜单结构

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/251?initial=true
 2023-07-17 10:58:02 +08:00
mgw
d27fedcd0b 修改原生“作业”为“计划管理” 2023-07-17 10:56:43 +08:00
mgw
c1350f04b7 修改制造目录结构，更改原生“作业”为“计划管理” 2023-07-17 10:56:19 +08:00
yuxianghui
b48c231dcc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 2023-07-17 10:43:47 +08:00
yuxianghui
9752b2e49f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 2023-07-17 10:40:49 +08:00
龚启豪
00795ca3e9 Accept Merge Request #249: (feature/订单计划 -> develop) 
Merge Request: 修改设备模块菜单名称

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/249?initial=true
 2023-07-17 10:40:14 +08:00
yuxianghui
a557a42cf5 对工作日历设置的name字段进行限制，优化工作日历form视图的显示 2023-07-17 10:40:07 +08:00
qihao.gong@jikimo.com
1743801c78 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 2023-07-17 10:39:15 +08:00
qihao.gong@jikimo.com
ad84eedda3 修改设备菜单名称 2023-07-17 10:38:54 +08:00
许何哲
6055921556 Accept Merge Request #248: (feature/tree视图表头固定 -> develop) 
Merge Request: tree视图表头固定

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/248?initial=true
 2023-07-17 10:17:56 +08:00
WEB许何哲\xuhez
b74a029166 tree视图表头固定 2023-07-17 10:15:50 +08:00
qihao.gong@jikimo.com
4bb3ab3e16 维保计划视图优化 2023-07-14 17:27:11 +08:00
禹翔辉
095b707f0c Accept Merge Request #247: (feature/工作日历设置-工作日历表 -> develop) 
Merge Request: 优化刀具管理form视图的name显示

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/247?initial=true
 2023-07-14 17:27:01 +08:00
yuxianghui
992435b1f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表 2023-07-14 17:26:01 +08:00
yuxianghui
a4339d1d67 优化刀具管理的form视图表名显示问题 2023-07-14 17:25:35 +08:00
yuxianghui
9c4f51d5f6 优化刀具管理form视图表名显示问题 2023-07-14 17:24:59 +08:00
禹翔辉
90a71326a9 Accept Merge Request #246: (feature/工作日历设置-工作日历表 -> develop) 
Merge Request: 工作日历设置模型新增查看日历按键，隐藏工作日历菜单 

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/246?initial=true
 2023-07-14 16:07:02 +08:00
yuxianghui
a8e30a5228 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表 2023-07-14 15:02:15 +08:00
yuxianghui
808f57adfb 工作日历设置模型新增查看日历按键，隐藏工作日历菜单 2023-07-14 15:01:56 +08:00
马广威
a71497d3a8 Accept Merge Request #245: (feature/解决工作日历无法创建的bug -> develop) 
Merge Request: 解决冲突与优化结构

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/245?initial=true
 2023-07-14 14:45:03 +08:00
mgw
5b6a563a87 更改库存模块库区相关字段 2023-07-14 14:43:06 +08:00
mgw
3de5a95a98 解决工作日历无法创建的bug 2023-07-14 14:35:22 +08:00
马广威
14283ab5e4 Accept Merge Request #244: (feature/测试皮肤模块 -> develop) 
Merge Request: 修改.gitignore文件，注释忽略lib文件夹部分;修改制造模块依赖

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/244?initial=true
 2023-07-14 12:29:44 +08:00
mgw
3b789d040a 修改制造模块依赖 2023-07-14 12:28:23 +08:00
mgw
f0e7d41ad6 修改.gitignore文件，注释忽略lib文件夹部分 2023-07-14 12:26:21 +08:00
马广威
debcca8b07 Accept Merge Request #242: (feature/修改字段 -> develop) 
Merge Request: 修改关联关系的字段

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/242?initial=true
 2023-07-14 12:00:13 +08:00
mgw
741c2b34bf 修改关联关系的字段 2023-07-14 11:58:56 +08:00
龚启豪
3b8ea6874b Accept Merge Request #241: (feature/订单计划 -> develop) 
Merge Request: 更换数据库

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/241?initial=true
 2023-07-14 10:45:39 +08:00
qihao.gong@jikimo.com
381505bd9d 更换数据库 2023-07-14 10:45:02 +08:00
许何哲
28b6f854cb Accept Merge Request #240: (feature/主题logo添加中文 -> develop) 
Merge Request: 添加中文logo

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/240?initial=true
 2023-07-14 10:38:18 +08:00