jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
636 Commits 134 Branches 0 Tags
a7028e00f90d29dcf14cdb6704e781aba0256815
Commit Graph

636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WEB许何哲\xuhez
a7028e00f9 tree视图表格中字段样式的修改 2023-07-18 17:09:17 +08:00
禹翔辉
66f0097b80 Accept Merge Request #268: (feature/创建工作日历代码测试 -> develop) 
Merge Request: 工作日历设置---新增将中文的星期转换成英文的星期的方法，删除了大部分日志。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/268?initial=true
 2023-07-18 16:27:26 +08:00
yuxianghui
b5484ecda6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试 2023-07-18 16:27:42 +08:00
yuxianghui
2462c3774d 工作日历设置---新增将中文的星期转换成英文的星期的方法，删除了大部分日志。 2023-07-18 16:27:24 +08:00
杨金灵
baf13117dc Accept Merge Request #267: (feature/夹具型号新增搜索面板 -> develop) 
Merge Request: 优化夹具型号功能

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/267?initial=true
 2023-07-18 16:21:16 +08:00
jinling.yang
988f70bf69 1.夹具型号新增搜索面板 
2.夹具查询列表新增创建人和创建时间字段展示
 2023-07-18 16:20:09 +08:00
禹翔辉
4f60118f37 Accept Merge Request #266: (feature/创建工作日历代码测试 -> develop) 
Merge Request: 新增工作日历设置的日志   

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/266?initial=true
 2023-07-18 14:37:03 +08:00
yuxianghui
b7e1bff0f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试 2023-07-18 14:37:00 +08:00
yuxianghui
a0758b4b61 新增工作日历设置的日志 2023-07-18 14:36:44 +08:00
许何哲
b614eed79d Accept Merge Request #265: (feature/修改logo图片 -> develop) 
Merge Request: 修改登录页面logo

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/265?initial=true
 2023-07-18 11:36:41 +08:00
WEB许何哲\xuhez
b22cc7f19f 修改登录页面logo 2023-07-18 11:36:12 +08:00
龚启豪
a11dcc16f0 Accept Merge Request #264: (feature/修改设备基础参数 -> develop) 
Merge Request: 修改设备菜单以及二级菜单结构

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/264?initial=true
 2023-07-18 10:48:29 +08:00
qihao.gong@jikimo.com
8333a834fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 2023-07-18 10:47:43 +08:00
qihao.gong@jikimo.com
fc93d5c646 修改设备菜单名称以及二级目录结构 2023-07-18 10:47:23 +08:00
禹翔辉
92a04d5f2a Accept Merge Request #263: (feature/创建工作日历代码测试 -> develop) 
Merge Request: 优化产线设备资源设置的form视图界面名字显示

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/263?initial=true
 2023-07-18 10:30:08 +08:00
yuxianghui
ff0786def7 优化产线设备资源设置的form视图界面名字显示 2023-07-18 10:30:01 +08:00
yuxianghui
4907f06183 添加工作日历设置创建工作日历时的输出日志 2023-07-18 09:45:53 +08:00
禹翔辉
ad5a8c06a5 Accept Merge Request #262: (feature/创建工作日历代码测试 -> develop) 
Merge Request: 添加工作日历设置创建工作日历时的输出日志

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/262?initial=true
 2023-07-18 09:45:15 +08:00
许何哲
749765c85d Accept Merge Request #261: (feature/一级菜单收起 -> develop) 
Merge Request: 一级菜单点击收起

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/261?initial=true
 2023-07-18 09:27:43 +08:00
WEB许何哲\xuhez
aafa9317e0 一级菜单点击收起 2023-07-18 09:26:02 +08:00
杨金灵
628a74c3f7 Accept Merge Request #260: (feature/去掉不用的代码 -> develop) 
Merge Request: 去掉不要的引用

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/260?initial=true
 2023-07-17 17:36:50 +08:00
jinling.yang
9a392eebad 去掉不要的引用 2023-07-17 17:35:55 +08:00
许何哲
f67850461f Accept Merge Request #259: (feature/一级菜单点击收起 -> develop) 
Merge Request: 一级菜单点击收起

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/259?initial=true
 2023-07-17 17:32:35 +08:00
WEB许何哲\xuhez
ad60e1a624 一级菜单点击收起 2023-07-17 17:32:11 +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