 caoqianming
|
be9da52571
|
fix: testx中xtSelect修改
|
2024-11-07 08:32:45 +08:00 |
 zty
|
d190c47c3b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-01 17:11:14 +08:00 |
|
zty
|
7d7eee19af
|
feat : index_enm 修改大屏内容
|
2024-11-01 17:11:11 +08:00 |
 shijing
|
bab6467c25
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-01 14:35:58 +08:00 |
|
shijing
|
ddb83f7eb4
|
fix:流程图改动（抽出组件）
|
2024-11-01 14:35:53 +08:00 |
|
caoqianming
|
7b59a8ae3a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-01 09:27:18 +08:00 |
|
caoqianming
|
f0aab1b9af
|
feat: 修改xtSelect名称
|
2024-11-01 09:26:50 +08:00 |
|
shijing
|
d7965ef170
|
fix:coding507
|
2024-11-01 09:26:17 +08:00 |
|
shijing
|
7cb112bde8
|
fix:出入库后页面库存刷新
|
2024-11-01 09:24:04 +08:00 |
|
shijing
|
b062b9f568
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-11-01 09:11:21 +08:00 |
|
shijing
|
6f717b03ec
|
fix:fmlog日志中编辑mlog时取消领料数量不能大于当前工段库存数的限制，且合格不合格禁用
|
2024-11-01 09:11:17 +08:00 |
|
zty
|
30e24fd8f5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-31 11:28:27 +08:00 |
|
zty
|
0dd7648593
|
feat: 修改图表
|
2024-10-31 11:28:23 +08:00 |
|
shijing
|
9734d461cf
|
fix:交接页面按钮修正
|
2024-10-30 10:03:34 +08:00 |
|
shijing
|
f4fcc315bb
|
fix:小问题修正（过程抽检打印）
|
2024-10-30 09:05:57 +08:00 |
|
shijing
|
dabedbd432
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-30 09:04:04 +08:00 |
|
shijing
|
371316faea
|
fix:添加扫描按钮，并更换
|
2024-10-30 09:04:00 +08:00 |
|
zty
|
e8d28126ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-29 16:28:30 +08:00 |
|
zty
|
2ed4e5dc7a
|
feat:fac_cal 增加 计算中心折线图
|
2024-10-29 16:28:25 +08:00 |
|
shijing
|
6f476c2740
|
fix:日志中物料标签的打印
|
2024-10-29 15:29:03 +08:00 |
|
shijing
|
7ed39bb24a
|
fix:标签模板优化
|
2024-10-29 14:24:57 +08:00 |
|
shijing
|
d91db25ed6
|
fix:fmlogs打印传参更改
|
2024-10-29 13:54:28 +08:00 |
|
shijing
|
af24f1f4cf
|
feat：导航栏添加扫描按钮，扫描二维码查看打印详情
|
2024-10-29 10:15:46 +08:00 |
|
shijing
|
8e5f258d1a
|
fix:区别详情查看和扫码添加
|
2024-10-29 10:14:58 +08:00 |
|
shijing
|
c5e83d9581
|
fix:更正错别字，表头深色，修正错误数据引用
|
2024-10-29 10:14:17 +08:00 |
|
shijing
|
be8ee7b14b
|
fix:更改日志打印标记
|
2024-10-29 10:12:22 +08:00 |
|
caoqianming
|
27fd49a690
|
feat: xselect edit参数更改
|
2024-10-26 13:13:03 +08:00 |
|
caoqianming
|
177446d8c2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-26 13:09:04 +08:00 |
|
caoqianming
|
fdd3604fc3
|
feat: 完善xselect封装
|
2024-10-26 13:08:45 +08:00 |
|
shijing
|
0a48dbecdd
|
fix:添加一个全局参数
|
2024-10-25 17:21:23 +08:00 |
|
shijing
|
642b94923f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 17:20:12 +08:00 |
|
shijing
|
3349982650
|
fix:工段库存物料标签打印
|
2024-10-25 17:17:54 +08:00 |
|
shijing
|
f3f59c7888
|
feat:抽取物料标签打印并改动库存里的物料标签打印
|
2024-10-25 17:16:37 +08:00 |
|
caoqianming
|
7cd8ad4b0d
|
feat: 解除vue警告
|
2024-10-25 16:34:46 +08:00 |
|
caoqianming
|
b866d133e0
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 16:04:12 +08:00 |
|
caoqianming
|
875b47f111
|
feat: 添加scTableSelect
|
2024-10-25 16:03:52 +08:00 |
|
zty
|
19cc389066
|
feat:修改tkx大屏内容
|
2024-10-25 15:48:52 +08:00 |
|
zty
|
ab3b815832
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 15:34:35 +08:00 |
|
zty
|
6502325099
|
feat: 修改tkx大屏内容
|
2024-10-25 15:34:29 +08:00 |
|
caoqianming
|
9c12eea0f3
|
feat: 更新xselect以支持多选
|
2024-10-25 14:52:59 +08:00 |
|
caoqianming
|
f844379525
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 12:55:32 +08:00 |
|
caoqianming
|
31c6cc6a1f
|
feat: base 消除element警告
|
2024-10-25 12:55:18 +08:00 |
|
shijing
|
13ce3ccc83
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 11:15:18 +08:00 |
|
shijing
|
f53ab995fd
|
feat:日志添加车间库存并打印物料标签
|
2024-10-25 11:14:19 +08:00 |
|
shijing
|
f5860c42d5
|
feat:日志添加车间库存并打印物料标签
|
2024-10-25 11:13:28 +08:00 |
|
caoqianming
|
49f6158bf0
|
feat: 调整目录结构等
|
2024-10-25 10:37:50 +08:00 |
|
caoqianming
|
5f738446fb
|
feat: 添加xselect
|
2024-10-25 10:37:00 +08:00 |
|
caoqianming
|
0449684caf
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-25 09:34:27 +08:00 |
|
caoqianming
|
ebd9bfb7fa
|
feat: base sctable去除最后一列
|
2024-10-25 09:34:13 +08:00 |
|
shijing
|
9e4ceeec3f
|
fix:光芯过程自检过程抽检和外观检验权限变动
|
2024-10-24 17:25:59 +08:00 |
|
shijing
|
a9ca429667
|
feat:新增过程光芯自检，与光子抽离
|
2024-10-24 17:23:13 +08:00 |
|
shijing
|
472a871b90
|
feat:过程抽检添加打印
|
2024-10-24 17:22:41 +08:00 |
|
shijing
|
88fc695454
|
feat:工段交接记录新增时扫码添加物料
|
2024-10-24 17:21:37 +08:00 |
|
shijing
|
4acdc9f4cd
|
feat:工段交接记录打印
|
2024-10-24 17:20:42 +08:00 |
|
shijing
|
f02467a881
|
feat:车间入库记录打印
|
2024-10-24 17:19:53 +08:00 |
|
shijing
|
bd873b3b32
|
feat:车间库存物料标签打印
|
2024-10-24 17:18:48 +08:00 |
|
shijing
|
d07ff31f76
|
feat:日志打印
|
2024-10-24 17:18:15 +08:00 |
|
shijing
|
7956d72987
|
feat:任务分解打印
|
2024-10-24 17:17:31 +08:00 |
|
shijing
|
b56a06d5e6
|
feat:扫描组件
|
2024-10-24 17:16:44 +08:00 |
|
shijing
|
42760326b8
|
fix:日志打印
|
2024-10-24 17:15:53 +08:00 |
|
shijing
|
01500ad0b1
|
fix:库存出入库记录打印
|
2024-10-24 17:15:05 +08:00 |
|
shijing
|
06e52b6c5f
|
fix:A4打印
|
2024-10-24 17:14:09 +08:00 |
|
shijing
|
6d87291c90
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-24 17:12:36 +08:00 |
|
shijing
|
403560ce9f
|
fix:库存物料标签打印
|
2024-10-24 17:12:32 +08:00 |
|
zty
|
81b75aaaca
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-24 16:53:10 +08:00 |
|
zty
|
1be10389c9
|
feat: 修改代码 index_enm bug
|
2024-10-24 16:52:57 +08:00 |
|
shijing
|
ad7b0acfd6
|
fix:html2pdf.js更改导出dom宽度
|
2024-10-24 16:51:40 +08:00 |
|
zty
|
d519cd882a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-24 16:05:15 +08:00 |
|
zty
|
550bc6443b
|
feat: index_enm 修改大屏内容
|
2024-10-24 16:05:12 +08:00 |
|
caoqianming
|
733e3ba9bf
|
feat: 添加xselect组件并注册到全局
|
2024-10-24 16:03:21 +08:00 |
|
caoqianming
|
15db849fd6
|
feat: 添加vue-echarts并注册到全局
|
2024-10-24 11:25:04 +08:00 |
|
caoqianming
|
d10f4a790a
|
feat: 测试页更改
|
2024-10-24 11:06:10 +08:00 |
|
zty
|
345bdc3b96
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-22 16:34:24 +08:00 |
|
zty
|
886c6c8184
|
feat：修改大屏内容
|
2024-10-22 16:34:09 +08:00 |
|
shijing
|
67a4814326
|
feat:检验表导出
|
2024-10-18 17:10:13 +08:00 |
|
shijing
|
a6a4ef7186
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 15:41:48 +08:00 |
|
shijing
|
ee12735ea1
|
feat:添加cm接口声明
|
2024-10-17 15:41:45 +08:00 |
|
caoqianming
|
6584b867d3
|
feat: remployee 添加权限标识2
|
2024-10-17 11:27:27 +08:00 |
|
caoqianming
|
a368dcab24
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 10:59:31 +08:00 |
|
caoqianming
|
0b72e2dcc1
|
feat: remployee 添加权限标识
|
2024-10-17 10:59:28 +08:00 |
|
shijing
|
b4bb7b0f9f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 10:37:36 +08:00 |
|
shijing
|
84524a8b71
|
feat:添加cm接口声明
|
2024-10-17 10:37:32 +08:00 |
|
caoqianming
|
007d5828b6
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-17 09:55:18 +08:00 |
|
caoqianming
|
4389195791
|
fix: base 岗位角色权限标识错误
|
2024-10-17 09:55:15 +08:00 |
|
zty
|
c0f7782aa7
|
feat: enm_kil 修改日月统计表
|
2024-10-16 16:50:57 +08:00 |
|
zty
|
38a9d7b4fb
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-15 14:36:51 +08:00 |
|
zty
|
6e4a817324
|
feat:tkx fix bug
|
2024-10-15 14:36:31 +08:00 |
|
shijing
|
77224cdbd4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-15 10:49:36 +08:00 |
|
shijing
|
b9a7cd6b66
|
fix:入库信息，生产领料、销售发发货打印导出初版测试
|
2024-10-15 10:49:28 +08:00 |
|
zty
|
cb0a492bbc
|
feat: 修改tkx 日报表
|
2024-10-14 17:41:33 +08:00 |
|
shijing
|
4196873dd7
|
fix:打印模板更新
|
2024-10-14 09:58:56 +08:00 |
|
shijing
|
246bba5f78
|
fix:打印模板更新
|
2024-10-14 09:58:34 +08:00 |
|
shijing
|
1282d7a1c8
|
fix:光芯打印初始模板
|
2024-10-11 14:48:36 +08:00 |
|
shijing
|
0735f5dbf7
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-11 10:47:03 +08:00 |
|
shijing
|
eb0076444f
|
fix：coding#501
|
2024-10-11 10:46:59 +08:00 |
|
zty
|
5911d1f13b
|
feat:修改 能源统计表
|
2024-10-09 17:08:45 +08:00 |
|
zty
|
a831c17838
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
feat:修改水平涡流选粉机
|
2024-10-09 09:27:32 +08:00 |
|
zty
|
ab6e9ac889
|
feat:修改水泥磨中水平涡流选粉机
|
2024-10-09 09:27:18 +08:00 |
|
shijing
|
3fbd419ffd
|
fix:coding500
|
2024-10-08 14:30:59 +08:00 |
|
shijing
|
5ad7678d04
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-10-08 13:52:54 +08:00 |
|
shijing
|
12133a3b37
|
fix:coding497、499
|
2024-10-08 13:52:50 +08:00 |
|
zty
|
918d45503e
|
feat : 修改 报警界面
|
2024-09-30 17:19:45 +08:00 |
|
caoqianming
|
1ef6ad95a0
|
feat: 计算中心界面
|
2024-09-30 12:47:00 +08:00 |
|
zty
|
1dc5710f84
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-26 18:13:21 +08:00 |
|
zty
|
9c1c1fd39b
|
fix: tkx bug
|
2024-09-26 18:12:56 +08:00 |
|
shijing
|
e5b163dc59
|
fix:合格数统计柱状图修正，光芯mtask提交后刷新列表
|
2024-09-26 15:59:49 +08:00 |
|
shijing
|
753063ba47
|
fix:coding#492
|
2024-09-25 16:52:03 +08:00 |
|
shijing
|
4b7664296f
|
fix:coding#495
|
2024-09-25 16:51:08 +08:00 |
|
shijing
|
fd8e646c10
|
fix:日期显示更改
|
2024-09-25 16:04:13 +08:00 |
|
shijing
|
ba0bfc0ff3
|
fix:光芯合格数统计查询参数时间规范化
|
2024-09-25 14:22:20 +08:00 |
|
shijing
|
14a079ae0b
|
fix:日志中实际生产数和领料数以及加工前不良的计算
|
2024-09-25 14:11:44 +08:00 |
|
shijing
|
84581bc32c
|
fix:外观检验项崩边没有实时计算
|
2024-09-25 14:10:32 +08:00 |
|
shijing
|
25ef072e04
|
feat:utask大任务手动提交
|
2024-09-25 14:09:34 +08:00 |
|
shijing
|
8118bec402
|
fix:工段页面添加出入库记录
|
2024-09-24 16:46:14 +08:00 |
|
shijing
|
64016cf2dc
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-24 16:40:27 +08:00 |
|
shijing
|
4337fb7d1f
|
fix:光芯车间出入库改正
|
2024-09-24 16:40:22 +08:00 |
|
zty
|
f0aa7a2d2f
|
fix:enm 修改班组数据
|
2024-09-24 14:15:33 +08:00 |
|
zty
|
83426cb8cd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-23 17:37:33 +08:00 |
|
zty
|
f53b3ca29f
|
fix : 测点录入和班组对不上
|
2024-09-23 17:37:28 +08:00 |
|
shijing
|
414fad1602
|
fix:工段库存领料入库操作抽屉展示
|
2024-09-23 11:15:55 +08:00 |
|
shijing
|
0fc3670bce
|
fix:任务进度legend颜色异常问题
|
2024-09-19 17:27:36 +08:00 |
|
shijing
|
c92cbbdcec
|
fix:成品检验切换类型时，清空原有数据
|
2024-09-19 16:48:20 +08:00 |
|
shijing
|
ab9b9bc18f
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 15:46:48 +08:00 |
|
shijing
|
ffcbe833cf
|
fix:交接记录显示问题&检验时物料批次的排序
|
2024-09-19 15:46:44 +08:00 |
|
zty
|
b5190de25b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 15:44:04 +08:00 |
|
zty
|
9c3992b448
|
feat: 新增得分功能
|
2024-09-19 15:43:46 +08:00 |
|
shijing
|
45497e82a1
|
fix:gx成品检验编辑时不合格原因复显问题
|
2024-09-19 15:07:54 +08:00 |
|
shijing
|
86b3e4e2f3
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 14:55:13 +08:00 |
|
shijing
|
97e59c2c40
|
fix:库存统计的查询条件
|
2024-09-19 14:55:09 +08:00 |
 Li xia
