shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								80c2676551
								
							
						 | 
						
							
							
								
								#90到岗记录第二次新建回携带数据有显示问题
							
							
							
							
							
						 | 
						
							2023-12-26 09:31:43 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								e2b980a6d0
								
							
						 | 
						
							
							
								
								登录页logo大小调整
							
							
							
							
							
						 | 
						
							2023-12-26 09:20:53 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								8c835fe715
								
							
						 | 
						
							
							
								
								数据大屏数据同步
							
							
							
							
							
						 | 
						
							2023-12-25 17:30:11 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								b11e2aaeb4
								
							
						 | 
						
							
							
								
								数据大屏数据同步
							
							
							
							
							
						 | 
						
							2023-12-25 16:57:55 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								d7d215fbd7
								
							
						 | 
						
							
							
								
								Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
							
							
							
							
							
						 | 
						
							2023-12-25 13:51:10 +08:00 | 
						
					
				
					
						
							
							
								
								 shijing
							
						 | 
						
							
							
							
							
							
								
							
							
								64b6b7b3dc
								
							
						 | 
						
							
							
								
								6车间看板
							
							
							
							
							
						 | 
						
							2023-12-25 13:51:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								02162eb83e
								
							
						 | 
						
							
							
								
								fix: 车间库存显示count__gte
							
							
							
							
							
						 | 
						
							2023-12-25 13:09:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eee2fb8372
								
							
						 | 
						
							
							
								
								Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
							
							
							
							
							
						 | 
						
							2023-12-25 12:48:10 +08:00 | 
						
					
				
					
						
							
							
								
								 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
							
						 | 
						
							
							
							
							
							
								
							
							
								76d9be2492
								
							
						 | 
						
							
							
								
								Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2
							
							
							
							
							
						 | 
						
							2023-12-24 19:00:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b379532a9e
								
							
						 | 
						
							
							
								
								修改10车间显示物料全名及不合格数
							
							
							
							
							
						 | 
						
							2023-12-24 19:00:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f8f8569e94
								
							
						 | 
						
							
							
								
								fix: 6车间日志输出物料全名以及显示不合格合计数
							
							
							
							
							
						 | 
						
							2023-12-24 18:58:43 +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 |