 mk
|
0eebd01f47
|
Merge branch 'bug_mk' into test
|
1 year ago |
|
mk
|
1fd81362b9
|
1
|
1 year ago |
|
mk
|
311617dbb6
|
Merge branch 'bug_mk' into dev
# Conflicts:
# src/views/components/resiSearch.vue
# src/views/modules/workSys/role/role.vue
|
1 year ago |
|
mk
|
7692181fb3
|
居民搜索组织报错
|
1 year ago |
|
mk
|
a27805ee32
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into 7.31
# Conflicts:
# src/views/modules/shequzhili/Delivery/index.vue
|
1 year ago |
wxz
|
e39f07f7a2
|
Merge branch 'wxz_unit_doorplate' into feature
|
1 year ago |
|
mk
|
afe0a8293b
|
Merge branch '7.31' into test
# Conflicts:改派
# src/views/modules/shequzhili/Delivery/index.vue
|
1 year ago |
|
mk
|
1a9b395ed6
|
Merge branch '7.31' into dev
# Conflicts:加改派
# src/views/modules/shequzhili/Delivery/index.vue
|
1 year ago |
|
mk
|
14f02e0ebe
|
改派加默认选中
|
1 year ago |
是小王呀\24601
|
49ebeadd60
|
社区活动活动类型消失
|
1 year ago |
|
是小王呀\24601
|
42bb9825f8
|
居民年龄
|
1 year ago |
|
是小王呀\24601
|
c48fc81a02
|
更换deptName
|
1 year ago |
|
是小王呀\24601
|
79cc1724a1
|
导出设置
|
1 year ago |
|
是小王呀\24601
|
2502fc41fb
|
更改成deptName
|
1 year ago |
|
是小王呀\24601
|
cd500b1974
|
Merge branch 'dev' of http://120.46.222.128:10021/elink-star/epmet-work-pc into xiaowang-dev
|
1 year ago |
|
是小王呀\24601
|
b085e1ecd5
|
导入按钮进行修改,更改保存为确认指派
|
1 year ago |
|
是小王呀\24601
|
f48bdfffd4
|
智能导出
|
1 year ago |
duanliangtao
|
35d5d6072b
|
事件处理进展的图片展示
|
1 year ago |
|
duanliangtao
|
7f1e58df48
|
事件处理进展的图片显示
|
1 year ago |
|
wxz
|
a7b28e03c1
|
fi:角色级别
|
1 year ago |
|
wxz
|
7c51325c8e
|
Merge branch 'preview' into feature
|
1 year ago |
|
wxz
|
017a3745ac
|
fi：多余提交
|
1 year ago |
|
wxz
|
b93f3c7864
|
edit:【角色管理】增加组织级别字段
|
1 year ago |
|
是小王呀\24601
|
39e26b39cb
|
删除下载模板
|
1 year ago |
|
wxz
|
d4dfd15efc
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
wxz
|
4d0935fdca
|
Merge branch 'wxz_unit_doorplate' into dev
# Conflicts:
# src/views/modules/base/classification/index.vue
# src/views/modules/shequzhili/event/cpts/event-info.vue
|
1 year ago |
|
wxz
|
48e649d2d2
|
add:增加导出单元门牌的按钮
|
1 year ago |
|
是小王呀\24601
|
1bd3e4f909
|
Merge branch 'feature-7-31' into feature
|
1 year ago |
|
duanliangtao
|
a248f2d215
|
Merge branch 'feature_dlt_taidong' into feature
|
1 year ago |
|
duanliangtao
|
8132ce6e2c
|
Merge branch 'feature_dlt_taidong' into test
|
1 year ago |
|
duanliangtao
|
386621a81c
|
修复事件新增时候，点击输入框，所有的组件都进行了为空的判断
|
1 year ago |
|
duanliangtao
|
c07c84ace2
|
Merge branch 'feature_dlt_taidong' into feature
|
1 year ago |
|
duanliangtao
|
95a934c9f6
|
Merge commit '4233770ac42dfbb9a5e246202e3b5e00498307f2' into feature
|
1 year ago |
|
duanliangtao
|
640921e3b7
|
Merge commit 'fd282503eae38683bd725475bb89887349b0b4f5' into feature
|
1 year ago |
|
duanliangtao
|
7894658666
|
有无责任单位，取消验证，短信提醒默认发送
|
1 year ago |
|
duanliangtao
|
8aa6fe5344
|
有无责任单位，取消验证，短信提醒默认发送
|
1 year ago |
|
duanliangtao
|
bab4617429
|
Merge branch 'feature_dlt_taidong' into test
|
1 year ago |
|
duanliangtao
|
e010da564b
|
Merge branch 'feature_dlt_taidong' into dev
|
1 year ago |
|
duanliangtao
|
4233770ac4
|
指派时的短信通知、催办督办、事件详情等信息
|
1 year ago |
|
wxz
|
09366e8042
|
Merge branch 'feature' into test
|
1 year ago |
|
duanliangtao
|
16a9625fed
|
Merge branch 'feature_dlt_taidong' into dev
|
1 year ago |
|
是小王呀\24601
|
70b5be4aba
|
组织更改agencyId
|
1 year ago |
|
是小王呀\24601
|
4d5fff5fb1
|
Merge branch 'feature-7-31' into dev
# Conflicts:
# src/views/modules/base/classification/index.vue
|
1 year ago |
|
是小王呀\24601
|
f5124546cb
|
变为level
|
1 year ago |
|
是小王呀\24601
|
dda2794a24
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-7-31
|
1 year ago |
luyan
|
f1529bd9e2
|
修改12345时间检索工具条参数错误
|
1 year ago |
|
wxz
|
badf5ada13
|
fix:【居民类别统计】网格员数据不显示的问题（字段名错误）
|
1 year ago |
|
wxz
|
56be67570d
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature
|
1 year ago |
|
duanliangtao
|
fd282503ea
|
居民上报事件台东需求的修改，涉及：新增、事件列表、督办催办、事件的颜色
|
1 year ago |
|
mk
|
8b64cd8ef4
|
Merge branch 'feature-xiaowang' into dev
|
1 year ago |
