Commits · b094d1db1e229e386d3777c14683999c8cad5b5b · 任超 / js.CadastralSystem · GitLab

04 Dec, 2020 15 commits
- Merge remote-tracking branch 'origin/master' · b094d1db
  b094d1db Browse Files
  
  weimo934 committed 2020-12-04 15:23:35 +0800
- fix(fg,hb):分割合并后跳转页面 · 6fc08c05
  6fc08c05 Browse Files
  
  weimo934 committed 2020-12-04 15:23:24 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · e663c478
  e663c478 Browse Files
  
  杨威 committed 2020-12-04 15:18:45 +0800
- 权利人组件修改(默认中国，修改后更新，新建时重置数据) · 071b09ab
  071b09ab Browse Files
  
  杨威 committed 2020-12-04 15:18:35 +0800
- Merge remote-tracking branch 'origin/master' · 90ccb6e9
  90ccb6e9 Browse Files
  
  weimo934 committed 2020-12-04 14:35:03 +0800
- feat(fg):分割成功调整页面 · f15f2776
  f15f2776 Browse Files
  
  weimo934 committed 2020-12-04 14:34:51 +0800
- 根据房屋状态标记的不同颜色改变选中户的边框颜色 · 21c04667
  21c04667
  
  杨威 committed 2020-12-04 14:10:45 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 7fcc0686
  7fcc0686 Browse Files
  
  杨威 committed 2020-12-04 14:08:51 +0800
- 修复在宗地表单页新建宗地后无法正常保存问题 · b5105c8a
  b5105c8a
  
  杨威 committed 2020-12-04 14:08:43 +0800
- feat(hb):宗地合并 · a6c7c8f5
  a6c7c8f5
  
  weimo934 committed 2020-12-04 13:52:47 +0800
- Merge remote-tracking branch 'origin/master' · 111d9962
  111d9962 Browse Files
  
  weimo934 committed 2020-12-04 11:02:00 +0800
- feat(fg):宗地分割选择幢基本功能实现 · ce7a0e67
  ce7a0e67 Browse Files
  
  weimo934 committed 2020-12-04 11:01:49 +0800
- 户重新落宗icon · e9651a13
  e9651a13
  
  杨威 committed 2020-12-04 09:35:49 +0800
- feat(fg):修改宗地分割前样式 · 2fd6f005
  2fd6f005 Browse Files
  
  weimo934 committed 2020-12-04 08:42:07 +0800
- Merge remote-tracking branch 'origin/master' · 2f62c379 ...
  2f62c379 Browse Files
```
# Conflicts:
#	src/views/zrz/lpb/bjlp/index.vue
```
  weimo934 committed 2020-12-04 08:33:44 +0800
03 Dec, 2020 21 commits
- 初步实现逻辑幢按照上下顺序排列 · 2f680e51
  2f680e51 Browse Files
  
  杨威 committed 2020-12-03 20:05:54 +0800
- 引入iconfont 修改系统部分icon图标 · 39459d85
  39459d85
  
  杨威 committed 2020-12-03 18:40:56 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 683f38f2
  683f38f2 Browse Files
  
  杨威 committed 2020-12-03 16:38:57 +0800
- 楼盘表切换实预测类型时清除选中层，更新图例数据 · a8d72516
  a8d72516 Browse Files
  
  杨威 committed 2020-12-03 16:38:51 +0800
- 去掉表单中默认‘请输入’ · 5c7f7be5
  5c7f7be5
  
  杨威 committed 2020-12-03 16:37:59 +0800
- 新建弹框样式修改 · 801eff78
  801eff78
  
  杨威 committed 2020-12-03 16:37:21 +0800
- feat():户重新落宗添加提示,宗地分割调整 · 4ca4142e
  4ca4142e
  
  weimo934 committed 2020-12-03 15:36:01 +0800
- 更正办理，传递rowbsm · 0a581c89
  0a581c89 Browse Files
  
  zhaoqian committed 2020-12-03 15:31:04 +0800
- Merge remote-tracking branch 'origin/master' · c34224b9
  c34224b9 Browse Files
  
  zhaoqian committed 2020-12-03 11:50:41 +0800
- 提交后点击查询信息 · c8810a1b
  c8810a1b
  
  zhaoqian committed 2020-12-03 11:50:36 +0800
- 楼盘表判断有且仅有独立层户时zdyWidth的宽度 · daa7fe4f
  daa7fe4f Browse Files
  
  杨威 committed 2020-12-03 11:44:44 +0800
- Merge remote-tracking branch 'origin/master' · 07514623
  07514623 Browse Files
  
  weimo934 committed 2020-12-03 10:24:04 +0800
- fix(hb):合并将宗地.多幢.户数据隔离 · c2bc35e2
  c2bc35e2 Browse Files
  
  weimo934 committed 2020-12-03 10:23:50 +0800
- 户编辑组件的scyclx字段动态变化，完善层户的scyclx数据监听 · c7921cf7
  c7921cf7
  
  杨威 committed 2020-12-03 10:14:23 +0800
- 添加层户的syclx监听楼盘表实预测类型的切换 · 67dd7292
  67dd7292 Browse Files
  
  杨威 committed 2020-12-03 09:52:55 +0800
- 暂时隐藏林权，构筑物，宗海相关业务 · a94d69a2
  a94d69a2
  
  杨威 committed 2020-12-03 09:20:54 +0800
- 新建自然幢后跳转至自然幢表单 · ea49bb2a
  ea49bb2a Browse Files
  
  杨威 committed 2020-12-03 09:18:19 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · ffe684e2
  ffe684e2
  
  杨威 committed 2020-12-03 09:08:19 +0800
- 宗地下新建自然幢dzbsm字段传值修改 · 98fe80fa
  98fe80fa Browse Files
  
  杨威 committed 2020-12-03 09:07:20 +0800
- Merge remote-tracking branch 'origin/master' into master · b588a832
  b588a832 Browse Files
  
  杨威 committed 2020-12-03 08:58:44 +0800
- 行政区、地籍区、地籍子区覆盖判断 · ca888098
  ca888098
  
  杨威 committed 2020-12-03 08:58:06 +0800
02 Dec, 2020 4 commits
- Merge remote-tracking branch 'origin/master' · 6b6b617c
  6b6b617c Browse Files
  
  weimo934 committed 2020-12-02 17:48:39 +0800
- feat(fg,fjcl):修改分割.附件材料bug · 171e741b
  171e741b
  
  weimo934 committed 2020-12-02 17:48:00 +0800
- Merge remote-tracking branch 'origin/master' · 10ff3d16
  10ff3d16 Browse Files
  
  zhaoqian committed 2020-12-02 17:20:44 +0800
- glbsm · a47f6c04
  a47f6c04 Browse Files
  
  zhaoqian committed 2020-12-02 17:20:39 +0800