 shijing
|
a3b2c0a2b5
|
fix:退货放行单日志提交时上传excel文件，并存在日志里
|
2024-09-04 13:37:02 +08:00 |
|
shijing
|
67b5d82545
|
fix:原料检验时备注为保存修正
|
2024-09-04 11:38:14 +08:00 |
|
shijing
|
85e2bf1078
|
fix:车间库存添加检验记录页面，退火日志审批时控制页面按钮
|
2024-09-04 09:50:46 +08:00 |
|
shijing
|
ee973ca0da
|
fix:添加黑化工段库存检验
|
2024-09-03 17:31:48 +08:00 |
|
shijing
|
9675c51e49
|
fix:文案修改，冷却时间
|
2024-09-03 16:33:12 +08:00 |
|
shijing
|
8b2c575a2d
|
fix:日志输入物料添加该批次所在层数的备注
|
2024-09-03 15:31:59 +08:00 |
|
shijing
|
ed0d2a8cad
|
fix:mlogb检验的form表单(全检/抽检)
|
2024-09-03 15:30:22 +08:00 |
|
shijing
|
1a291c6a2e
|
fix:添加车间出入库记录中间页
|
2024-09-03 15:28:53 +08:00 |
|
shijing
|
b69038d369
|
fix:工段库存检验可抽检，可全检
|
2024-09-03 15:27:18 +08:00 |
|
shijing
|
c009cf68ec
|
fix:退火工序日志交接时出发审批，破碎数改为加工前不良
|
2024-09-03 15:25:25 +08:00 |
|
shijing
|
54d00c660a
|
fix:退货放行单审批
|
2024-09-03 15:21:16 +08:00 |
|
shijing
|
abb4ea8d24
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-03 15:20:00 +08:00 |
|
shijing
|
ded2507d02
|
fix:mlog只有黑化和退火时添加保温时间和退火时间
|
2024-09-03 15:19:57 +08:00 |
 caoqianming
|
18fa08f3f2
|
feat: 改变主界面logo配置
|
2024-08-30 14:01:24 +08:00 |
|
shijing
|
25e4b9f5c9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-30 09:10:57 +08:00 |
|
shijing
|
3274b9361e
|
fix:工艺路线添加时route的高度调整
|
2024-08-30 09:07:15 +08:00 |
|
caoqianming
|
f8c6e51a39
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:55:03 +08:00 |
|
caoqianming
|
4963645672
|
feat: 基础配置修改图标
|
2024-08-29 13:55:00 +08:00 |
|
shijing
|
ddb17c9df3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-29 13:33:39 +08:00 |
|
shijing
|
eb56c827ef
|
fix:合格数统计工段展开
|
2024-08-29 13:33:35 +08:00 |
|
caoqianming
|
06bbc7c776
|
fix: 计算中心页面调整
|
2024-08-29 12:52:06 +08:00 |
|
caoqianming
|
dbc65739ce
|
feat: 计算公式字段加大
|
2024-08-29 12:51:20 +08:00 |
|
caoqianming
|
86dc38f847
|
fix: routeForm is_autotask默认为true
|
2024-08-29 11:47:32 +08:00 |
|
caoqianming
|
f636d549c0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-28 17:18:23 +08:00 |
|
caoqianming
|
bb1a63437a
|
feat: 添加计算中心及相应的js
|
2024-08-28 17:18:14 +08:00 |
|
caoqianming
|
b6857c3ab8
|
feat: 添加空白控制台
|
2024-08-28 17:17:50 +08:00 |
|
caoqianming
|
1674f56a58
|
feat: 添加时间策略页面
|
2024-08-28 17:17:36 +08:00 |
|
shijing
|
3e146f7d26
|
fix:过程与成品检验添加不合格列
|
2024-08-28 16:02:53 +08:00 |
|
shijing
|
14e2fe211d
|
fix:光芯合格数统计
|
2024-08-28 14:02:07 +08:00 |
|
shijing
|
2a0bcc4692
|
fix:更改宽度
|
2024-08-28 14:01:28 +08:00 |
|
shijing
|
146a2e086c
|
fix:外观检验添加棕圈
|
2024-08-28 14:00:54 +08:00 |
|
shijing
|
d6cef78446
|
fix:物料清单下载模板时添加时间戳
|
2024-08-27 16:36:35 +08:00 |
|
shijing
|
880c655e63
|
fix:coding#4511
|
2024-08-27 16:09:04 +08:00 |
|
shijing
|
ce51133d4c
|
fix:黑化车间车间看板权限控制
|
2024-08-27 15:03:21 +08:00 |
|
shijing
|
5017710f33
|
fix:coding#445
|
2024-08-27 14:45:20 +08:00 |
|
shijing
|
826d7db102
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:18:32 +08:00 |
|
shijing
|
d56d6d22e1
|
fix:coding#446
|
2024-08-27 14:18:28 +08:00 |
 Li xia
