wxz
|
d4dfd15efc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years 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
|
2 years ago |
|
wxz
|
48e649d2d2
|
add:增加导出单元门牌的按钮
|
2 years ago |
duanliangtao
|
e010da564b
|
Merge branch 'feature_dlt_taidong' into dev
|
2 years ago |
|
duanliangtao
|
4233770ac4
|
指派时的短信通知、催办督办、事件详情等信息
|
2 years ago |
|
duanliangtao
|
16a9625fed
|
Merge branch 'feature_dlt_taidong' into dev
|
2 years ago |
是小王呀\24601
|
70b5be4aba
|
组织更改agencyId
|
2 years ago |
|
是小王呀\24601
|
4d5fff5fb1
|
Merge branch 'feature-7-31' into dev
# Conflicts:
# src/views/modules/base/classification/index.vue
|
2 years ago |
|
是小王呀\24601
|
f5124546cb
|
变为level
|
2 years ago |
|
是小王呀\24601
|
dda2794a24
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-7-31
|
2 years ago |
luyan
|
f1529bd9e2
|
修改12345时间检索工具条参数错误
|
2 years ago |
|
wxz
|
badf5ada13
|
fix:【居民类别统计】网格员数据不显示的问题（字段名错误）
|
2 years ago |
|
wxz
|
56be67570d
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature
|
2 years ago |
|
duanliangtao
|
fd282503ea
|
居民上报事件台东需求的修改，涉及：新增、事件列表、督办催办、事件的颜色
|
2 years ago |
 mk
|
8b64cd8ef4
|
Merge branch 'feature-xiaowang' into dev
|
2 years ago |
|
mk
|
ac1d56d594
|
Merge branch '7.31' into dev
# Conflicts:
# src/views/modules/shequzhili/analysis/index.vue 默认一年时间
# src/views/modules/shequzhili/event/cpts/event-info.vue 去掉显示判断
|
2 years ago |
|
mk
|
4fcff178dc
|
Merge branch '7.31' into feature
|
2 years ago |
|
mk
|
1a30f2f434
|
文件上传名称修改,返回详情事件加大
|
2 years ago |
|
mk
|
c717fdbe7a
|
上传文件key修改
|
2 years ago |
|
mk
|
0c4a5b246f
|
Merge branch 'feature-xiaowang' into feature
|
2 years ago |
|
是小王呀\24601
|
f9d0e4bdff
|
时间按照当年，文字不换行
|
2 years ago |
|
是小王呀\24601
|
94b45e6706
|
Merge branch '7.31' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang
|
2 years ago |
|
mk
|
5ac7ddf71d
|
Merge branch 'feature-xiaowang' into feature
|
2 years ago |
|
mk
|
d05e6eb1fc
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang
|
2 years ago |
|
mk
|
95d0ed3800
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into 7.31
|
2 years ago |
|
mk
|
5794ca345e
|
办理进度响应时限
|
2 years ago |
|
wxz
|
44a15690e3
|
Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature
|
2 years ago |
|
mk
|
dbc181417d
|
办结时限
|
2 years ago |
|
是小王呀\24601
|
499db6ae9b
|
Merge branch 'feature-7-31' into dev
# Conflicts:
# src/views/modules/base/organization/organization.vue
|
2 years ago |
|
mk
|
49cad15f62
|
转办意见修改
|
2 years ago |
|
是小王呀\24601
|
2777aa62aa
|
通讯录修改组织进行回显
|
2 years ago |
|
mk
|
b97750abe2
|
Merge branch 'bug_mk' into feature
|
2 years ago |
|
mk
|
f3f355a8b3
|
Merge branch 'tree' into feature
|
2 years ago |
|
是小王呀\24601
|
c73541e8e1
|
满意度回填
|
2 years ago |
|
mk
|
33940957e3
|
角色管理进入默认角色后新增表单被限制输入
|
2 years ago |
|
mk
|
f661f1c7cb
|
处理居民信息树形结构到居民搜索的全局事件参数
|
2 years ago |
|
是小王呀\24601
|
f989448d56
|
Merge branch '7.31' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang
|
2 years ago |
|
是小王呀\24601
|
7063d1360b
|
更改成饿了么的下级列表的形式
|
2 years ago |
|
mk
|
fb71b3b33f
|
字段名修改
|
2 years ago |
|
mk
|
493d1a3cd6
|
错别字
|
2 years ago |
|
是小王呀\24601
|
c04bec24e7
|
央视更改+指派状态
|
2 years ago |
|
mk
|
d890574f44
|
办理进展有没有内容都展示
|
2 years ago |
|
是小王呀\24601
|
8daf0e0bac
|
添加指派
|
2 years ago |
|
mk
|
ecd2fac0e9
|
1
|
2 years ago |
|
是小王呀\24601
|
d800d5ff91
|
派件未10
|
2 years ago |
|
mk
|
970e19d006
|
Merge branch '7.31' into test
|
2 years ago |
|
mk
|
5e01faeabe
|
恢复12345事件
|
2 years ago |
|
wxz
|
bbaebdf7f7
|
合并
|
2 years ago |
|
是小王呀\24601
|
ff3e87586f
|
Merge branch '7.31' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang
|
2 years ago |
|
wxz
|
80c6276aea
|
自动扩充内存
|
2 years ago |
