Commit Graph

199 Commits

Author SHA1 Message Date
‘937886381’
83b9867c2a Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-28 13:16:07 +08:00
‘937886381’
7b8f4cac21 修改bug 2024-06-28 13:15:43 +08:00
fc21359f8f 样式 2024-06-28 11:09:02 +08:00
daaec2417c Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-27 16:57:20 +08:00
d27e56cd7f 报表样式 2024-06-27 16:55:47 +08:00
‘937886381’
445ebe339d Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-27 15:47:28 +08:00
‘937886381’
353e3e0f35 修改bug 2024-06-27 15:47:07 +08:00
helloDy
d5673f3c9f 工厂更改 2024-06-27 14:56:47 +08:00
helloDy
3064722052 Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-27 14:53:37 +08:00
helloDy
dfe52cbac5 工单管理详情ui 2024-06-27 14:53:11 +08:00
‘937886381’
fb74340f0f 修改滚动条样式及导出 2024-06-27 13:58:58 +08:00
‘937886381’
51938926d3 修改bug 2024-06-27 09:28:04 +08:00
‘937886381’
44c5271b5a 修改bug 2024-06-26 16:56:22 +08:00
‘937886381’
f67e781146 修改bug 2024-06-26 15:18:38 +08:00
‘937886381’
f2cfe94dfc 剞劂冲突 2024-06-26 11:00:48 +08:00
‘937886381’
92c0c33fbd 修改bug 2024-06-26 10:59:23 +08:00
helloDy
4e5a5f9ba2 2024-06-25 14:35:23 +08:00
helloDy
3c5163bd66 merge 2024-06-24 16:58:08 +08:00
helloDy
8437d52c1b bug 2024-06-24 16:57:15 +08:00
703334ac3c mt 2024-06-24 13:32:34 +08:00
3c6e408074 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-24 13:27:57 +08:00
a9392c8999 1 2024-06-24 13:27:09 +08:00
‘937886381’
196a615f61 修改bug 2024-06-24 10:44:21 +08:00
‘937886381’
5e703350e1 修改bug 2024-06-24 10:39:10 +08:00
‘937886381’
0c2221b373 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-24 09:48:30 +08:00
‘937886381’
0992940655 修改bug 2024-06-24 09:48:06 +08:00
582484f6db 时间 2024-06-24 09:15:51 +08:00
b6aa6a19f4 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-21 16:21:02 +08:00
a9e176be74 1 2024-06-21 16:20:14 +08:00
‘937886381’
c7205e32a3 报表 2024-06-21 16:17:25 +08:00
‘937886381’
670d7e5600 报表 2024-06-21 16:04:50 +08:00
‘937886381’
0eb17fa08b 报表 2024-06-20 20:54:34 +08:00
‘937886381’
cc800eae5d Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-20 20:38:45 +08:00
‘937886381’
6be1a83dd8 报表 2024-06-20 20:38:11 +08:00
4fb88a5201 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-20 17:08:51 +08:00
0e60ba7dc8 1 2024-06-20 17:07:57 +08:00
helloDy
510f12e40b Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-20 16:54:45 +08:00
helloDy
7a67da105f bug 2024-06-20 16:54:14 +08:00
e512ad5858 1 2024-06-20 16:51:44 +08:00
ce350c0c7f 剩余报表 2024-06-20 15:23:05 +08:00
7ba831f496 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-19 16:51:33 +08:00
78d387b2c6 1 2024-06-19 16:50:44 +08:00
‘937886381’
15d3b3622c Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-19 16:26:17 +08:00
‘937886381’
c8bc54e04b 报表 2024-06-19 16:25:50 +08:00
helloDy
2368916e62 merge 2024-06-19 16:06:12 +08:00
helloDy
2d5bd161f3 生产数据管理 2024-06-19 16:04:42 +08:00
9de0dfc639 对接报表 2024-06-19 16:01:13 +08:00
45538e80c4 mt 2024-06-19 08:50:24 +08:00
be75dd0702 报表2页面 2024-06-19 08:48:48 +08:00
‘937886381’
41d554f897 修改bug 2024-06-18 15:55:48 +08:00
‘937886381’
d95853dec2 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-18 10:25:39 +08:00
‘937886381’
eacf93e0db 修改bug 2024-06-18 10:25:13 +08:00
helloDy
7f379f2589 Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-18 08:48:31 +08:00
helloDy
e990680159 bug 2024-06-18 08:47:53 +08:00
‘937886381’
14c782f112 修改 2024-06-17 16:59:41 +08:00
‘937886381’
0ef7c9808c Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-17 15:35:14 +08:00
‘937886381’
f241a35252 修改 2024-06-17 15:34:37 +08:00
89b71d5aa2 报表样式2.0 2024-06-17 13:40:30 +08:00
helloDy
e1e39681ce merge 2024-06-17 09:01:58 +08:00
helloDy
2d49bfe10e bug 2024-06-17 09:00:07 +08:00
‘937886381’
03dd862cb4 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-14 10:18:46 +08:00
‘937886381’
f14e9d7408 修改bug 2024-06-14 10:18:20 +08:00
2ab8acd4ca 报表样式 2024-06-13 17:12:50 +08:00
05b5814907 报表 2024-06-13 15:36:02 +08:00
3d7e3d828c Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-12 13:28:22 +08:00
5f98f4a361 产量对标FTo 2024-06-12 13:27:09 +08:00
‘937886381’
fad6028469 新增报表 2024-06-11 14:08:32 +08:00
‘937886381’
b40414b837 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 14:56:26 +08:00
‘937886381’
a2e73b25ce 修改 2024-06-07 14:48:33 +08:00
helloDy
0a10b7f177 Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-07 14:16:51 +08:00
helloDy
39cb9acfec 工单 2024-06-07 14:16:20 +08:00
‘937886381’
9854dd83b2 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 11:14:42 +08:00
‘937886381’
ef618a4abb 修改bug 2024-06-07 11:13:59 +08:00
helloDy
1a3599a42b Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-05 16:43:31 +08:00
helloDy
8a08846198 bug 工单详情 2024-06-05 16:42:54 +08:00
‘937886381’
035bf0e095 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-05 14:14:44 +08:00
‘937886381’
69f953fb0c 修改 2024-06-05 14:14:12 +08:00
7fc6ed87a4 修改bug 2024-06-04 15:43:00 +08:00
7c6949dfa0 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-04 09:08:07 +08:00
helloDy
c77130603e merge 2024-06-04 08:56:52 +08:00
helloDy
7cb8abd618 滚动条 2024-06-04 08:55:45 +08:00
c6169afaec Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-04 08:36:06 +08:00
ff98ad35c5 logo图标等 2024-06-04 08:35:23 +08:00
‘937886381’
9d11f8b943 修改 2024-06-03 16:42:28 +08:00
‘937886381’
38b278530c Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-03 08:57:56 +08:00
‘937886381’
7a9549bc8f 修改bug 2024-06-03 08:57:04 +08:00
helloDy
44283a049b merge 2024-06-03 08:52:30 +08:00
helloDy
da14d9f018 merge 2024-06-03 08:44:28 +08:00
helloDy
fe70138870 生产管理 2024-06-03 08:37:31 +08:00
‘937886381’
38665c38bd 修改 2024-06-03 08:23:40 +08:00
‘937886381’
91fd1b09d5 工厂驾驶舱 2024-05-30 16:00:18 +08:00
‘937886381’
4569d047d7 解决冲突 2024-05-29 17:07:09 +08:00
‘937886381’
dc1667cdb7 产量和效率 2024-05-29 17:05:55 +08:00
4b0e8dfab6 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-29 13:14:43 +08:00
71a428f034 系统管理 2024-05-29 13:13:46 +08:00
helloDy
8fd8c36b8a merge 2024-05-22 16:31:29 +08:00
helloDy
fe39f72045 生产管理 2024-05-22 16:28:47 +08:00
‘937886381’
5c05e6c2e4 修改ui 2024-05-21 09:13:52 +08:00
ab4d7a8e4b Merge pull request 'projects/mescc/zjl' (#20) from projects/mescc/zjl into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #20
2024-05-21 08:35:14 +08:00
3228987c40 1 2024-05-21 08:34:03 +08:00