 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 |
|
shijing
|
119bc195d3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-07 17:51:09 +08:00 |
|
shijing
|
e68b15b12b
|
fix:成品检验变更(ps:需要改动的地方:物料的物料系列,检测项目testitem的字段类型,检验类型,物料系列标签)
|
2024-08-07 17:51:05 +08:00 |
|
caoqianming
|
afb4070f25
|
feat: base 登录页美化
|
2024-08-07 17:41:41 +08:00 |
|
caoqianming
|
e7a3ad5b19
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-07 16:36:17 +08:00 |
|
caoqianming
|
f8923e2a48
|
feat: 样式调整
|
2024-08-07 16:36:14 +08:00 |
|
shijing
|
34838c76b3
|
fix:testitem
|
2024-08-07 15:58:29 +08:00 |
|
shijing
|
7f6a675a29
|
fix:
|
2024-08-07 14:52:29 +08:00 |
|
shijing
|
1951eae679
|
fix:新增testitem选项在单选或多选时显示
|
2024-08-07 14:41:25 +08:00 |
|
shijing
|
a7d02670d9
|
fix:检测项目更新
|
2024-08-07 14:27:07 +08:00 |
|
shijing
|
766b3d0704
|
fix:首件检验中testitem的获取
|
2024-08-07 13:31:02 +08:00 |
|
shijing
|
0bb5da3c3d
|
fix:性能检验中testitems的获取
|
2024-08-07 13:30:27 +08:00 |
|
shijing
|
fd08cc9356
|
fix:无聊添加时无聊系列的获取
|
2024-08-07 13:29:46 +08:00 |
|
shijing
|
edc93d7110
|
fix:托克逊生产报告小时数据hour_s传参year，month，day，hour
|
2024-08-07 09:20:56 +08:00 |
|
shijing
|
c7285dc56f
|
fix:日志详情页去掉权控
|
2024-08-07 09:18:19 +08:00 |
|
shijing
|
f64e1a3b84
|
fix:托克逊日志详情的测点录入添加测点筛选条件，去除其他成本改为测点录入
|
2024-08-07 09:07:41 +08:00 |
|
shijing
|
9ab7e759dd
|
fix:小时数hour_s传参换成实际时间year、month、day、hour;表格数据通过测点的mpoint_name进行整合数据
|
2024-08-07 09:04:19 +08:00 |
|
shijing
|
909ba81ad4
|
fix:综合查询的检验合格数改正
|
2024-08-07 08:51:19 +08:00 |
|
shijing
|
d2ed2d84f6
|
fix:托克逊新增测点增加字段是否单位量
|
2024-08-06 10:48:15 +08:00 |
|
shijing
|
dd07b3ca11
|
fix:托克逊车间单耗分析箭头表格中当期与环期差值箭头问题
|
2024-08-06 10:00:59 +08:00 |
|
shijing
|
69786dddb7
|
fix:托克逊交接班日志报表完善
|
2024-08-06 09:58:08 +08:00 |
|
shijing
|
0a34b50fef
|
fix:coding#443生产报告小数点问题
|
2024-08-05 14:46:06 +08:00 |
|
shijing
|
32d659912e
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-05 13:55:38 +08:00 |
|
shijing
|
c1ec453081
|
fix:交接班日志报表内容修正
|
2024-08-05 13:55:35 +08:00 |
|
caoqianming
|
d033ac01a7
|
feat: opl添加详情展示信息
|
2024-08-04 20:32:21 +08:00 |
|
caoqianming
|
78205457ae
|
fix: 光子工艺路线不显示
|
2024-08-02 21:11:45 +08:00 |
|
shijing
|
d2f5432095
|
fix:coding#443中添加异常修正
|
2024-08-02 11:28:39 +08:00 |
|
shijing
|
26bffd4f49
|
fix:工艺路线新增route批次校验
|
2024-08-02 11:22:04 +08:00 |
|
shijing
|
4466350cde
|
fix:半成品生产入库显示隐藏物料
|
2024-08-02 10:35:33 +08:00 |
|
shijing
|
0bd5345cd1
|
fix:异常录入问题改正
|
2024-08-02 10:06:21 +08:00 |
|
shijing
|
8ac1ad41b1
|
fix:关闭详情后刷新mlog
|
2024-08-01 18:12:35 +08:00 |
|
shijing
|
263a914fa9
|
fix:不合格校验
|
2024-08-01 17:38:43 +08:00 |
|
shijing
|
061ebbb09f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 17:02:42 +08:00 |
|
shijing
|
df7ae9e7cd
|
fix:交接记录按钮权限
|
2024-08-01 17:02:39 +08:00 |
|
caoqianming
|
00a030e29c
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 16:07:31 +08:00 |
|
caoqianming
|
f8b974cacb
|
fix: base wf获取下拉选项
|
2024-08-01 16:07:28 +08:00 |
|
shijing
|
fa0cfddc3c
|
fix:日志添加撤回
|
2024-08-01 15:28:49 +08:00 |
|
shijing
|
896cba6bc9
|
fix:返工物料名称标注
|
2024-08-01 15:25:58 +08:00 |
|
shijing
|
ed4cc66303
|
fix:交接编辑人员显示bug修改
|
2024-08-01 15:25:14 +08:00 |
|
caoqianming
|
51ef980600
|
feat: 添加一个测试页
|
2024-08-01 13:46:02 +08:00 |
|
caoqianming
|
8566b8a6be
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 13:44:36 +08:00 |
|
caoqianming
|
d101916362
|
feat: 添加ehsselect组件
|
2024-08-01 13:44:32 +08:00 |
|
shijing
|
ff03923c1e
|
fix:详情显示物料fullName
|
2024-08-01 11:18:05 +08:00 |
|
shijing
|
cc0c0bc6d4
|
fix:日志开始/结束时间选择时不能超过当前时间
|
2024-08-01 11:04:26 +08:00 |
|
shijing
|
e6b945b152
|
fix:交接单删除接口修正，以及状态判断
|
2024-08-01 10:41:21 +08:00 |
|
shijing
|
dbec6f5396
|
fix:光芯生产日志中产出物详情展开
|
2024-08-01 10:27:09 +08:00 |
|
caoqianming
|
80b90d7d03
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 09:03:49 +08:00 |
|
caoqianming
|
bd04abe46e
|
fix: base systemdict提交时不刷新
|
2024-08-01 09:03:45 +08:00 |
|
shijing
|
0d6dc1a0e2
|
fix:coding#432兼容处理
|
2024-08-01 08:54:19 +08:00 |
|
shijing
|
c8c675f44a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 08:53:56 +08:00 |
|
shijing
|
116c066a81
|
fix:coding#432兼容处理
|
2024-08-01 08:53:52 +08:00 |
|
caoqianming
|
1de0d342d5
|
feat: 添加工段获取错误提示
|
2024-08-01 08:37:31 +08:00 |
|
caoqianming
|
947832ce0a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-08-01 08:36:34 +08:00 |
|
caoqianming
|
457dc4c23b
|
fix: 修改批次绑定为批次校验
|
2024-08-01 08:36:31 +08:00 |
|
shijing
|
1861f6406b
|
fix：采购订单雨采购计划添加单价和总价汇总
|
2024-07-31 19:38:53 +08:00 |
|
shijing
|
28bea49629
|
fix：批号追加设备
|
2024-07-31 19:00:08 +08:00 |
|
shijing
|
f7e875b43e
|
fix:coding#425
|
2024-07-31 16:44:27 +08:00 |
|
shijing
|
17b81345a6
|
fix:采购详情列表文案修改
|
2024-07-31 14:11:12 +08:00 |
|
shijing
|
3637f548fd
|
fix:coding#431
|
2024-07-31 10:24:43 +08:00 |
|
shijing
|
023b2ee618
|
fix:原料库列表显示修改
|
2024-07-31 08:44:48 +08:00 |
|
shijing
|
1f383eefac
|
fix:大屏文案修改
|
2024-07-31 08:43:28 +08:00 |
|
shijing
|
f1e1f0f78e
|
fix:测点所属工段清空
|
2024-07-30 16:48:26 +08:00 |
|
shijing
|
e4dfebee09
|
fix:交接记录中options展示样式
|
2024-07-30 15:30:14 +08:00 |
|
shijing
|
94e0ed014a
|
feat:添加打印机名称保存
|
2024-07-30 15:22:25 +08:00 |
|
shijing
|
f40ef04e36
|
fix:单位产品电耗日期查询清空时错误改正
|
2024-07-30 15:00:55 +08:00 |
|
shijing
|
09991ac6c9
|
fix:统计分析-综合查询
|
2024-07-30 14:55:46 +08:00 |
|
shijing
|
04a40a6d1f
|
fix:完善电量报表
|
2024-07-30 14:47:40 +08:00 |
|
shijing
|
8917c2cb1b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-07-30 14:46:56 +08:00 |
|
shijing
|
be2ba954ff
|
fix:日期查询的时候清空报错改正
|
2024-07-30 14:46:52 +08:00 |
|
zty
|
8e59bdccce
|
fix: route/utask 更新筛选条件
|
2024-07-30 14:31:29 +08:00 |
|
zty
|
8896a3927c
|
feat: wpm_gx mlog_form user添加筛选条件
|
2024-07-30 14:15:11 +08:00 |
|
zty
|
733b43786b
|
feat: mio 增加工段
|
2024-07-30 14:10:05 +08:00 |
|
shijing
|
a0225cdc72
|
fix:光纤页面权限控制
|
2024-07-30 09:28:08 +08:00 |
|
shijing
|
e24b10019f
|
fix:输入输出物料显示条件修改
|
2024-07-29 17:01:54 +08:00 |
|
shijing
|
e15f03142a
|
fix：光芯物料显示单价和总价，并且半成品不显示单价
|
2024-07-29 17:01:03 +08:00 |
|
shijing
|
c9bf9177e0
|
fix:添加接口声明
|
2024-07-29 10:58:17 +08:00 |
|
shijing
|
a1b436d38f
|
fix:综合查询添加检验合格数
|
2024-07-29 10:57:03 +08:00 |
|
shijing
|
75c2ebcadf
|
fix:光子物料
|
2024-07-29 10:55:43 +08:00 |
|
shijing
|
110bc149d8
|
fix:成品检验
|
2024-07-29 10:55:16 +08:00 |
|
shijing
|
0f00f121f4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-07-29 10:54:43 +08:00 |
|
shijing
|
65e56d1dcf
|
fix:添加检测项目页面
|
2024-07-29 10:54:40 +08:00 |
|
caoqianming
|
60f8b0fb6d
|
feat: base menu更新时变更options
|
2024-07-29 10:25:19 +08:00 |
|
caoqianming
|
497e5fd410
|
feat: base menu菜单添加搜索
|
2024-07-29 10:00:03 +08:00 |
|
shijing
|
88852831d9
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-07-29 09:32:46 +08:00 |
|
shijing
|
ffe246e5e3
|
fix:大屏页面退出处理
|
2024-07-29 09:32:43 +08:00 |
|
caoqianming
|
4f62f5e8b4
|
feat: base 菜单管理 父级使用value-on-clear
|
2024-07-26 13:18:13 +08:00 |
|
shijing
|
083248cba2
|
fix：光芯工艺路线产品展示和主要输入输出展示的变动
|
2024-07-25 17:28:40 +08:00 |
|
shijing
|
8d45bc1ced
|
fix:主要输入展示原料和半成品，主要输出展示半成品和成品
|
2024-07-25 17:00:17 +08:00 |
|
shijing
|
14ec636422
|
fix:活化改为扫边
|
2024-07-25 16:39:36 +08:00 |
|
shijing
|
8d6b620123
|
fix:主要设备单位电耗和生产报告筛选条件修正
|
2024-07-25 16:09:27 +08:00 |
|
shijing
|
e67532d958
|
fix:交接记录展示不合格标记
|
2024-07-25 15:41:57 +08:00 |
|
shijing
|
1b6cf9a66b
|
fix:交接记录
|
2024-07-25 14:58:01 +08:00 |
|
shijing
|
2c5bd1d103
|
fix：工序添加字段
|
2024-07-25 11:09:22 +08:00 |
|
shijing
|
29c6989d50
|
fix:打印接口声明
|
2024-07-25 10:07:51 +08:00 |
|
shijing
|
996759e60c
|
fix:
|
2024-07-25 09:34:54 +08:00 |
|
shijing
|
42676ab855
|
fix:charts测试更改
|
2024-07-25 09:34:33 +08:00 |
|
shijing
|
7d7c5f2dcc
|
fix:光芯-添加日志增加外协单位
|
2024-07-24 16:41:48 +08:00 |
|
shijing
|
ed385acf4d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-07-24 15:13:24 +08:00 |
|
shijing
|
f53252f6c2
|
fix:光芯首页
|
2024-07-24 15:13:20 +08:00 |
|
caoqianming
|
2cca7d8c14
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-07-24 15:02:11 +08:00 |
|
shijing
|
75a0dc33ce
|
fix:小问题修改
|
2024-07-24 15:01:59 +08:00 |
|
caoqianming
|
4610d7e676
|
feat: 添加hazard页面
|
2024-07-24 15:01:39 +08:00 |
|
shijing
|
029d881774
|
fix:供应商添加时增加是否外协字段
|
2024-07-24 14:42:39 +08:00 |
|
shijing
|
86e383d041
|
fix:出入库记录-销售发货部分更改
|
2024-07-24 14:41:47 +08:00 |
|
shijing
|
4158313155
|
fix:托克逊大屏更改
|
2024-07-24 14:39:33 +08:00 |
|
shijing
|
7567ca54ad
|
fix:统计分析综合查询更改文案
|
2024-07-24 14:38:50 +08:00 |
|
shijing
|
61a86d766a
|
fix:测试文件改动
|
2024-07-24 13:48:58 +08:00 |
|
shijing
|
7a9e193dc6
|
fix:去除多余的大屏页面
|
2024-07-24 13:45:08 +08:00 |
|
shijing
|
88aee21df9
|
fix:qm接口声明添加，route改动
|
2024-07-24 13:44:36 +08:00 |
|
shijing
|
55fb2b925c
|
fix:销售订单中添加产品搜索
|
2024-07-24 13:42:52 +08:00 |
|
shijing
|
8a1c7cb11e
|
fix:echarts动态壮壮图折线图测试demo
|
2024-07-23 09:18:36 +08:00 |
|
shijing
|
ee809aa571
|
fix:工序页面完善
|
2024-07-22 16:55:59 +08:00 |
|
shijing
|
d401e4b4dd
|
feat:光芯
|
2024-07-22 13:35:39 +08:00 |
|
shijing
|
58c24851c6
|
fix:table页码
|
2024-07-19 08:59:09 +08:00 |
|
shijing
|
d524063ea1
|
fix:光子库存检验导出
|
2024-07-18 16:40:08 +08:00 |
|
shijing
|
ca7a62fbbc
|
fix:enm单位产品电耗更改引用接口
|
2024-07-16 14:54:38 +08:00 |
|
shijing
|
32252eb850
|
fix:环保模块-排放口-详情修正
|
2024-07-16 14:05:22 +08:00 |
|
shijing
|
7e2a6f2f0b
|
fix:停机异常删除以及stlog表格table高度自适应
|
2024-07-16 13:48:44 +08:00 |
|
shijing
|
67f664638f
|
fix:stlog删除接口声明更正
|
2024-07-16 10:44:58 +08:00 |
|
shijing
|
f6e8b82101
|
添加光芯生产执行页面
|
2024-07-15 13:45:01 +08:00 |
|
shijing
|
5293d8150a
|
fix:环保模块排放口点击显示关联信息
|
2024-07-09 16:51:28 +08:00 |
|
shijing
|
cd7f0a0f89
|
fix:工艺审批和车间任务
|
2024-07-04 16:50:35 +08:00 |
|
shijing
|
baf2102944
|
fix:审批添加routepack的相关流程
|
2024-07-04 09:48:11 +08:00 |
|
shijing
|
f2d4b447f3
|
fix:加工工艺
|
2024-07-03 17:45:51 +08:00 |
|
shijing
|
4f5098bcdc
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-07-03 16:49:49 +08:00 |
|
shijing
|
e03f767284
|
fix:routepack接口添加
|
2024-07-03 09:03:26 +08:00 |
|
caoqianming
|
c20dc4dbda
|
feat: base 优化wf配置页展示效果
|
2024-07-02 18:07:48 +08:00 |