 caoqianming
|
e355fcedc7
|
fix: 6车间任务执行筛选及相关调整
|
2023-12-25 12:48:09 +08:00 |
 shijing
|
495955c495
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-25 11:03:21 +08:00 |
|
shijing
|
5e26baf75f
|
6车间看板
|
2023-12-25 11:03:15 +08:00 |
|
caoqianming
|
29bd6ac6a2
|
fix: 进入某些出入库记录时不用做限制以及部分优化
|
2023-12-25 10:46:48 +08:00 |
|
caoqianming
|
611255a2d0
|
fix: 仓库查看按钮先去除
|
2023-12-25 10:08:35 +08:00 |
|
caoqianming
|
6a212139d2
|
fix: 10车间日志展示调宽
|
2023-12-25 09:18:53 +08:00 |
|
caoqianming
|
b379532a9e
|
修改10车间显示物料全名及不合格数
|
2023-12-24 19:00:11 +08:00 |
|
caoqianming
|
99413a3fef
|
fix: 切换账号时菜单不变化
|
2023-12-24 18:49:12 +08:00 |
|
caoqianming
|
7591e3c34c
|
fix: 移动端logo和name从config获取
|
2023-12-24 18:35:27 +08:00 |
|
caoqianming
|
a24eece353
|
feat: 去除不必要的超管判断
|
2023-12-23 17:31:25 +08:00 |
|
caoqianming
|
e4658ea882
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-23 17:30:46 +08:00 |
|
caoqianming
|
795044c841
|
fix: worktask_form放出班次
|
2023-12-23 17:30:43 +08:00 |
|
shijing
|
0ecd78bf40
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-22 17:46:14 +08:00 |
|
shijing
|
e8ae54f706
|
车间看板
|
2023-12-22 17:46:09 +08:00 |
|
caoqianming
|
8f79680b21
|
fix: selectMaterialChange bug
|
2023-12-22 14:04:33 +08:00 |
|
caoqianming
|
222d766c11
|
fix: 出入库记录物料批次选择
|
2023-12-22 13:46:54 +08:00 |
|
caoqianming
|
517d10b572
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-22 13:46:22 +08:00 |
|
caoqianming
|
9182c99ba1
|
fix: 部分按钮添加v-auth
|
2023-12-22 13:46:19 +08:00 |
|
shijing
|
17dd67d1b4
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
|
2023-12-22 11:11:39 +08:00 |
|
shijing
|
9669badae8
|
index_10dept
|
2023-12-22 11:11:36 +08:00 |
|
caoqianming
|
a9d0660617
|
fix: 型号规格用|隔开
|
2023-12-22 10:58:50 +08:00 |
|
caoqianming
|
a1b74f4639
|
fix: 班次选择，先这样处理
|
2023-12-22 10:38:09 +08:00 |
|
caoqianming
|
b207edccf5
|
fix: 任务分解按钮code错误
|
2023-12-22 09:40:58 +08:00 |
|
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 |