Commits · 8eb294d389ff627122f04e4da5ab74c453c99e40 · 任超 / js.CadastralSystem · GitLab

30 Nov, 2020 25 commits
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 8eb294d3
  8eb294d3 Browse Files
  
  杨威 committed 2020-11-30 17:26:03 +0800
- 实预测类型切换时，清除选中状态和数据 · 83b3844e
  83b3844e Browse Files
  
  杨威 committed 2020-11-30 17:25:31 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 4cb5f1a8
  4cb5f1a8 Browse Files
  
  焦泽平 committed 2020-11-30 16:48:21 +0800
- Merge remote-tracking branch 'origin/master' · 5e61439b ...
  5e61439b Browse Files
```
# Conflicts:
#	src/views/panel/change/fwsxbg/index.vue
```
  weimo934 committed 2020-11-30 16:47:17 +0800
- 层右键菜单 · 808b8c7f
  808b8c7f Browse Files
  
  焦泽平 committed 2020-11-30 16:46:29 +0800
- feat(*):、宗地分割宗地合并自然幢、户重新落宗选择宗地,添加功能：权属状态=1 or 权属状态=2 · 867c6bbc
  867c6bbc Browse Files
  
  weimo934 committed 2020-11-30 16:45:00 +0800
- 全局修改不可编辑input框背景色 · 2dd00fd9
  2dd00fd9 Browse Files
  
  杨威 committed 2020-11-30 16:39:16 +0800
- 自然幢表单样式调整, · 353f34d3
  353f34d3 Browse Files
  
  杨威 committed 2020-11-30 16:33:04 +0800
- 范围属性变更办理增加二次提醒 · 9965f665
  9965f665 Browse Files
  
  杨威 committed 2020-11-30 15:16:08 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 76b5450e
  76b5450e Browse Files
  
  杨威 committed 2020-11-30 15:10:53 +0800
- 宗地右键菜单根据权属状态判断是否可以添加定着物 · 8d1a55a2
  8d1a55a2 Browse Files
  
  杨威 committed 2020-11-30 15:10:40 +0800
- Merge remote-tracking branch 'origin/master' · cd1d73e7
  cd1d73e7 Browse Files
  
  weimo934 committed 2020-11-30 14:45:57 +0800
- fix(Home):连续新建宗地重新加载左侧目录树 · aa4ac7f8
  aa4ac7f8 Browse Files
  
  weimo934 committed 2020-11-30 14:45:45 +0800
- 删除增加二次提醒，删除成功后，页面跳转到首页 · ad511cad
  ad511cad Browse Files
  
  杨威 committed 2020-11-30 14:42:02 +0800
- 全局修改elm表格的表头颜色 · c9646189
  c9646189 Browse Files
  
  杨威 committed 2020-11-30 14:34:29 +0800
- feat(create):重置数据 · 4d12d7cc
  4d12d7cc Browse Files
  
  weimo934 committed 2020-11-30 14:29:52 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · d3ce1069
  d3ce1069 Browse Directory
  
  杨威 committed 2020-11-30 14:11:57 +0800
- 首页样式调整 · 8458ee59
  8458ee59 Browse Files
  
  杨威 committed 2020-11-30 14:11:51 +0800
- 连续新建宗地时，宗地信息不更新bug · f5fa2fa1
  f5fa2fa1 Browse Files
  
  杨威 committed 2020-11-30 14:10:56 +0800
- 多幢右键菜单删除功能 · c6be2030
  c6be2030 Browse Files
  
  杨威 committed 2020-11-30 14:09:56 +0800
- 更正：列表点击办理，增加二次提醒：是否确定更正该宗地\自然幢\多幢 · 15a09fff
  15a09fff Browse Files
  
  杨威 committed 2020-11-30 14:08:54 +0800
- Merge remote-tracking branch 'origin/master' · 8c2e4ec3
  8c2e4ec3 Browse Files
  
  weimo934 committed 2020-11-30 13:56:53 +0800
- feat(create):新增宗地之后重置数据 · 9bbb8d8a
  9bbb8d8a Browse File
  
  weimo934 committed 2020-11-30 13:56:39 +0800
- Merge remote-tracking branch 'origin/master' · 27c0aab2
  27c0aab2 Browse Files
  
  zhaoqian committed 2020-11-30 10:02:49 +0800
- 不动产单元号dpdm数据组装 · 61a281d4
  61a281d4 Browse Directory
  
  zhaoqian committed 2020-11-30 10:01:21 +0800
27 Nov, 2020 15 commits
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 46e7e7fb
  46e7e7fb Browse Files
  
  杨威 committed 2020-11-27 17:03:16 +0800
- 楼盘表层户高度计算 · 0ac9f2de
  0ac9f2de Browse Files
  
  杨威 committed 2020-11-27 17:03:05 +0800
- Merge remote-tracking branch 'origin/master' · a00acbd6
  a00acbd6 Browse Files
  
  weimo934 committed 2020-11-27 15:37:50 +0800
- style(plc):修改批量层样式,表单输入验证 · 8b9ca82b
  8b9ca82b Browse Directory
  
  weimo934 committed 2020-11-27 15:37:38 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · b54d20d2
  b54d20d2 Browse Files
  
  杨威 committed 2020-11-27 15:23:19 +0800
- 根据qszt展示树结构中的宗地节点的权属状态 · bc5f777f
  bc5f777f Browse Files
  
  杨威 committed 2020-11-27 15:23:08 +0800
- Merge remote-tracking branch 'origin/master' · e87e646e
  e87e646e Browse Files
  
  zhaoqian committed 2020-11-27 14:56:03 +0800
- 权利人组件title · e31004b5
  e31004b5 Browse Files
  
  zhaoqian committed 2020-11-27 14:55:56 +0800
- Merge remote-tracking branch 'origin/master' · 4fd24016
  4fd24016 Browse Files
  
  weimo934 committed 2020-11-27 14:37:24 +0800
- style(yzgy,mjftb):修改表格样式,添加输入验证 · c6f5f4df
  c6f5f4df Browse Files
  
  weimo934 committed 2020-11-27 14:37:09 +0800
- Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem · 5a5ec20b
  5a5ec20b Browse Files
  
  杨威 committed 2020-11-27 14:36:57 +0800
- 首页样式调整 · 69bd0ece
  69bd0ece Browse Files
  
  杨威 committed 2020-11-27 14:36:35 +0800
- feat(plSh):修改boolean类型字段名,改正后端boolean映射错误 · 0b8deb0e
  0b8deb0e Browse Files
  
  weimo934 committed 2020-11-27 13:56:37 +0800
- fix(lpb):添加批量层层bsm集合 · a9651d72
  a9651d72 Browse Files
  
  weimo934 committed 2020-11-27 11:58:50 +0800
- Merge remote-tracking branch 'origin/master' · 82c8b004 ...
  82c8b004 Browse Files
```
# Conflicts:
#	src/views/panel/change/fg/index.vue
#	src/views/zrz/lpb/bjlp/index.vue
```
  weimo934 committed 2020-11-27 11:56:30 +0800