|
33a55ffa65
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 14:03:27 +08:00 |
|
Li xia
|
02dfecfcad
|
fest:"大屏界面调整"
|
2024-08-27 14:03:14 +08:00 |
|
shijing
|
97eab5f9a4
|
fix:光芯自检添加不合格项”小崩边“
|
2024-08-27 11:05:57 +08:00 |
|
shijing
|
c86ab8411e
|
feat:光芯库存统计
|
2024-08-27 10:27:10 +08:00 |
|
shijing
|
7af7efad94
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-27 10:26:24 +08:00 |
|
shijing
|
c836b3f545
|
fix:文案修改配帮管---->配棒管
|
2024-08-27 10:26:20 +08:00 |
|
caoqianming
|
05ecdf7623
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 15:38:14 +08:00 |
|
caoqianming
|
0671b19823
|
feat: 添加计算中心页面
|
2024-08-26 15:38:10 +08:00 |
|
caoqianming
|
3994d63728
|
feat: base menu页面优化
|
2024-08-26 15:36:39 +08:00 |
|
shijing
|
f810b751dd
|
feat:光子合格数统计
|
2024-08-26 10:58:50 +08:00 |
|
shijing
|
fabfe94738
|
feat:光子成品检验
|
2024-08-26 10:57:47 +08:00 |
|
shijing
|
d21dc253e4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-26 09:59:57 +08:00 |
|
shijing
|
8c3bafcc19
|
fix:光子统计分析添加新页面
|
2024-08-26 09:59:53 +08:00 |
|
shijing
|
28d4826043
|
feat:光子统计分析-任务统计
|
2024-08-26 09:59:02 +08:00 |
|
shijing
|
1793a41dfb
|
feat:黑化车间数据看板
|
2024-08-26 09:02:11 +08:00 |
 zty
