Commit Graph

148 Commits

Author SHA1 Message Date
qinoy
0902239d1b 伊利项目-增加审批中状态 2022-07-08 10:46:06 +08:00
chengli
747eaccbcc js文件处理 2022-07-08 10:41:03 +08:00
26354aea07 压缩代码 2022-07-08 10:29:47 +08:00
chengli
038810e31e 上传附件按钮 2022-07-07 22:40:54 +08:00
chengli
5e9dad9823 处理制度条款样式 2022-07-07 22:36:38 +08:00
chengli
d01c69fb4d Merge remote-tracking branch 'origin/master' 2022-07-07 21:45:13 +08:00
chengli
eef12a84aa 导入附件制度 2022-07-07 21:43:02 +08:00
446052889@qq.com
0d29684ecb 提交 2022-07-07 20:57:17 +08:00
mrs_12345@163.com
b12595875c 设计器表格类型换行显示 2022-07-07 20:24:00 +08:00
446052889@qq.com
2af24dff46 形状属性tab切换错误问题 2022-07-07 19:11:04 +08:00
chengli
4d526a3cd2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java
2022-07-07 18:21:08 +08:00
chengli
2130075e31 制度导入时 将正文存为富文本 富文本窗口调大 2022-07-07 18:20:20 +08:00
d733d7bd40 流程代码 2022-07-07 17:54:54 +08:00
anhc
b54b65bc53 新版权限小组角色查询方式调整 2022-07-07 17:22:21 +08:00
5c5bfd37b9 质量校验代码 2022-07-07 17:01:08 +08:00
f9554796cf 流程阅览超链接代码 2022-07-07 16:59:03 +08:00
翟林帆
6dc3bba68b Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-07 15:34:13 +08:00
6514facb8c 增加图形放大缩小功能,优化新建角色模型代码 2022-07-07 15:32:31 +08:00
翟林帆
c9c5256947 Merge remote-tracking branch 'origin/master' 2022-07-07 15:15:54 +08:00
翟林帆
6d5308528b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/Test.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readtable/ReadTable.java
#	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readtable/WordTableAttrFile.java
2022-07-07 15:15:51 +08:00
3ce583eb42 数据迁移代码 2022-07-07 12:25:33 +08:00
798b56d6bf 优化质量校验代码 2022-07-06 23:26:18 +08:00
shangguochao
cb34360976 打包部署测试环境 2022-07-06 21:54:51 +08:00
ca23230e06 评论回复代码 2022-07-06 21:40:53 +08:00
anhc
74ff2c8222 method缓存获取小组用户权限数据方法修改 2022-07-06 20:37:43 +08:00
mrs_12345@163.com
60e400e8cc 快捷调整间距(暂停) 2022-07-06 20:35:13 +08:00
mrs_12345@163.com
c41fb2a31b 设计器文件属性时间选择器位置bug修复 2022-07-06 20:15:45 +08:00
shangguochao
ee65540361 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
2022-07-06 20:03:51 +08:00
shangguochao
8e73127472 测试环境打包 2022-07-06 20:00:16 +08:00
anhc
20f07ce697 method缓存获取小区用户权限数据方法调整 2022-07-06 17:44:45 +08:00
446052889@qq.com
1e5300663a 必填校验逻辑改为后端处理 2022-07-06 17:26:58 +08:00
anhc
c90a483aed 修改小组新增文件接口默认赋值权限 2022-07-06 17:22:31 +08:00
qinoy
ba084184b5 伊利项目-设计器页面版本差异查看 2022-07-06 16:23:21 +08:00
翟林帆
b24da3a557 Merge remote-tracking branch 'origin/master' 2022-07-06 10:17:52 +08:00
翟林帆
df6107eb37 Merge branch 'datamigration-word' of https://e.coding.net/yilidev/yilipalkaifa/apps
 Conflicts:
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/DataMigrationController.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlUtils.java
	com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/Test.java
	com.actionsoft.apps.coe.pal.datamigration/web/com.actionsoft.apps.coe.pal.datamigration/action.xml
2022-07-06 10:16:22 +08:00
anhc
524cd4a96c 新增文件接口中调整权限赋予位置,用户权限缓存补充对隐藏角色权限 2022-07-06 10:01:21 +08:00
chengli
d101790c41 富文本编辑第一版代码。 2022-07-05 23:36:19 +08:00
ea50f67f11 定时同步组织代码 2022-07-05 22:52:53 +08:00
ca1d50da37 定时同步组织代码 2022-07-05 22:51:14 +08:00
anhc
db8b5e6f30 打开设计页面接口内容权限控制调整 2022-07-05 21:25:26 +08:00
shangguochao
a620b40a07 Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps
# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
2022-07-05 21:20:49 +08:00
shangguochao
b51e0692b1 打包同步测试环境 2022-07-05 21:18:20 +08:00
8dfde64abc 定时同步组织代码 2022-07-05 21:12:55 +08:00
227e2b778e Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/apps 2022-07-05 20:53:00 +08:00
anhc
6787b98716 针对文件详情接口添加文件控制权限flag 2022-07-05 20:52:37 +08:00
anhc
a8b8bd3ba3 根据pid获取下属子文件接口权限相关内容调整 2022-07-05 20:06:07 +08:00
fb3a52a499 定时同步组织代码 2022-07-05 18:00:56 +08:00
7c64ee6083 绩效校验 2022-07-05 17:48:47 +08:00
qinoy
d8e065f57e 补提jar包 2022-07-05 17:38:00 +08:00
qinoy
4eb8786fc9 PAL主界面资产文件列表展示版本与状态信息 2022-07-05 17:30:39 +08:00