Commit Graph

717 Commits

Author SHA1 Message Date
gaoyuanwei 2905416d07 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 19:34:50 +08:00
gaoyuanwei 2548beb7c1 650、657bug 2022-07-19 19:34:43 +08:00
a0049873 0a2ebce897 完善 挂载 2022-07-19 19:30:42 +08:00
a0049873 f820d49f58 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
2022-07-19 18:52:02 +08:00
a0049873 7bcb6b2062 修改多条添加逻辑 2022-07-19 18:51:21 +08:00
gaoyuanwei b6ce94a078 修改来源应用为下拉框 2022-07-19 17:44:39 +08:00
gaoyuanwei 166f6f91be Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 17:17:30 +08:00
gaoyuanwei a5ef8d2046 bug==select 2022-07-19 17:17:19 +08:00
gaoyuanwei e4d79e03b8 bug==select 2022-07-19 17:14:42 +08:00
851673013@qq.com 0ca63565e3 样式修改 2022-07-19 16:43:49 +08:00
851673013@qq.com 5afe117bc6 bug619 2022-07-19 16:20:45 +08:00
851673013@qq.com 6953baa878 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 16:20:03 +08:00
wuhongjian 9d72fe666d 配置更新 2022-07-19 16:02:54 +08:00
851673013@qq.com 0976ca98ac Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 15:54:26 +08:00
851673013@qq.com 768645a94a 归属部门bug619 2022-07-19 15:54:23 +08:00
a0049873 8ec4b585b6 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 15:06:32 +08:00
a0049873 d1692a1f51 上架功能修改 2022-07-19 15:06:26 +08:00
a0049873 e770028fba 详情页收藏功能BUG修改 2022-07-19 15:05:37 +08:00
gaoyuanwei bf56ce5eaa bug修改 2022-07-19 14:45:35 +08:00
gaoyuanwei 00af09c4f0 bug! 2022-07-19 14:05:47 +08:00
gaoyuanwei b75e6a4fb0 还原 2022-07-19 13:59:26 +08:00
gaoyuanwei 9a681317f0 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 11:26:29 +08:00
gaoyuanwei 4d01131e74 来源应用穿梭框左侧实现单选 2022-07-19 11:26:18 +08:00
851673013@qq.com 4b33b089f1 我的浏览模糊查询 2022-07-19 11:14:46 +08:00
a0049873 a52966d68a BUG修改 2022-07-19 11:13:15 +08:00
a0049873 dbe0edfcd7 BUG修改 2022-07-19 11:08:32 +08:00
851673013@qq.com 7c63022fc5 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 10:25:16 +08:00
851673013@qq.com b15efd9206 bug629 2022-07-19 10:25:10 +08:00
a0049873 ed5ed8c828 能力申请 应用资源特殊处理 2022-07-19 10:22:16 +08:00
851673013@qq.com 0e5ca11c2a Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 09:57:41 +08:00
851673013@qq.com b407c3e610 bug626 2022-07-19 09:57:38 +08:00
gaoyuanwei cc633449ed 后台加overflow: hidden; 2022-07-19 09:55:05 +08:00
gaoyuanwei 52ece255f3 冲突 2022-07-19 09:45:36 +08:00
gaoyuanwei a99f4fcbf3 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 09:43:58 +08:00
gaoyuanwei f1de4b860e 前台加word-break: break-all; 2022-07-19 09:42:41 +08:00
851673013@qq.com caf80caeff bug630 2022-07-19 09:42:37 +08:00
a0049873 74168d8a2c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 09:16:37 +08:00
a0049873 4827fc5784 BUG修改 2022-07-19 09:16:29 +08:00
851673013@qq.com f0d7ca4f39 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 18:53:09 +08:00
851673013@qq.com 23a577a544 组件服务挂接 2022-07-18 18:53:04 +08:00
wuhongjian 209183ec29 ignore 2022-07-18 18:43:53 +08:00
gaoyuanwei 2c241828b9 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 18:38:27 +08:00
gaoyuanwei cb5eb60b65 后台挂接-归属部门给我显示出来! 2022-07-18 18:29:17 +08:00
a0049873 83f44d040d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 18:24:35 +08:00
a0049873 0ee999ed86 后台展示 改为详情 2022-07-18 18:24:28 +08:00
gaoyuanwei b19361005f 把部门联系人和电话给我带出来!!! 2022-07-18 18:24:17 +08:00
851673013@qq.com fd32fd6769 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 18:17:53 +08:00
851673013@qq.com 46aef1c4df bug577 2022-07-18 18:17:48 +08:00
gaoyuanwei 0a8cc6257d 633bug 2022-07-18 18:04:38 +08:00
a0049873 11dbf272f7 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 18:02:04 +08:00