Commit Graph

595 Commits

Author SHA1 Message Date
wuhongjian 6736a8d434 Merge branch 'hi-ucs-dev' into release 2022-12-29 17:34:40 +08:00
wuhongjian 1af058fc79 冲突解决 2022-12-29 17:32:44 +08:00
gongjiale abc52acd9b Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	back/src/views/modules/ability/bsabilityai.vue
2022-12-29 16:33:21 +08:00
gongjiale 7286ced04e 修改bug 2022-12-29 16:33:03 +08:00
a0049873 1e4d145fe0 删除console 2022-12-29 15:11:43 +08:00
a0049873 09edc0fb05 西海岸-管理后台打开后,新提一个流程、操作一个流程,回到后台管理统计数字有误,缺少刷新,切换菜单也不能刷新 2022-12-29 11:03:38 +08:00
a0049873 6734eafbdd UCS后台应用资源、组件资源功能修改的时候不能进行修改只能删除----需求调整为后台能力资源挂接页面样式功能调整 2022-12-29 09:40:59 +08:00
wuhongjian 91a295c557 bug修复 2022-12-28 17:30:53 +08:00
wuhongjian c76f55d9ed bug修复 2022-12-28 17:13:31 +08:00
gongjiale ebd946b333 会议室bug修改 2022-12-28 16:01:05 +08:00
gongjiale ee56af20ec 修改问题 2022-12-28 15:32:12 +08:00
wuhongjian ed8fed60b5 254问题修复 2022-12-26 16:13:15 +08:00
gongjiale a3381da1e0 修改 2022-12-26 09:35:20 +08:00
gongjiale 35b85eab73 提交 2022-12-26 09:31:18 +08:00
gongjiale 359115ccf8 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-26 09:29:48 +08:00
gongjiale 3d8f7cfff8 111 2022-12-26 09:27:56 +08:00
gongjiale d9a0403981 1 2022-12-26 09:20:30 +08:00
a0049873 f368998a6d BUG修改 2022-12-23 16:58:27 +08:00
a0049873 84b0f2eba8 特殊字段添加编辑功能 上架左侧添加进度条 2022-12-21 09:06:36 +08:00
a0049873 7b7bd5409d Merge branch 'hi-ucs-dev' into release 2022-12-16 16:08:14 +08:00
a0049873 307f5bb4ce 能力挂接根据账号筛选 2022-12-16 16:06:57 +08:00
a0049873 6270f3bf6d 工作台会客厅跳转 能力挂接页面 部门过滤 2022-12-16 14:21:04 +08:00
a0049873 4dc1f7190e Merge branch 'hi-ucs-dev' into release
# Conflicts:
#	front/src/App.vue
#	front/src/views/detailsAll/ApplicationDetails.vue
2022-12-15 13:48:56 +08:00
gongjiale 1e6707711e 提交 2022-12-15 10:17:34 +08:00
a0049873 6b143f2f75 审核组模块开发 2022-12-14 15:56:43 +08:00
a0049873 95252d1f49 工作台我的已办不刷新
需求申请被驳回之后,点击修改,之前的附件名称被修改了,直接命名为附件,而非原附件名称
2022-12-13 11:36:05 +08:00
gongjiale c57e81b4b2 修改市局 2022-12-12 20:42:45 +08:00
gongjiale d482042bcb 提交部分 2022-12-12 17:01:29 +08:00
gongjiale 9937237959 提交市局修改 2022-12-10 20:25:43 +08:00
a0049873 ad65db6236 BUG修改 2022-12-09 14:47:36 +08:00
wuhongjian 3a99111ad8 解决button提交表单问题 2022-12-09 10:27:05 +08:00
wuhongjian dd30c22954 Merge branch 'hi-ucs-dev' of http://10.16.3.230:8011/wuhongjian/hi-ucs-web into hi-ucs-dev 2022-12-08 17:33:17 +08:00
wuhongjian dff7426103 下载bug 2022-12-08 17:27:30 +08:00
a0049873 ebaec6bda1 宽度调整 2022-12-08 14:53:23 +08:00
a0049873 693dd1211f 宽度调整 2022-12-08 14:49:27 +08:00
a0049873 ef987f2d42 Merge branch 'hi-ucs-dev' into release
# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/src/App.vue
2022-12-08 13:43:39 +08:00
gongjiale 99ebdc2516 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-07 15:34:10 +08:00
gongjiale 1c739cca2e 修改UI 2022-12-07 15:33:59 +08:00
a0049873 cfcf580da2 拆分会客厅 2022-12-07 09:36:45 +08:00
DESKTOP-9CT32MA\Administrator 417c89b9be 知识库: 所属产品线更改为下拉(跟归属单位一样) 2022-12-06 18:32:54 +08:00
a0049873 7a096d5dc1 批量审批开发 2022-12-06 11:19:50 +08:00
gongjiale 15d0c850c4 修改jire问题 2022-12-05 15:40:55 +08:00
a0049873 ddc0b15123 tab相关BUG修改 jira269 2022-12-03 16:27:24 +08:00
a0049873 5c45ee5ea5 BUG修改 2022-12-03 15:13:13 +08:00
gongjiale 073713cf95 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-12-02 16:06:06 +08:00
gongjiale 44f03b7e96 修改样式 2022-12-02 16:05:46 +08:00
a0049873 1c53bba435 通知开发 水印修改 BUG修改 2022-12-02 14:50:41 +08:00
gongjiale 8afd825ffc 11 2022-12-02 09:00:16 +08:00
guoyue 3277a350f4 知识库上架编辑 2022-12-01 17:35:15 +08:00
guoyue 421524edaa fix知识库删除 2022-12-01 17:28:04 +08:00