zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,349 Commits 3 Branches 0 Tags 30 MiB
Commit Graph

411 Commits

Author SHA1 Message Date
shijing e6ac8cb90f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-27 11:28:53 +08:00
shijing 868a96e591 bigScreenModel 2022-01-27 11:28:19 +08:00
shilixia d551af491a renyuan 2022-01-27 10:30:48 +08:00
shilixia 2c937c983f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-26 15:59:59 +08:00
shilixia 6de8c40d60 xiuagi 2022-01-26 15:59:51 +08:00
shijing 09f1937474 searchshiftandaddtwowarnings 2022-01-26 14:00:12 +08:00
shilixia 60f726cda6 ceshi 2022-01-25 09:57:51 +08:00
shilixia 938ebf1e28 denglijiekou 2022-01-25 09:56:14 +08:00
shijing b3d54ce4c0 InterfaceChange 2022-01-25 09:54:40 +08:00
shijing 84ba98925d 0124 2022-01-25 08:48:05 +08:00
shijing 3eb5c6ac76 首页布局调整 2022-01-24 11:02:18 +08:00
shijing 400173c0cf Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 17:14:44 +08:00
shijing c2d2e2405b 检查记录添加操作人首页微调刷脸签到 2022-01-21 17:14:36 +08:00
shilixia c35051df0c Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-21 15:19:49 +08:00
shilixia fcc6cfbade shebei 2022-01-21 15:19:42 +08:00
shijing 0f8128a5d8 物料安全库存 2022-01-21 10:55:07 +08:00
shijing d1270c16ab newStyle 2022-01-21 08:30:22 +08:00
shijing 0796f30cb1 dashPage 2022-01-20 15:45:32 +08:00
shijing 9a31871839 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 14:16:44 +08:00
shijing e07b5a4c5d somewarnfixandtestshow 2022-01-17 14:16:37 +08:00
shilixia a14dac9bda tijiao 2022-01-17 14:13:28 +08:00
shilixia 1c62a21a56 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-17 13:22:05 +08:00
shilixia f24cfcb9ea xiugai 2022-01-17 13:21:59 +08:00
shijing ce4bbd0896 bugfix 2022-01-17 10:32:17 +08:00
shijing a98de8720a bugfix 2022-01-17 10:30:24 +08:00
shijing db83e0224e bugfix 2022-01-17 10:26:24 +08:00
shilixia 371ee6ecf4 xiugai 2022-01-17 09:04:51 +08:00
shilixia aa76888a57 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-14 16:46:11 +08:00
shilixia b7b32b2320 xiugai 2022-01-14 16:46:04 +08:00
shijing c1ddf3ce30 required 2022-01-14 08:36:40 +08:00
shijing c3b3f52196 clear 2022-01-13 16:50:33 +08:00
shijing 42659b9b85 changes 2022-01-13 16:48:20 +08:00
shijing ddfe733664 changes 2022-01-13 16:42:26 +08:00
shilixia 36c1158691 xiugai 2022-01-13 16:11:19 +08:00
shilixia f02e5504f5 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-12 10:35:19 +08:00
shilixia 362df53bd4 liuchengka 2022-01-12 10:34:58 +08:00
shijing dc3067a101 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-12 10:33:50 +08:00
shijing 46048efa86 punchtheclock 2022-01-12 10:33:37 +08:00
shilixia f0a3427422 ceshi 2022-01-06 08:40:42 +08:00
shilixia 9fd1e20008 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-06 08:34:53 +08:00
shilixia c8589cb158 xialiao 2022-01-06 08:34:46 +08:00
shijing da1bbf36c8 0104 2022-01-04 17:02:55 +08:00
shijing 9fa9b34968 0104 2022-01-04 17:01:20 +08:00
shilixia 1bc22240b7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-01-04 09:44:45 +08:00
shilixia 3b1fefc696 jianyantianjiaqiyong 2022-01-04 09:44:39 +08:00
caoqianming 6b5b5e9911 不合格审理返回decision_2 bug 2021-12-31 16:44:53 +08:00
shijing 801b41221e Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-31 13:20:53 +08:00
shijing c47b65a625 dashBoard 2021-12-31 13:20:45 +08:00
shilixia a0186dbdbb guochengjianyan 2021-12-31 13:19:21 +08:00
shilixia d031f16be7 ziliangguanli 2021-12-31 09:05:00 +08:00
shilixia fa867475c3 xial 2021-12-31 08:42:06 +08:00
shijing 319b228508 1230 2021-12-30 17:13:32 +08:00
shilixia d3401e3fe9 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-30 14:17:37 +08:00
shilixia 5c4c5c7688 xiala 2021-12-30 14:17:29 +08:00
shijing e2ee06e21b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-29 17:02:30 +08:00
shijing 3ce616de61 1229 2021-12-29 17:02:21 +08:00
caoqianming ba2e583b26 fix conflict 2021-12-29 15:28:51 +08:00
caoqianming 17b7345e95 前端修改 2021-12-29 15:26:17 +08:00
shilixia 0ddff915b8 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-29 14:56:38 +08:00
shilixia 561d712641 xial 2021-12-29 14:56:30 +08:00
caoqianming b5fdd13343 前端调整 2021-12-29 14:51:39 +08:00
shilixia 6e4914b6c8 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-29 14:02:05 +08:00
shilixia 8896cbd718 xiala 2021-12-29 14:01:54 +08:00
shijing d5c3e627b4 1228 2021-12-28 17:07:12 +08:00
shijing 90f02fd7bb sssss 2021-12-27 17:09:56 +08:00
shijing 71a0858126 retrial 2021-12-27 10:11:11 +08:00
shijing 2e73713bae Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-23 16:59:18 +08:00
shijing 8825054574 gantt&parameter 2021-12-23 16:59:07 +08:00
shilixia baef10ec19 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-23 10:19:09 +08:00
shilixia 2cdec7658d xiugai 2021-12-23 10:19:02 +08:00
shijing ced9543568 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-23 10:09:43 +08:00
shijing 3433bbc204 workflowFile 2021-12-23 10:09:31 +08:00
shilixia 3772a9b715 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-22 09:46:23 +08:00
shilixia feffb4eaca baofei 2021-12-22 09:46:15 +08:00
shijing ac2dd89df4 ganttchange 2021-12-21 17:01:16 +08:00
shilixia 3c29f07edc renwuguanl22i 2021-12-20 16:31:27 +08:00
shilixia be1169e158 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 16:26:12 +08:00
shilixia 5a83ffbe80 renwuguanli 2021-12-20 16:26:06 +08:00
shijing eb5c5ed920 test 2021-12-20 14:47:46 +08:00
shijing 8a36bf26bd Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 14:38:13 +08:00
shijing cd4556a644 ganttTimeRange 2021-12-20 14:38:04 +08:00
shilixia eef9972931 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 14:12:31 +08:00
shilixia 85c8a85594 baofei 2021-12-20 14:12:24 +08:00
shijing d94b9c4827 ganttBottom 2021-12-20 11:32:25 +08:00
shijing 3ca92c4423 gant1 2021-12-17 16:05:39 +08:00
shijing 88d2e747d9 gantt 2021-12-17 15:11:55 +08:00
shijing 65280b7411 ddd 2021-12-17 09:19:15 +08:00
shijing f41c41836c Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-16 23:37:45 +08:00
shijing 3a6c31ea77 testRecordandshowgantt 2021-12-16 23:37:32 +08:00
shilixia e4706e2635 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-16 16:28:19 +08:00
shilixia e129f7e306 xiugai 2021-12-16 16:28:11 +08:00
shijing bab19a707d change 2021-12-15 23:17:11 +08:00
shijing 1f83b26fa5 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-15 23:07:28 +08:00
shijing f34ecf8395 test&gantt 2021-12-15 23:07:12 +08:00
shilixia cff7457b50 xiugai 2021-12-13 14:48:37 +08:00
shilixia d85ac1c7e0 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-13 14:29:13 +08:00
shilixia 70f6ade5e0 xiugai 2021-12-13 14:29:06 +08:00
shijing 2adfc2d712 review 2021-12-13 13:44:44 +08:00
shijing b4a03a1feb description 2021-12-10 13:39:17 +08:00
shijing 04fe8bd75f description 2021-12-10 13:35:37 +08:00
shilixia c24a68bedc 批量提交 2021-12-10 13:23:44 +08:00
shilixia 6097bcaa62 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-07 15:05:47 +08:00
shilixia 447886c609 junjian 2021-12-07 15:05:41 +08:00
shijing 68162baacc need.vue 2021-12-06 15:31:20 +08:00
shijing 68288515a4 jianchabioa 2021-12-06 14:12:11 +08:00
shijing 7555ef9dba needCheckForm 2021-12-06 13:18:20 +08:00
shilixia bf3bbb0c3a xiugai 2021-12-06 09:53:02 +08:00
shilixia 58d1ccc9bf Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-03 15:18:55 +08:00
shilixia 7752f45968 xiugai 2021-12-03 15:18:49 +08:00
shijing b939fd9ca7 formImage 2021-12-03 09:56:53 +08:00
shijing 90586a7d7d Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-02 14:56:32 +08:00
shijing 5bac47bfb0 customForm 2021-12-02 14:56:24 +08:00
shilixia f22078bb0a xiug 2021-12-02 09:10:13 +08:00
shilixia 227a2de5e3 tijiao 2021-12-02 08:32:51 +08:00
shilixia 9997d41b52 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-01 13:07:33 +08:00
shilixia fae3873170 xiugaitijiao 2021-12-01 13:07:26 +08:00
caoqianming bb324727e0 增加待复检 2021-11-29 14:57:11 +08:00
shilixia 4dfdd09a3c xiugaiyangshi 2021-11-24 16:11:14 +08:00
shilixia 2ed882f611 tijiao 2021-11-24 14:49:49 +08:00
shilixia c5857abdbf xiugai 2021-11-24 14:46:33 +08:00
shilixia 2274557301 tijiao 2021-11-24 14:27:19 +08:00
shilixia 5319f76028 xiugai 2021-11-24 14:11:48 +08:00
shilixia 58a05bb2f2 wenti 2021-11-24 10:37:05 +08:00
shilixia a4c37d5255 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-23 15:20:56 +08:00
shilixia fd15d0a299 caozuo 2021-11-23 15:20:49 +08:00
shijing 321b819312 picture 2021-11-23 15:19:40 +08:00
shijing 647486b959 picture 2021-11-23 14:57:41 +08:00
shijing 995649ad25 glassPicture 2021-11-23 13:59:09 +08:00
shijing 07750baa99 glassPicture 2021-11-23 10:01:06 +08:00
shijing d0f9030cfc Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-22 14:08:30 +08:00
shijing b609a72408 customForm 2021-11-22 14:05:37 +08:00
shilixia c03dda3960 tijao 2021-11-18 09:47:42 +08:00
shilixia 1d7c81ab3c Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-18 08:27:42 +08:00
shilixia fde8a60539 xial 2021-11-18 08:27:33 +08:00
caoqianming 3fbede05f7 表字段改动 2021-11-18 08:25:02 +08:00
shilixia 6e2e80e77b jianyan 2021-11-17 15:13:55 +08:00
shilixia 02a27daf6f fenye 2021-11-16 14:21:02 +08:00
shilixia 23dd292e80 -m 2021-11-16 10:44:55 +08:00
shilixia 4e0d5f4f2e guize 2021-11-16 10:38:17 +08:00
shilixia f63bb65a9e Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-12 08:36:47 +08:00
shilixia 8375698ffe jie,iamtiaozheng 2021-11-12 08:36:38 +08:00
caoqianming 487c8fac28 出入库详情带仓库 2021-11-11 09:22:15 +08:00
shilixia ae49320b5f biaoge 2021-11-10 15:14:31 +08:00
shilixia aeb36c2bea xiugai 2021-11-10 14:28:16 +08:00
shilixia 2b2f275402 xiugai 2021-11-10 14:02:39 +08:00
shilixia 4950bcd2f9 xiugai 2021-11-10 09:56:08 +08:00
shilixia 91d82a7882 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-10 09:07:43 +08:00
shilixia 1665ee1f76 chejiancaozuo 2021-11-10 09:07:35 +08:00
caoqianming 2b3f45eb7f 修改表名 2021-11-09 00:14:30 +08:00
shilixia d5336df9fc Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-03 11:27:23 +08:00
shilixia 21c70255b8 chejian 2021-11-03 11:27:16 +08:00
caoqianming b47b2017de 页面调整 2021-11-03 08:19:51 +08:00
shijing 168c8df4fd Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-02 16:26:39 +08:00
shijing 5d21ebd3fc timerClose 2021-11-02 16:26:30 +08:00
caoqianming 40840446a4 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-02 09:49:18 +08:00
caoqianming 1fa86988f1 物料批次号 2021-11-02 09:49:08 +08:00
shilixia 1f7251211b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-01 16:56:59 +08:00
shilixia a816d45988 xiugaineirong 2021-11-01 16:56:53 +08:00
shijing 7be9e553f1 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-11-01 15:38:23 +08:00
shijing fced843b99 polling 2021-11-01 15:38:11 +08:00
shilixia 01e44e44df xiugai 2021-11-01 14:52:07 +08:00
shilixia bed00aaaea shanchu 2021-11-01 13:11:51 +08:00
shilixia 1f53777f4f danweirijiao 2021-11-01 09:41:39 +08:00
shilixia e71d5e0e32 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-29 11:10:42 +08:00
shilixia 3481e13e44 cangku 2021-10-29 11:10:31 +08:00
shijing 46e1547571 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-25 15:17:54 +08:00
shijing a1daf44643 refresh 2021-10-25 15:17:41 +08:00
shilixia fd371532f5 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-25 11:22:51 +08:00
shilixia 6111646dda xiugai 2021-10-25 11:22:45 +08:00
caoqianming 7eb98fd30b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-25 09:17:47 +08:00
caoqianming 7eaabfc3b9 更改背景色 2021-10-25 09:17:41 +08:00
shilixia c378f99965 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-25 09:02:05 +08:00
shilixia 33802c4aae ziyuan 2021-10-25 09:01:57 +08:00
shijing f45005b843 codeHandle 2021-10-22 16:25:30 +08:00
shijing 8db20b3f0f 1020 2021-10-20 15:50:34 +08:00
shijing 76d1142741 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-19 16:38:48 +08:00
shijing ba69ce62de floatButton 2021-10-19 16:38:39 +08:00
caoqianming 1d056a775f 增加子生产进度表 2021-10-19 09:46:44 +08:00
caoqianming 7509ff0e15 人脸识别基本完成 2021-10-18 14:18:11 +08:00
shijing 5ac6a2b1bf ticketDelete 2021-10-15 16:08:25 +08:00
shijing 22b52686bc ticketdelete 2021-10-15 16:03:50 +08:00
shilixia e683cf39ca shengchanzijihua 2021-10-15 10:14:19 +08:00
shilixia 9592cb5fbc Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-14 10:21:42 +08:00
shilixia 93c92f0dc2 shengchanziyuanoeizhi 2021-10-14 10:21:35 +08:00
shijing 7cbbdfaf48 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-13 09:54:18 +08:00
shijing e3e9116b59 1013 2021-10-13 09:54:11 +08:00
shilixia cf8be1af3f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-10-13 09:36:08 +08:00
shilixia 19b684192a chanpinguanli 2021-10-13 09:27:15 +08:00
shijing 898fd9b320 workflowBranch 2021-10-12 10:37:38 +08:00
shijing 35ab5f1c79 workflowRefresh 2021-10-08 08:39:16 +08:00
shilixia bf375e000a Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-29 09:57:41 +08:00
shilixia c36d214573 xial 2021-09-29 09:57:33 +08:00
shijing 12c0ad0267 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-29 09:39:54 +08:00
shijing e921634fee transitions 2021-09-29 09:39:46 +08:00
shilixia d2f6cf1b04 tijiao 2021-09-28 17:03:18 +08:00
shilixia b963b53140 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-28 14:01:37 +08:00
shilixia 768d6156b7 xial 2021-09-28 14:01:30 +08:00
shijing e6edee03ea ticketSearch 2021-09-26 09:04:14 +08:00
shijing 767c20bc90 workflowMenu 2021-09-24 15:32:30 +08:00
shijing cdc0d30244 workflowTrans 2021-09-23 16:29:11 +08:00