511 Commits

Author SHA1 Message Date
熊成强
a471fecdc1 优化 2020-10-27 17:59:08 +08:00
熊成强
a5a2d9b78a Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-27 17:22:46 +08:00
熊成强
e335a714a0 优化 2020-10-27 17:22:33 +08:00
sean yu
7222e2e664 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-27 16:23:57 +08:00
sean yu
8ffb591188 添加报表详情页面 2020-10-27 16:23:45 +08:00
leave
eb48db87dd 发起考核成功 跳转 2020-10-27 15:27:36 +08:00
熊成强
b67b061274 优化 2020-10-27 15:17:07 +08:00
熊成强
926fa4e1df 优化 2020-10-27 14:57:51 +08:00
熊成强
9d2cd6b956 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-27 14:38:28 +08:00
熊成强
2faa1a474c 优化 2020-10-27 14:38:15 +08:00
leave
0ecf911979 接口移动 2020-10-27 14:10:09 +08:00
熊成强
d34bb4ebd6 youhua 2020-10-27 11:20:19 +08:00
熊成强
0dfae77379 youhua 2020-10-27 11:18:26 +08:00
sean yu
375f5a78e2 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-27 10:47:45 +08:00
sean yu
a332fdcd74 修改代码规范问题 2020-10-27 10:47:21 +08:00
leave
55f766dd85 no message 2020-10-27 10:13:53 +08:00
leave
2ade0c986e Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0
* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  添加绩效报表页面
  优化

# Conflicts:
#	src/utils/elementConfig.js
2020-10-27 10:03:26 +08:00
leave
c51d447277 考核组添加复选 2020-10-27 10:01:38 +08:00
sean yu
89f5d83681 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-27 09:35:40 +08:00
sean yu
61b7630d7e 添加绩效报表页面 2020-10-27 09:34:29 +08:00
熊成强
35da2c6fd1 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-26 18:16:54 +08:00
熊成强
29555b7c08 优化 2020-10-26 18:16:40 +08:00
leave
abc3de6a57 no message 2020-10-26 14:22:37 +08:00
leave
242ec75113 no message 2020-10-26 14:17:40 +08:00
leave
accfe3a6a3 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0
* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  优化
  优化
  优化
  优化
2020-10-26 14:15:30 +08:00
leave
2a6d420292 no message 2020-10-26 14:15:26 +08:00
熊成强
dc4faf8647 优化 2020-10-26 14:08:41 +08:00
熊成强
c280814d02 优化 2020-10-26 11:47:30 +08:00
熊成强
d5bebe8583 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-26 11:02:07 +08:00
熊成强
c07bdf5fbb 优化 2020-10-26 11:01:12 +08:00
leave
f1ea1eb0cd no message 2020-10-26 10:41:26 +08:00
leave
82594ffe42 no message 2020-10-26 10:31:50 +08:00
熊成强
83c54f0843 优化 2020-10-23 17:48:00 +08:00
熊成强
c8095228d8 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-23 16:56:28 +08:00
熊成强
11e8fad286 优化 2020-10-23 16:55:44 +08:00
yoe
91a3784679 update README 2020-10-23 15:21:25 +08:00
leave
1e16b683b3 no message 2020-10-23 10:17:23 +08:00
leave
27eb523fcd Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0
* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  youhua

# Conflicts:
#	src/components/PopupRight/index.vue
#	src/views/kpi/workbench/assessmentGroup/edit/components/process.vue
2020-10-22 18:56:54 +08:00
leave
6c5aceb884 no message 2020-10-22 18:56:19 +08:00
熊成强
c486ebc5a0 youhua 2020-10-22 18:47:07 +08:00
熊成强
d49910a872 youhua 2020-10-22 18:45:05 +08:00
leave
814440fdad Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0
* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  youhua

# Conflicts:
#	src/main.js
2020-10-22 14:41:47 +08:00
leave
a2049cefe6 发起考核 2020-10-22 14:40:21 +08:00
熊成强
667b361f1b Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0 2020-10-22 14:38:34 +08:00
熊成强
f994dc56ea 优化考评组编辑todo流程设计 2020-10-22 14:36:49 +08:00
leave
db1b770b61 Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0
* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  update 配置优化
  update 配置优化
  update 系统优化
2020-10-21 18:54:35 +08:00
leave
f04f63a075 发起考核 2020-10-21 18:54:32 +08:00
熊成强
d4a8805b14 youhua 2020-10-21 15:59:50 +08:00
yoe
c562fd3c7a update 配置优化 2020-10-21 15:36:04 +08:00
yoe
5a23198772 update 配置优化 2020-10-21 15:33:05 +08:00