|
89018c5e59
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-19 09:34:56 +08:00 |
|
Li xia
|
f91ed595f2
|
fix:"摄像头"
|
2024-09-19 09:34:46 +08:00 |
|
shijing
|
17c50f7b27
|
fix:车间物料检验时数量显示为count_cando
|
2024-09-18 14:50:28 +08:00 |
|
shijing
|
747c22fc02
|
fix:调整库存管理目录
|
2024-09-18 13:40:33 +08:00 |
|
shijing
|
5487e1f74d
|
fix:任务统计页面的请求报错
|
2024-09-18 13:31:33 +08:00 |
|
shijing
|
12abe192ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-13 15:43:20 +08:00 |
|
shijing
|
4b9b768647
|
fix:coding#481统计中心优化
|
2024-09-13 15:43:16 +08:00 |
|
zty
|
659226e6ad
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
|
2024-09-12 15:59:31 +08:00 |
|
zty
|
ba5c1b2129
|
fix bug
|
2024-09-12 15:58:20 +08:00 |
|
shijing
|
58bf615de3
|
fix:交接物料/按钮显示问题
|
2024-09-12 15:28:29 +08:00 |
|
shijing
|
a0013e00cc
|
fix:coding#481：合格数统计
|
2024-09-12 11:25:58 +08:00 |
|
shijing
|
ff9f751fef
|
fix:coding#481：合格数统计
|
2024-09-12 11:23:14 +08:00 |
|
shijing
|
7316da4504
|
fix:coding#4811.2任务进度
|
2024-09-12 10:44:54 +08:00 |
|
shijing
|
714e18e168
|
fix:检验部交接物料查询
|
2024-09-12 10:43:46 +08:00 |
|
shijing
|
4382057684
|
fix:统计分析—任务进度
|
2024-09-12 10:03:05 +08:00 |
|
shijing
|
1cb2c30d3e
|
fix:合格数统计每个模块添加工段名称
|
2024-09-11 16:56:19 +08:00 |
|
shijing
|
8a1cf4a25b
|
fix:成品检验中交接记录的筛选
|
2024-09-11 16:47:01 +08:00 |
|
shijing
|
2d5bbca578
|
fix:成品检验添加班次
|
2024-09-11 15:46:40 +08:00 |
|
shijing
|
744f78b621
|
fix:工段交接记录和库存修正
|
2024-09-11 15:28:35 +08:00 |
|
shijing
|
98b54e50d5
|
fix:黑化车间展示数据修正
|
2024-09-11 15:27:06 +08:00 |
|
shijing
|
6764381bad
|
fix:接收部门placeholder提示文案修正
|
2024-09-10 17:30:55 +08:00 |