|
7f135ed7e1
|
fix: 水泥磨
|
2024-08-23 17:20:22 +08:00 |
|
zty
|
11491e1394
|
feat:增加水泥包装
|
2024-08-21 17:54:28 +08:00 |
|
shijing
|
2a7502d023
|
fix:审批流程添加审批图片(必填)
|
2024-08-21 15:31:24 +08:00 |
|
shijing
|
5ac6bd553b
|
fix:for循环添加key
|
2024-08-20 14:57:00 +08:00 |
|
shijing
|
fef724888b
|
fix:成品检验coding#465
|
2024-08-20 14:47:48 +08:00 |
|
shijing
|
ab9375ddc2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-20 14:46:49 +08:00 |
|
shijing
|
3cda314ad4
|
fix:成品检验coding#465
|
2024-08-20 14:46:46 +08:00 |
|
zty
|
27c736d080
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix bar dar
|
2024-08-20 14:40:25 +08:00 |
|
zty
|
e44e904abe
|
fix: 修改各个工段柱状图
|
2024-08-20 14:40:09 +08:00 |
|
shijing
|
ca9b281834
|
fix:检验管理的检验人查询条件全部用posts__code__contains: "check"
|
2024-08-20 13:48:25 +08:00 |
|
shijing
|
20890b5532
|
fix:成品检验传入type(prod成品)和type2(10抽检)
|
2024-08-20 11:15:06 +08:00 |
|
shijing
|
f2546ecb91
|
fix:工作开始添加开始图片
|
2024-08-20 10:14:16 +08:00 |
|
shijing
|
559f3e2a10
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-20 09:16:58 +08:00 |
|
shijing
|
8f3ef47bb1
|
fix:碳排放图表数据展示
|
2024-08-20 09:16:54 +08:00 |
|
Li xia
|
6417f2ef49
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 17:01:27 +08:00 |
|
Li xia
|
1ed17fcedc
|
feat：”超低0816需求修改“
|
2024-08-19 17:01:11 +08:00 |
|
shijing
|
8a8c8322a5
|
fix:审批图片复现
|
2024-08-19 16:33:56 +08:00 |
|
shijing
|
5dcbe0c8e4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 15:18:31 +08:00 |
|
shijing
|
9c76501511
|
fix:pc端作业审批添加图片
|
2024-08-19 15:18:27 +08:00 |
|
Li xia
|
2fdcd3db1b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 14:16:38 +08:00 |
|
Li xia
|
b05ce66c38
|
feat:"bug修改"
|
2024-08-19 14:16:12 +08:00 |
|
Li xia
|
be467d3f93
|
feat: ”大屏修改“
|
2024-08-19 14:14:34 +08:00 |
|
caoqianming
|
fe704c09a7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-19 14:06:32 +08:00 |
|
caoqianming
|
2044684c26
|
feat: 去除登录重定向
|
2024-08-19 14:06:29 +08:00 |
|
zty
|
4aaad74a6a
|
fix: 能管页面更改
|
2024-08-16 18:42:42 +08:00 |
|
zty
|
048a2339d4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-16 10:57:03 +08:00 |
|
zty
|
3324330799
|
fix: tkx/修改 环期值不显示问题
|
2024-08-16 10:56:58 +08:00 |
|
shijing
|
0dd28c95c5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-16 10:23:27 +08:00 |
|
shijing
|
329bccb628
|
fix:任务分解后的修改问题
|
2024-08-16 10:21:45 +08:00 |
|
caoqianming
|
13e3c91ca2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 18:14:52 +08:00 |
|
caoqianming
|
638c0e65b6
|
feat: 样式更改
|
2024-08-15 18:14:34 +08:00 |
|
Li xia
|
d8b7e344bd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 18:12:45 +08:00 |
|
Li xia
|
e75402ec94
|
feat: "车辆清单"
|
2024-08-15 18:08:49 +08:00 |
|
shijing
|
c08dc1b2d3
|
fix:日志不合格项合计
|
2024-08-15 17:49:21 +08:00 |
|
shijing
|
93ae6ac3da
|
fix:日志检验中添加破损和其他
|
2024-08-15 17:23:44 +08:00 |
|
shijing
|
b353166dda
|
fix:日志中生产设备传dept
|
2024-08-15 17:08:03 +08:00 |
|
shijing
|
599a117a96
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:43:29 +08:00 |
|
shijing
|
ffbc69ebab
|
fix:设备巡检和检定记录的修订
|
2024-08-15 16:43:10 +08:00 |
|
Li xia
|
05727aebed
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:11:15 +08:00 |
|
Li xia
|
21d7f5d6f7
|
feat: 厂外运输
|
2024-08-15 16:10:53 +08:00 |
|
shijing
|
c60f1bc32f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 16:07:37 +08:00 |
|
shijing
|
3435ffa718
|
fix:创建工艺路线点击上一步时创建多条记录
|
2024-08-15 16:07:32 +08:00 |
|
caoqianming
|
acfc04653a
|
fix: 排放口infotitle
|
2024-08-15 15:59:31 +08:00 |
|
caoqianming
|
18c89f01bb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 15:59:00 +08:00 |
|
caoqianming
|
e998dd2f8e
|
feat: 菜单icon调整
|
2024-08-15 15:58:26 +08:00 |
|
shijing
|
9fa6081434
|
fix:生产设备增删改后刷新列表，设备类型光子单独一个数组
|
2024-08-15 15:44:42 +08:00 |
|
shijing
|
06c3e107f0
|
fix:eq
|
2024-08-15 15:25:34 +08:00 |
|
shijing
|
791edcbf4f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 14:56:12 +08:00 |
|
shijing
|
9fba7a1330
|
fix:添加设备type
|
2024-08-15 14:56:03 +08:00 |
|
caoqianming
|
3a6249941e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 14:07:56 +08:00 |
|
caoqianming
|
a085399727
|
fix: 超低修改
|
2024-08-15 14:07:53 +08:00 |
|
shijing
|
7ea7051a88
|
fix:更改密码时去掉 .
|
2024-08-15 13:58:52 +08:00 |
|
shijing
|
65f4502561
|
fix:白抛片-->改为 白片抛
|
2024-08-15 13:57:36 +08:00 |
|
shijing
|
be1f643eef
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 13:28:42 +08:00 |
|
shijing
|
29e4bb2432
|
fix:添加工序工段对应页面，更改工段名称
|
2024-08-15 13:28:38 +08:00 |
|
caoqianming
|
60b277b86b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-15 11:08:13 +08:00 |
|
caoqianming
|
705b15b833
|
feat: wmaterial增加state字段
|
2024-08-15 11:08:07 +08:00 |
|
shijing
|
d001a98168
|
fix:添加不合格项，抽检添加检验人
|
2024-08-14 21:23:44 +08:00 |
|
shijing
|
d92d010e4d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-14 17:41:09 +08:00 |
|
shijing
|
57ab4f3914
|
fix：光芯物料导入模板下载地址改动
|
2024-08-14 17:41:05 +08:00 |
|
caoqianming
|
4371a5dff0
|
feat: 环保页面调整
|
2024-08-14 16:25:16 +08:00 |
|
caoqianming
|
e38d1d3eef
|
fix: 光子大屏light intensity调整
|
2024-08-14 14:27:38 +08:00 |
|
caoqianming
|
f2df4ddbb0
|
fix: wpm_gx handoverform getuserlist2 bug
|
2024-08-14 10:47:09 +08:00 |
|
shijing
|
c7bd84f8ab
|
fix:交接记录人员
|
2024-08-14 10:29:15 +08:00 |
|
shijing
|
6f0c9b57bd
|
fix:过程抽检
|
2024-08-14 09:54:46 +08:00 |
|
shijing
|
8ac6ee5db5
|
fix:打印接口设成本地，路由添加过程抽检，工艺路线table高度暂时设小
|
2024-08-14 09:54:11 +08:00 |
|
shijing
|
1666728e9e
|
fix:抽检
|
2024-08-13 15:42:24 +08:00 |
|
shijing
|
404b2b71cb
|
fix:chengpinjianyan
|
2024-08-13 13:51:17 +08:00 |
|
shijing
|
a5759b48b3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 11:15:08 +08:00 |
|
shijing
|
7172a0e070
|
fix:二次、三次超洗
|
2024-08-13 11:15:05 +08:00 |
|
caoqianming
|
147c5273f1
|
feat: 左侧菜单宽度调整
|
2024-08-13 11:02:44 +08:00 |
|
caoqianming
|
a0dcbd8ec6
|
fix: route顺序调整
|
2024-08-13 10:58:10 +08:00 |
|
caoqianming
|
98cf9e8e66
|
feat: 首页调整
|
2024-08-13 10:57:57 +08:00 |
|
caoqianming
|
3e7473444f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 10:57:03 +08:00 |
|
caoqianming
|
c95c247cfd
|
feat: 审批管理调整位置
|
2024-08-13 10:56:59 +08:00 |
|
shijing
|
4ee3242fa9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 10:49:35 +08:00 |
|
shijing
|
8e5a2f60ad
|
fix:检验提交
|
2024-08-13 10:49:31 +08:00 |
|
caoqianming
|
1a0b85b9a1
|
feat: 界面字段优化
|
2024-08-13 10:46:03 +08:00 |
|
caoqianming
|
28516c89dd
|
feat: wpm_gx mlog界面优化
|
2024-08-13 10:33:48 +08:00 |
|
caoqianming
|
009e2c05bb
|
fix: handover form wm做筛选
|
2024-08-13 09:56:19 +08:00 |
|
caoqianming
|
d6d1f9231d
|
feat: 修改设备图标
|
2024-08-13 09:42:44 +08:00 |
|
caoqianming
|
17218d6e60
|
fix: mioitem form 取消无反应
|
2024-08-13 09:35:46 +08:00 |
|
caoqianming
|
b28a7c0403
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-13 09:30:04 +08:00 |
|
caoqianming
|
a5f783b056
|
feat: base 登录选项配置/找回密码logo动态
|
2024-08-13 09:30:01 +08:00 |
|
shijing
|
8819696c1c
|
fix:图标更改
|
2024-08-13 09:29:21 +08:00 |
|
shijing
|
9bc030df31
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 17:21:35 +08:00 |
|
shijing
|
1ec89273e5
|
fix:光芯成品检验
|
2024-08-12 17:21:31 +08:00 |
|
caoqianming
|
6bf784df60
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 16:33:47 +08:00 |
|
caoqianming
|
97e69203ca
|
feat: mio form系统修改
|
2024-08-12 16:33:19 +08:00 |
|
shijing
|
cf3cb5139a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-12 11:33:39 +08:00 |
|
shijing
|
45c223609c
|
fix:工序添加显示排序
|
2024-08-12 11:33:35 +08:00 |
|
caoqianming
|
857e806af8
|
feat: base 基础样式修改
|
2024-08-09 21:26:07 +08:00 |
|
zty
|
cf4974f824
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix：
|
2024-08-09 13:27:50 +08:00 |
|
zty
|
862782fe1f
|
fix type=hour_s 传参数 year month day
|
2024-08-09 13:27:17 +08:00 |
|
shijing
|
6efa08ea9f
|
fix:去掉二级菜单一下的图标，更改部分超低排放
|
2024-08-09 10:36:05 +08:00 |
|
caoqianming
|
442fc20ad6
|
feat: base 调整样式
|
2024-08-08 09:48:18 +08:00 |
|
shijing
|
4aa1463b83
|
fix:materials列表中体现物料系列
|
2024-08-07 18:09:05 +08:00 |
|
shijing
|
f52915325d
|
fix:将检测项目移动到制造管理
|
2024-08-07 17:55:45 +08:00 |