 caoqianming
|
a8cd681e33
|
fix: 班组管理新增后刷新
|
2023-12-22 09:40:18 +08:00 |
|
caoqianming
|
ddfc2cb5b5
|
feat: 设备所属车间筛选条件
|
2023-12-22 09:39:50 +08:00 |
|
caoqianming
|
9ee05321e8
|
fix: 长白班和两倒
|
2023-12-21 21:25:10 +08:00 |
|
caoqianming
|
c691474254
|
fix: employee光子页面 update控权
|
2023-12-21 21:24:50 +08:00 |
|
caoqianming
|
8fdd0268ee
|
feat: mioitem 物料看full_name
|
2023-12-21 15:21:22 +08:00 |
|
caoqianming
|
b1eef89d87
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 15:11:32 +08:00 |
|
caoqianming
|
e0ba3ca6fb
|
fix: 7车间 10车间批次号手填
|
2023-12-21 15:10:48 +08:00 |
 shijing
|
976c92cdec
|
加工路线中step居中
|
2023-12-21 14:44:24 +08:00 |
|
shijing
|
c95c7134d7
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 14:33:22 +08:00 |
|
shijing
|
f789550dfe
|
home
|
2023-12-21 14:33:19 +08:00 |
|
caoqianming
|
a3670056ae
|
fix: 到岗记录获取部门错误
|
2023-12-21 14:08:53 +08:00 |
|
caoqianming
|
d4094d3607
|
fix: team_photon去除硬编码2
|
2023-12-21 13:32:57 +08:00 |
|
caoqianming
|
a57b49316b
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 13:25:30 +08:00 |
|
caoqianming
|
01276e0a00
|
fix: team_photon去除硬编码
|
2023-12-21 13:25:28 +08:00 |
|
shijing
|
278e3c3648
|
role
|
2023-12-21 13:16:46 +08:00 |
|
shijing
|
a629a3cf2c
|
role
|
2023-12-21 13:13:09 +08:00 |
|
caoqianming
|
21c6b5177b
|
fix: 人员编辑bug
|
2023-12-21 13:05:56 +08:00 |
|
caoqianming
|
cbcde10f80
|
fix: role create update 没有刷新
|
2023-12-21 12:58:29 +08:00 |
|
caoqianming
|
e5edaf1b3c
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 10:40:50 +08:00 |
|
caoqianming
|
cffbecf330
|
feat: route增加筛选
|
2023-12-21 10:40:21 +08:00 |
|
caoqianming
|
f2afea91ed
|
feat: material添加是否隐藏选项
|
2023-12-21 10:39:43 +08:00 |
|
shijing
|
5b0ed75718
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-21 10:22:16 +08:00 |
|
shijing
|
115045b520
|
首页控制台数据
|
2023-12-21 10:22:10 +08:00 |
|
caoqianming
|
d8f49bb9c5
|
fix: 任务执行界面查询过滤
|
2023-12-21 01:26:59 +08:00 |
|
caoqianming
|
4b822b7b52
|
fix: worktask_form批次号限制及其他一些问题
|
2023-12-21 00:58:25 +08:00 |
|
caoqianming
|
4a8bae6c00
|
fix: 按钮样式错误
|
2023-12-20 23:51:42 +08:00 |
|
caoqianming
|
b1bd32cca0
|
fix: sysconfig修改
|
2023-12-20 21:56:44 +08:00 |
|
caoqianming
|
27282570e9
|
feat: 路线选择可筛选
|
2023-12-20 21:05:59 +08:00 |
|
caoqianming
|
82f11fe205
|
feat: 输入/输出物料添加筛选条件
|
2023-12-20 20:53:11 +08:00 |
|
caoqianming
|
5f2ab70e8c
|
feat: 车间库存处添加已到工序
|
2023-12-20 15:27:29 +08:00 |
|
caoqianming
|
56e180b46f
|
feat: 加工路线新建表单时返回物料full_name
|
2023-12-20 15:22:12 +08:00 |
|
caoqianming
|
5ff50b579c
|
feat: 路线编辑返回物料full_name2
|
2023-12-20 15:20:22 +08:00 |
|
caoqianming
|
606aef07c2
|
feat: 路线编辑返回物料full_name
|
2023-12-20 15:18:47 +08:00 |
|
shijing
|
cb2418fcf1
|
material&route中material展示加规格型号
|
2023-12-20 14:05:21 +08:00 |
|
shijing
|
90403e3577
|
#86物料创建或编辑时物料类型必选
|
2023-12-20 13:53:52 +08:00 |
|
shijing
|
ff2cb928c6
|
#73有甘特图的地方加时间范围搜索
|
2023-12-20 13:25:02 +08:00 |
|
shijing
|
76e50e36e2
|
页面权限设置
|
2023-12-20 10:05:09 +08:00 |
|
shijing
|
39f8a9fda6
|
部门提交更新
|
2023-12-19 17:18:51 +08:00 |
|
caoqianming
|
e1563f70bb
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-19 17:03:22 +08:00 |
|
caoqianming
|
94dbdc4d86
|
fix: 路由表完善
|
2023-12-19 17:03:20 +08:00 |
|
shijing
|
bd24a20f3b
|
菜单权限配置
|
2023-12-19 16:55:41 +08:00 |
|
shijing
|
1a45a24d7c
|
菜单更改
|
2023-12-19 15:23:24 +08:00 |
|
shijing
|
354343c882
|
#85
|
2023-12-19 09:04:16 +08:00 |
|
shijing
|
78e3647f46
|
#72
|
2023-12-19 08:59:27 +08:00 |
|
shijing
|
ce162d5f9a
|
#71生产管理-6车间mtask需要可编辑
|
2023-12-18 15:40:39 +08:00 |
|
shijing
|
f334f1c646
|
首页文案更改
|
2023-12-18 15:06:20 +08:00 |
|
shijing
|
7ce9f1d9f6
|
结石气线分开
|
2023-12-18 14:50:04 +08:00 |
|
caoqianming
|
4657a2591d
|
feat: 增加mtask合格数展示
|
2023-12-18 13:32:46 +08:00 |
|
caoqianming
|
5ef55f83a5
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 13:25:44 +08:00 |
|
caoqianming
|
2f2220c5c1
|
feat: 6车间mlog撤回
|
2023-12-18 13:25:42 +08:00 |
|
shijing
|
825364b137
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 13:14:34 +08:00 |
|
shijing
|
83ce1372ae
|
#82采购计划详情-没有新增
|
2023-12-18 13:14:31 +08:00 |
|
caoqianming
|
ae299a4194
|
feat: 10车间撤回
|
2023-12-18 13:03:02 +08:00 |
|
shijing
|
29330fe515
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 12:36:23 +08:00 |
|
shijing
|
1b191df783
|
绩效
|
2023-12-18 12:36:18 +08:00 |
|
caoqianming
|
965dfdb670
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 12:35:04 +08:00 |
|
caoqianming
|
6febb51cdb
|
feat: 日志撤回，目前只修改了7车间
|
2023-12-18 12:34:00 +08:00 |
|
shijing
|
1a1a838042
|
合格率格式更改
|
2023-12-18 10:19:16 +08:00 |
|
shijing
|
855d365394
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-18 09:49:59 +08:00 |
|
shijing
|
391e33bd0e
|
7车间完成率
|
2023-12-18 09:49:56 +08:00 |
|
caoqianming
|
b1e2871e03
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-17 20:35:18 +08:00 |
|
caoqianming
|
7a4e70626d
|
feat: mtask执行时添加配分料数
|
2023-12-17 20:35:15 +08:00 |
|
shijing
|
4424ce7030
|
绩效考核初始页面
|
2023-12-16 13:01:21 +08:00 |
|
shijing
|
d0b651745d
|
6、7、10mlog提交，退火新增交接记录
|
2023-12-16 12:32:48 +08:00 |
|
shijing
|
9f5aa25aca
|
成品组合件
|
2023-12-16 09:37:02 +08:00 |
|
shijing
|
3aa3bec7de
|
统计2
|
2023-12-15 15:15:32 +08:00 |
|
shijing
|
c07fd76ed5
|
统计2
|
2023-12-15 15:13:43 +08:00 |
|
shijing
|
b924fb5af6
|
统计
|
2023-12-13 11:27:33 +08:00 |
|
shijing
|
96bff20959
|
库存改动
|
2023-12-11 13:42:40 +08:00 |
|
shijing
|
ba2d621214
|
库存改动
|
2023-12-11 13:41:47 +08:00 |
|
shijing
|
700f04aa13
|
生产执行改动
|
2023-12-06 17:41:10 +08:00 |
|
shijing
|
c0ea8b80a9
|
混料新增修改
|
2023-12-05 10:23:46 +08:00 |
|
shijing
|
1f1d96528a
|
gantt修改
|
2023-12-05 08:49:20 +08:00 |
|
caoqianming
|
5ce7ce250f
|
feat: 添加很多新页面
|
2023-12-01 16:15:25 +08:00 |
|
caoqianming
|
ae4863529f
|
fix: 7车间大屏一些修改
|
2023-11-28 08:03:27 +08:00 |
|
caoqianming
|
2ddcb49616
|
fix: 一些修改
|
2023-11-28 08:03:13 +08:00 |
|
caoqianming
|
c62188eaa7
|
fix: mtask页面的bug修改
|
2023-11-28 00:40:28 +08:00 |
|
caoqianming
|
93a85eb192
|
fix: 一些bug调整
|
2023-11-27 18:14:35 +08:00 |
|
caoqianming
|
831d75bb4d
|
feat: 大屏样式的修改
|
2023-11-27 13:53:27 +08:00 |
|
caoqianming
|
98d2b3d20f
|
feat: wpm添加了其他日志用于录入avg
|
2023-11-27 13:52:27 +08:00 |
|
shijing
|
0316f42e11
|
异常修改（未完成）
|
2023-11-24 17:13:02 +08:00 |
|
shijing
|
a81eea91ca
|
gantt图问题修复
|
2023-11-24 11:38:23 +08:00 |
|
shijing
|
0f6ffb356b
|
el-tag
|
2023-11-24 10:39:36 +08:00 |
|
shijing
|
db3e181254
|
el-tag标签属性type没有primary修正
|
2023-11-24 10:33:13 +08:00 |
|
shijing
|
a79651d7b7
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-23 17:27:34 +08:00 |
|
shijing
|
e548bd52af
|
到岗单加人
|
2023-11-23 17:27:18 +08:00 |
|
caoqianming
|
7659d641ab
|
fix: 解决ResizeObserver loop 的问题
|
2023-11-23 16:24:11 +08:00 |
|
caoqianming
|
0a4b380668
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-23 16:07:54 +08:00 |
|
caoqianming
|
5d8621cac0
|
feat: mgroup增加排班规则字段
|
2023-11-23 16:07:48 +08:00 |
|
shijing
|
c073c25436
|
大屏看板头部字体
|
2023-11-23 16:05:53 +08:00 |
|
shijing
|
dd2fc9a455
|
更改菜单栏
|
2023-11-23 11:29:51 +08:00 |
|
shijing
|
924ed50ce8
|
dataset.delete
|
2023-11-23 11:29:11 +08:00 |
|
shijing
|
9682eadf4f
|
数据大屏
|
2023-11-23 11:25:33 +08:00 |
|
shijing
|
1e18828985
|
到岗记录
|
2023-11-23 11:24:58 +08:00 |
|
shijing
|
74c37d903d
|
性能检验tabs改动及记录查看
|
2023-11-23 11:23:45 +08:00 |
|
shijing
|
d137beb872
|
设备相关改动及设备巡检
|
2023-11-23 11:22:38 +08:00 |
|
shijing
|
ed835482a0
|
统计分析的四个统计模块
|
2023-11-23 11:20:23 +08:00 |
|
shijing
|
07bb1011da
|
抽取组件（table中的行自动循环）
|
2023-11-23 11:19:11 +08:00 |
|
shijing
|
5d125d0875
|
daogangjilu
|
2023-11-21 09:25:43 +08:00 |
|
shijing
|
36321f144d
|
tkx部分更改
|
2023-11-20 18:13:38 +08:00 |
|
shijing
|
0229338a5f
|
team
|
2023-11-20 16:50:23 +08:00 |
|
shijing
|
df9bdab0a6
|
新增查询规范
|
2023-11-20 13:46:29 +08:00 |
|
shijing
|
22cf49a6b3
|
到岗
|
2023-11-17 19:20:29 +08:00 |
|
shijing
|
21764716dd
|
大屏看板
|
2023-11-15 19:05:22 +08:00 |
|
shijing
|
bb40ee35e3
|
vue-json-edit
|
2023-11-14 11:18:57 +08:00 |
|
caoqianming
|
6eee28c91d
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-14 10:28:17 +08:00 |
|
caoqianming
|
5d5ea3e1c3
|
feat: bidataset修改数据
|
2023-11-14 10:26:36 +08:00 |
|
shijing
|
ae78d57720
|
ganttanddialog
|
2023-11-13 18:44:15 +08:00 |
|
shijing
|
821bf22e8c
|
1110笔记部分修改
|
2023-11-13 11:04:39 +08:00 |
|
caoqianming
|
283321f238
|
fix: 大屏及部分bug修复
|
2023-11-13 08:51:08 +08:00 |
|
shijing
|
155a4c7b7e
|
feat: 光子大屏页面调整
|
2023-11-10 08:29:49 +08:00 |
|
shijing
|
b85c654591
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-08 09:23:15 +08:00 |
|
shijing
|
ca3c430e75
|
shujukanbancolorsChange
|
2023-11-08 09:23:12 +08:00 |
|
caoqianming
|
bbb3d40b11
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-08 09:04:37 +08:00 |
|
caoqianming
|
707dbf6a19
|
feat: index_10dept界面修改
|
2023-11-08 09:04:35 +08:00 |
|
shijing
|
2249f5fc3e
|
shujukanbancolorsChange
|
2023-11-08 09:03:05 +08:00 |
|
shijing
|
dfc84e220b
|
shujukanban
|
2023-11-07 14:21:02 +08:00 |
|
caoqianming
|
d261ae7b7e
|
feat: 10dept界面优化
|
2023-11-07 13:03:15 +08:00 |
|
caoqianming
|
d3c47a12c3
|
feat: 安装了datavue3
|
2023-11-07 09:08:35 +08:00 |
|
caoqianming
|
024301c294
|
fix: 解决冲突
|
2023-11-06 19:19:07 +08:00 |
|
caoqianming
|
6c4b1f75d1
|
feat: 车间看板调整
|
2023-11-06 19:16:25 +08:00 |
|
shijing
|
d7c0fa0843
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-11-06 17:43:23 +08:00 |
|
shijing
|
f91ae2f5d2
|
jianyan
|
2023-11-06 17:43:19 +08:00 |
|
caoqianming
|
f3ece1dd0e
|
feat: 增加了车间看板
|
2023-11-06 15:53:22 +08:00 |
|
shijing
|
c5b6eb4f58
|
部分检验
|
2023-11-03 19:24:34 +08:00 |
|
shijing
|
329d30eecb
|
gantt图修改，生产执行修改
|
2023-11-01 10:28:16 +08:00 |
|
shijing
|
9fb27aa062
|
10.26日要修改内容以及检验页面
|
2023-10-27 17:15:36 +08:00 |
|
shijing
|
e246e6f33b
|
1026修改
|
2023-10-26 14:49:50 +08:00 |
|
shijing
|
0c8fd90feb
|
utask分车间创建工段控制显示
|
2023-10-26 08:52:42 +08:00 |
|
shijing
|
3249a6c29d
|
utask分车间创建
|
2023-10-25 18:51:52 +08:00 |
|
caoqianming
|
5a7b647692
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-25 18:32:24 +08:00 |
|
caoqianming
|
4b5c43ae36
|
feat: 页面修改
|
2023-10-25 18:32:22 +08:00 |
|
shijing
|
d6e15c1917
|
7车间
|
2023-10-25 18:29:36 +08:00 |
|
shijing
|
1bdd206573
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-25 17:44:55 +08:00 |
|
caoqianming
|
9557074627
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-25 17:44:46 +08:00 |
|
shijing
|
e7c4832ac0
|
1025
|
2023-10-25 17:44:12 +08:00 |
|
caoqianming
|
c456086901
|
feat: 出入库页面基本完成
|
2023-10-25 17:33:39 +08:00 |
|
shijing
|
8837579a5d
|
mtask日志提交
|
2023-10-25 14:02:08 +08:00 |
|
shijing
|
33343150bf
|
按钮图标更改
|
2023-10-25 13:17:04 +08:00 |
|
shijing
|
b902e59588
|
6车间utask详情
|
2023-10-25 13:09:25 +08:00 |
|
shijing
|
fbc7806a73
|
6车间日志编辑
|
2023-10-25 12:35:32 +08:00 |
|
shijing
|
d15cc32e7d
|
6车间日志提交
|
2023-10-25 10:27:10 +08:00 |
|
shijing
|
59d8c6f3df
|
设备检验记录新增
|
2023-10-24 14:58:57 +08:00 |
|
shijing
|
e5f3d24205
|
worktask
|
2023-10-24 14:55:11 +08:00 |
|
shijing
|
ce1e98df96
|
worktask
|
2023-10-20 18:03:04 +08:00 |
|
shijing
|
740c73ec1f
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-20 09:32:18 +08:00 |
|
shijing
|
7429dd3dce
|
更改样式
|
2023-10-20 09:30:52 +08:00 |
|
caoqianming
|
c4d06c06d0
|
fix: 展示可排产的订单明细
|
2023-10-20 09:07:57 +08:00 |
|
caoqianming
|
f41e7a8a67
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-10-19 14:16:45 +08:00 |
|
shijing
|
51570f408b
|
task2
|
2023-10-19 14:15:32 +08:00 |