diff --git a/common/func.go b/common/func.go index 7f555d2..b043cee 100644 --- a/common/func.go +++ b/common/func.go @@ -38,8 +38,8 @@ func StrFirstToUpper(str string) string { } // 时间转字符串,第二个参数支持1-5对应显示年月日时分秒 -func Time2Str(t *time.Time, qu ...interface{}) string { - if t == nil || t.Unix() < 0 { +func Time2Str(t time.Time, qu ...interface{}) string { + if t.Unix() < 0 { return "" } tp := 5 diff --git a/common/map.go b/common/map.go index 35ab73b..ee21637 100644 --- a/common/map.go +++ b/common/map.go @@ -102,7 +102,7 @@ func (that Map) GetBool(key string, err ...*Error) bool { } -func (that Map) GetTime(key string, err ...*Error) *time.Time { +func (that Map) GetTime(key string, err ...*Error) time.Time { v := ObjToTime((that)[key], err...) return v diff --git a/common/obj.go b/common/obj.go index 83aff56..c4dc941 100644 --- a/common/obj.go +++ b/common/obj.go @@ -20,7 +20,7 @@ func (that *Obj) ToInt(err ...Error) int { return ObjToInt(that.Data, &that.Error) } -func (that *Obj) ToTime(err ...Error) *time.Time { +func (that *Obj) ToTime(err ...Error) time.Time { if len(err) != 0 { that.Error = err[0] } diff --git a/common/objtoobj.go b/common/objtoobj.go index 756384c..f1d3201 100644 --- a/common/objtoobj.go +++ b/common/objtoobj.go @@ -97,7 +97,7 @@ func ObjToSlice(obj interface{}, e ...*Error) Slice { return v } -func ObjToTime(obj interface{}, e ...*Error) *time.Time { +func ObjToTime(obj interface{}, e ...*Error) time.Time { tInt := ObjToInt64(obj) //字符串类型,只支持标准mysql datetime格式 @@ -107,27 +107,27 @@ func ObjToTime(obj interface{}, e ...*Error) *time.Time { if len(tStr) > 18 { t, e := time.Parse("2006-01-02 15:04:05", tStr) if e == nil { - return &t + return t } } else if len(tStr) > 15 { t, e := time.Parse("2006-01-02 15:04", tStr) if e == nil { - return &t + return t } } else if len(tStr) > 12 { t, e := time.Parse("2006-01-02 15", tStr) if e == nil { - return &t + return t } } else if len(tStr) > 9 { t, e := time.Parse("2006-01-02", tStr) if e == nil { - return &t + return t } } else if len(tStr) > 6 { t, e := time.Parse("2006-01", tStr) if e == nil { - return &t + return t } } @@ -136,27 +136,27 @@ func ObjToTime(obj interface{}, e ...*Error) *time.Time { //纳秒级别 if len(ObjToStr(tInt)) > 16 { t := time.Time{}.Add(time.Nanosecond * time.Duration(tInt)) - return &t + return t //微秒级别 } else if len(ObjToStr(tInt)) > 13 { t := time.Time{}.Add(time.Microsecond * time.Duration(tInt)) - return &t + return t //毫秒级别 } else if len(ObjToStr(tInt)) > 10 { t := time.Time{}.Add(time.Millisecond * time.Duration(tInt)) - return &t + return t //秒级别 } else if len(ObjToStr(tInt)) > 9 { t := time.Time{}.Add(time.Second * time.Duration(tInt)) - return &t + return t } else if len(ObjToStr(tInt)) > 3 { t, e := time.Parse("2006", ObjToStr(tInt)) if e == nil { - return &t + return t } } - return nil + return time.Time{} } func ObjToFloat64(obj interface{}, e ...*Error) float64 { diff --git a/common/slice.go b/common/slice.go index b554a5c..dede608 100644 --- a/common/slice.go +++ b/common/slice.go @@ -15,7 +15,7 @@ func (that Slice) GetString(key int, err ...*Error) string { return ObjToStr((that)[key]) } -func (that Slice) GetTime(key int, err ...*Error) *time.Time { +func (that Slice) GetTime(key int, err ...*Error) time.Time { v := ObjToTime((that)[key], err...) return v diff --git a/example/config/admin.json b/example/config/admin.json index 3c1a035..6cfec37 100644 --- a/example/config/admin.json +++ b/example/config/admin.json @@ -3,6 +3,7 @@ "admin": { "sql": { "org_id": "org_id", + "parent_ids[~]": "%,id,%", "role_id": "role_id", "zone_id": "zone_id" }, @@ -55,7 +56,9 @@ "table": "proj" }, "role": { - "sql": {}, + "sql": { + "id": "role_id" + }, "stop": true, "table": "role" }, @@ -124,38 +127,6 @@ "icon": "Setting", "label": "系统管理", "menus": [ - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "项目分类", - "table": "category" - }, - { - "auth": [ - "show", - "download" - ], - "label": "日志管理", - "table": "logs" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "项目管理", - "table": "proj" - }, { "auth": [ "show", @@ -168,78 +139,6 @@ "label": "角色管理", "table": "role" }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "微信信息", - "table": "wechat" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "车辆管理", - "table": "car" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "客户管理", - "table": "company" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "标签管理", - "table": "out_tag" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "用章管理", - "table": "seal_tag" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "考勤管理", - "table": "time_tag" - }, { "auth": [ "show", @@ -261,8 +160,8 @@ "info", "download" ], - "label": "人员管理", - "table": "admin" + "label": "项目分类", + "table": "category" }, { "auth": [ @@ -273,8 +172,8 @@ "info", "download" ], - "label": "城市管理", - "table": "city" + "label": "标签管理", + "table": "out_tag" }, { "auth": [ @@ -285,8 +184,8 @@ "info", "download" ], - "label": "供应商管理", - "table": "channel" + "label": "考勤管理", + "table": "time_tag" }, { "auth": [ @@ -297,8 +196,16 @@ "info", "download" ], - "label": "部门管理", - "table": "org" + "label": "车辆管理", + "table": "car" + }, + { + "auth": [ + "show", + "download" + ], + "label": "日志管理", + "table": "logs" }, { "auth": [ @@ -333,8 +240,32 @@ "info", "download" ], - "label": "联盟公司", - "table": "zone" + "label": "城市管理", + "table": "city" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "项目管理", + "table": "proj" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "客户管理", + "table": "company" }, { "auth": [ @@ -347,10 +278,116 @@ ], "label": "项目归口", "table": "department" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "部门管理", + "table": "org" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "用章管理", + "table": "seal_tag" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "微信信息", + "table": "wechat" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "联盟公司", + "table": "zone" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "人员管理", + "table": "admin" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "供应商管理", + "table": "channel" } ], "name": "sys" }, + { + "auth": [ + "show" + ], + "icon": "Setting", + "label": "任务执行", + "menus": [ + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "任务执行", + "table": "task_admin" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "任务管理", + "table": "task" + } + ], + "name": "sys:task" + }, { "auth": [ "show" @@ -372,40 +409,6 @@ } ], "name": "sys:sea" - }, - { - "auth": [ - "show" - ], - "icon": "Setting", - "label": "任务管理", - "menus": [ - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "任务管理", - "table": "task" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "任务执行", - "table": "task_admin" - } - ], - "name": "sys:task" } ], "name": "admin", diff --git a/example/config/adminDB.json b/example/config/adminDB.json index fffeede..6bab895 100644 --- a/example/config/adminDB.json +++ b/example/config/adminDB.json @@ -136,8 +136,32 @@ "info", "download" ], - "label": "角色管理", - "table": "role" + "label": "城市管理", + "table": "city" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "客户管理", + "table": "company" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "项目管理", + "table": "proj" }, { "auth": [ @@ -160,8 +184,44 @@ "info", "download" ], - "label": "项目分类", - "table": "category" + "label": "标签管理", + "table": "visit_tag" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "人员管理", + "table": "admin" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "供应商管理", + "table": "channel" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "部门管理", + "table": "org" }, { "auth": [ @@ -184,8 +244,8 @@ "info", "download" ], - "label": "考勤管理", - "table": "time_tag" + "label": "用章管理", + "table": "seal_tag" }, { "auth": [ @@ -216,8 +276,8 @@ "info", "download" ], - "label": "系统设置", - "table": "system" + "label": "角色管理", + "table": "role" }, { "auth": [ @@ -228,92 +288,8 @@ "info", "download" ], - "label": "标签管理", - "table": "visit_tag" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "城市管理", - "table": "city" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "项目管理", - "table": "proj" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "客户管理", - "table": "company" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "项目归口", - "table": "department" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "部门管理", - "table": "org" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "用章管理", - "table": "seal_tag" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "微信信息", - "table": "wechat" + "label": "考勤管理", + "table": "time_tag" }, { "auth": [ @@ -336,8 +312,8 @@ "info", "download" ], - "label": "人员管理", - "table": "admin" + "label": "项目分类", + "table": "category" }, { "auth": [ @@ -348,8 +324,32 @@ "info", "download" ], - "label": "供应商管理", - "table": "channel" + "label": "项目归口", + "table": "department" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "系统设置", + "table": "system" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "微信信息", + "table": "wechat" } ], "name": "sys" @@ -359,20 +359,8 @@ "show" ], "icon": "Setting", - "label": "任务执行", + "label": "任务管理", "menus": [ - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "任务执行", - "table": "task_admin" - }, { "auth": [ "show", @@ -384,6 +372,18 @@ ], "label": "任务管理", "table": "task" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "任务执行", + "table": "task_admin" } ], "name": "sys:task" @@ -567,32 +567,32 @@ "value": null }, { - "name": "ID", - "value": "id" - }, - { - "name": "QQ号", - "value": "qq" + "name": "邮箱", + "value": "email" }, { "name": "微信号", "value": "wechat" }, { - "name": "邮箱", - "value": "email" - }, - { - "name": "手机号", - "value": "phone" + "name": "ID", + "value": "id" }, { "name": "职位", "value": "title" }, + { + "name": "QQ号", + "value": "qq" + }, { "name": "名称", "value": "name" + }, + { + "name": "手机号", + "value": "phone" } ], "type": "search", @@ -606,13 +606,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -660,13 +660,6 @@ "type": "select", "value": null }, - { - "label": "部门", - "link": "org", - "name": "org_id", - "type": "tree", - "value": "name" - }, { "label": "联盟公司", "link": "zone", @@ -680,6 +673,13 @@ "name": "parent_id", "type": "tree", "value": "name" + }, + { + "label": "部门", + "link": "org", + "name": "org_id", + "type": "tree", + "value": "name" } ], "table": "admin" @@ -765,14 +765,6 @@ "name": "无", "value": null }, - { - "name": "描述", - "value": "description" - }, - { - "name": "车牌号码", - "value": "sn" - }, { "name": "ID", "value": "id" @@ -780,6 +772,14 @@ { "name": "名称", "value": "name" + }, + { + "name": "描述", + "value": "description" + }, + { + "name": "车牌号码", + "value": "sn" } ], "type": "search", @@ -963,13 +963,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -1206,22 +1206,10 @@ "name": "无", "value": null }, - { - "name": "企业地址", - "value": "address" - }, - { - "name": "统一社会信用代码", - "value": "sn" - }, { "name": "联系方式", "value": "contact" }, - { - "name": "id", - "value": "id" - }, { "name": "企业名称", "value": "name" @@ -1229,6 +1217,18 @@ { "name": "备注", "value": "description" + }, + { + "name": "企业地址", + "value": "address" + }, + { + "name": "统一社会信用代码", + "value": "sn" + }, + { + "name": "id", + "value": "id" } ], "type": "search", @@ -1272,6 +1272,30 @@ "type": "search", "value": null }, + { + "label": "状态", + "name": "state", + "options": [ + { + "name": "已启用", + "value": "0" + }, + { + "name": "未启用", + "value": "1" + }, + { + "name": "异常", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, { "label": "类型", "name": "type", @@ -1298,33 +1322,9 @@ "value": null }, { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "异常", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, - { - "label": "城市", - "link": "city", - "name": "city_id", + "label": "部门", + "link": "org", + "name": "org_id", "type": "tree", "value": "name" }, @@ -1336,16 +1336,16 @@ "value": "name" }, { - "label": "部门", - "link": "org", - "name": "org_id", + "label": "创建员工", + "link": "admin", + "name": "admin_id", "type": "tree", "value": "name" }, { - "label": "创建员工", - "link": "admin", - "name": "admin_id", + "label": "城市", + "link": "city", + "name": "city_id", "type": "tree", "value": "name" } @@ -1732,6 +1732,14 @@ "name": "无", "value": null }, + { + "name": "id", + "value": "id" + }, + { + "name": "营业执照代码", + "value": "sn" + }, { "name": "企业地址", "value": "address" @@ -1743,14 +1751,6 @@ { "name": "客户名称", "value": "name" - }, - { - "name": "id", - "value": "id" - }, - { - "name": "营业执照代码", - "value": "sn" } ], "type": "search", @@ -1764,10 +1764,6 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "注册时间", "value": "time" @@ -1775,6 +1771,10 @@ { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -1798,55 +1798,6 @@ "type": "search", "value": null }, - { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "异常", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, - { - "label": "类型", - "name": "type", - "options": [ - { - "name": "企业", - "value": "0" - }, - { - "name": "个人", - "value": "1" - }, - { - "name": "三方机构", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "sortable": true, - "type": "select", - "value": null - }, { "label": "客户状态", "name": "status", @@ -1900,16 +1851,58 @@ "value": null }, { - "label": "所属联盟公司", - "link": "zone", - "name": "zone_id", - "type": "tree", - "value": "name" + "label": "类型", + "name": "type", + "options": [ + { + "name": "企业", + "value": "0" + }, + { + "name": "个人", + "value": "1" + }, + { + "name": "三方机构", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "sortable": true, + "type": "select", + "value": null }, { - "label": "城市", - "link": "city", - "name": "city_id", + "label": "状态", + "name": "state", + "options": [ + { + "name": "已启用", + "value": "0" + }, + { + "name": "未启用", + "value": "1" + }, + { + "name": "异常", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, + { + "label": "部门", + "link": "org", + "name": "org_id", "type": "tree", "value": "name" }, @@ -1921,9 +1914,16 @@ "value": "name" }, { - "label": "部门", - "link": "org", - "name": "org_id", + "label": "城市", + "link": "city", + "name": "city_id", + "type": "tree", + "value": "name" + }, + { + "label": "所属联盟公司", + "link": "zone", + "name": "zone_id", "type": "tree", "value": "name" } @@ -2030,10 +2030,6 @@ "name": "无", "value": null }, - { - "name": "归口名称", - "value": "name" - }, { "name": "描述", "value": "description" @@ -2041,6 +2037,10 @@ { "name": "ID", "value": "id" + }, + { + "name": "归口名称", + "value": "name" } ], "type": "search", @@ -2054,13 +2054,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -2257,8 +2257,8 @@ "value": null }, { - "name": "描述", - "value": "description" + "name": "ID", + "value": "id" }, { "name": "日志名", @@ -2269,8 +2269,8 @@ "value": "ip" }, { - "name": "ID", - "value": "id" + "name": "描述", + "value": "description" } ], "type": "search", @@ -2310,30 +2310,6 @@ "type": "search", "value": null }, - { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "异常", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, { "label": "操作类型", "name": "type", @@ -2367,6 +2343,30 @@ "type": "select", "value": null }, + { + "label": "状态", + "name": "state", + "options": [ + { + "name": "已启用", + "value": "0" + }, + { + "name": "未启用", + "value": "1" + }, + { + "name": "异常", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, { "label": "操作员", "link": "admin", @@ -2479,13 +2479,13 @@ "name": "无", "value": null }, - { - "name": "组织名称", - "value": "name" - }, { "name": "ID", "value": "id" + }, + { + "name": "组织名称", + "value": "name" } ], "type": "search", @@ -2651,10 +2651,6 @@ "name": "无", "value": null }, - { - "name": "描述", - "value": "description" - }, { "name": "ID", "value": "id" @@ -2662,6 +2658,10 @@ { "name": "名称", "value": "name" + }, + { + "name": "描述", + "value": "description" } ], "type": "search", @@ -3073,20 +3073,20 @@ "value": "source" }, { - "name": "ID", - "value": "id" - }, - { - "name": "项目备注", - "value": "description" + "name": "名称", + "value": "name" }, { "name": "负责人清单", "value": "user_data" }, { - "name": "名称", - "value": "name" + "name": "ID", + "value": "id" + }, + { + "name": "项目备注", + "value": "description" } ], "type": "search", @@ -3101,24 +3101,24 @@ "value": null }, { - "name": "项目启动时间", - "value": "start_time" + "name": "创建时间", + "value": "create_time" }, { "name": "验收时间", "value": "finish_time" }, { - "name": "创建时间", - "value": "create_time" - }, - { - "name": "变更时间", - "value": "modify_time" + "name": "项目启动时间", + "value": "start_time" }, { "name": "材料提交时间", "value": "data_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -3142,34 +3142,6 @@ "type": "search", "value": null }, - { - "label": "结果状态", - "name": "result_status", - "options": [ - { - "name": "未立项", - "value": "0" - }, - { - "name": "已立项待拨款", - "value": "1" - }, - { - "name": "已拨款", - "value": "2" - }, - { - "name": "已收款", - "value": "3" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, { "label": "是否验收", "name": "finish", @@ -3191,64 +3163,6 @@ "type": "select", "value": null }, - { - "add": false, - "edit": false, - "label": "项目级别", - "list": false, - "name": "level", - "options": [ - { - "name": "一级", - "value": "1" - }, - { - "name": "二级", - "value": "2" - }, - { - "name": "三级", - "value": "3" - }, - { - "name": "全部", - "value": null - } - ], - "sortable": true, - "type": "select", - "value": null - }, - { - "label": "项目阶段", - "list": false, - "name": "stage", - "options": [ - { - "name": "基础填报", - "value": "0" - }, - { - "name": "合同签订", - "value": "1" - }, - { - "name": "项目实施", - "value": "2" - }, - { - "name": "项目验收", - "value": "3" - }, - { - "name": "全部", - "value": null - } - ], - "sortable": true, - "type": "select", - "value": null - }, { "label": "项目状态", "name": "status", @@ -3273,6 +3187,62 @@ "type": "select", "value": null }, + { + "label": "结果状态", + "name": "result_status", + "options": [ + { + "name": "未立项", + "value": "0" + }, + { + "name": "已立项待拨款", + "value": "1" + }, + { + "name": "已拨款", + "value": "2" + }, + { + "name": "已收款", + "value": "3" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, + { + "add": false, + "edit": false, + "label": "项目级别", + "list": false, + "name": "level", + "options": [ + { + "name": "一级", + "value": "1" + }, + { + "name": "二级", + "value": "2" + }, + { + "name": "三级", + "value": "3" + }, + { + "name": "全部", + "value": null + } + ], + "sortable": true, + "type": "select", + "value": null + }, { "label": "状态", "name": "state", @@ -3329,6 +3299,36 @@ "type": "select", "value": null }, + { + "label": "项目阶段", + "list": false, + "name": "stage", + "options": [ + { + "name": "基础填报", + "value": "0" + }, + { + "name": "合同签订", + "value": "1" + }, + { + "name": "项目实施", + "value": "2" + }, + { + "name": "项目验收", + "value": "3" + }, + { + "name": "全部", + "value": null + } + ], + "sortable": true, + "type": "select", + "value": null + }, { "label": "项目部负责人", "link": "admin", @@ -3337,16 +3337,9 @@ "value": "name" }, { - "label": "项目归口", - "link": "department", - "name": "department_id", - "type": "tree", - "value": "name" - }, - { - "label": "项目负责人", + "label": "市场部负责人", "link": "admin", - "name": "admin_id", + "name": "sc_admin_id", "type": "tree", "value": "name" }, @@ -3365,16 +3358,23 @@ "value": "name" }, { - "label": "联盟公司", - "link": "zone", - "name": "zone_id", + "label": "项目负责人", + "link": "admin", + "name": "admin_id", "type": "tree", "value": "name" }, { - "label": "市场部负责人", - "link": "admin", - "name": "sc_admin_id", + "label": "项目归口", + "link": "department", + "name": "department_id", + "type": "tree", + "value": "name" + }, + { + "label": "联盟公司", + "link": "zone", + "name": "zone_id", "type": "tree", "value": "name" } @@ -3714,28 +3714,28 @@ "value": null }, { - "name": "客户名", - "value": "name" + "name": "id", + "value": "id" }, { - "name": "来源备注", - "value": "source" + "name": "客户名", + "value": "name" }, { "name": "客户基本情况", "value": "description" }, + { + "name": "拟申报项目", + "value": "notes_proj" + }, { "name": "跟进时间及动态", "value": "notes" }, { - "name": "id", - "value": "id" - }, - { - "name": "拟申报项目", - "value": "notes_proj" + "name": "来源备注", + "value": "source" } ], "type": "search", @@ -3939,10 +3939,6 @@ "name": "无", "value": null }, - { - "name": "描述", - "value": "description" - }, { "name": "ID", "value": "id" @@ -3950,6 +3946,10 @@ { "name": "名称", "value": "name" + }, + { + "name": "描述", + "value": "description" } ], "type": "search", @@ -4205,30 +4205,6 @@ "type": "search", "value": null }, - { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "异常", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, { "label": "功能类型", "name": "type", @@ -4285,6 +4261,30 @@ "sortable": true, "type": "select", "value": null + }, + { + "label": "状态", + "name": "state", + "options": [ + { + "name": "已启用", + "value": "0" + }, + { + "name": "未启用", + "value": "1" + }, + { + "name": "异常", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null } ], "table": "system" @@ -4629,40 +4629,40 @@ "value": null }, { - "name": "审批人", - "value": "approver_data" + "name": "任务名", + "value": "name" }, { - "name": "任务描述", - "value": "description" + "name": "审批人", + "value": "approver_data" }, { "name": "地址", "value": "address" }, { - "name": "ID", - "value": "id" - }, - { - "name": "监督人", - "value": "reader_data" - }, - { - "name": "任务名", - "value": "name" + "name": "过失描述", + "value": "reward_description" }, { "name": "执行人", "value": "executor_data" }, + { + "name": "任务描述", + "value": "description" + }, { "name": "额外数据", "value": "extend_data" }, { - "name": "过失描述", - "value": "reward_description" + "name": "监督人", + "value": "reader_data" + }, + { + "name": "ID", + "value": "id" } ], "type": "search", @@ -4684,13 +4684,13 @@ "name": "开始时间", "value": "start_time" }, - { - "name": "创建时间", - "value": "create_time" - }, { "name": "变更时间", "value": "modify_time" + }, + { + "name": "创建时间", + "value": "create_time" } ], "type": "search", @@ -4714,6 +4714,91 @@ "type": "search", "value": null }, + { + "label": "状态", + "name": "status", + "options": [ + { + "name": "待执行", + "value": "0" + }, + { + "name": "待审批", + "value": "1" + }, + { + "name": "审批通过", + "value": "2" + }, + { + "name": "审批驳回", + "value": "3" + }, + { + "name": "已逾期", + "value": "4" + }, + { + "name": "部分已执行", + "value": "5" + }, + { + "name": "部分已审批", + "value": "6" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, + { + "label": "奖惩设置", + "name": "reward", + "options": [ + { + "name": "无", + "value": "0" + }, + { + "name": "惩罚", + "value": "1" + }, + { + "name": "全部", + "value": null + } + ], + "sortable": true, + "type": "select", + "value": null + }, + { + "label": "状态", + "name": "state", + "options": [ + { + "name": "已启用", + "value": "0" + }, + { + "name": "未启用", + "value": "1" + }, + { + "name": "异常", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, { "label": "类型", "name": "type", @@ -4772,89 +4857,18 @@ "value": null }, { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "异常", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null + "label": "归口", + "link": "department", + "name": "department_id", + "type": "tree", + "value": "name" }, { - "label": "奖惩设置", - "name": "reward", - "options": [ - { - "name": "无", - "value": "0" - }, - { - "name": "惩罚", - "value": "1" - }, - { - "name": "全部", - "value": null - } - ], - "sortable": true, - "type": "select", - "value": null - }, - { - "label": "状态", - "name": "status", - "options": [ - { - "name": "待执行", - "value": "0" - }, - { - "name": "待审批", - "value": "1" - }, - { - "name": "审批通过", - "value": "2" - }, - { - "name": "审批驳回", - "value": "3" - }, - { - "name": "已逾期", - "value": "4" - }, - { - "name": "部分已执行", - "value": "5" - }, - { - "name": "部分已审批", - "value": "6" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null + "label": "地区", + "link": "city", + "name": "city_id", + "type": "tree", + "value": "name" }, { "label": "创建员工", @@ -4869,20 +4883,6 @@ "name": "zone_id", "type": "tree", "value": "name" - }, - { - "label": "地区", - "link": "city", - "name": "city_id", - "type": "tree", - "value": "name" - }, - { - "label": "归口", - "link": "department", - "name": "department_id", - "type": "tree", - "value": "name" } ], "table": "task" @@ -5266,10 +5266,6 @@ "name": "无", "value": null }, - { - "name": "ID", - "value": "id" - }, { "name": "任务名", "value": "name" @@ -5278,13 +5274,17 @@ "name": "额外数据", "value": "extend_data" }, + { + "name": "地址", + "value": "address" + }, { "name": "过失描述", "value": "reward_description" }, { - "name": "地址", - "value": "address" + "name": "ID", + "value": "id" }, { "name": "任务描述", @@ -5303,16 +5303,16 @@ "value": null }, { - "name": "创建时间", - "value": "create_time" + "name": "完成时间", + "value": "finish_time" }, { "name": "变更时间", "value": "modify_time" }, { - "name": "完成时间", - "value": "finish_time" + "name": "创建时间", + "value": "create_time" } ], "type": "search", @@ -5336,43 +5336,6 @@ "type": "search", "value": null }, - { - "label": "循环", - "name": "round", - "options": [ - { - "name": "一次", - "value": "0" - }, - { - "name": "一天", - "value": "1" - }, - { - "name": "一周", - "value": "2" - }, - { - "name": "一月", - "value": "3" - }, - { - "name": "一季度", - "value": "4" - }, - { - "name": "一年", - "value": "5" - }, - { - "name": "全部", - "value": null - } - ], - "sortable": true, - "type": "select", - "value": null - }, { "label": "类型", "name": "type", @@ -5434,6 +5397,30 @@ "type": "select", "value": null }, + { + "label": "状态", + "name": "state", + "options": [ + { + "name": "已启用", + "value": "0" + }, + { + "name": "未启用", + "value": "1" + }, + { + "name": "异常", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, { "label": "奖惩设置", "name": "reward", @@ -5455,6 +5442,72 @@ "type": "select", "value": null }, + { + "label": "循环", + "name": "round", + "options": [ + { + "name": "一次", + "value": "0" + }, + { + "name": "一天", + "value": "1" + }, + { + "name": "一周", + "value": "2" + }, + { + "name": "一月", + "value": "3" + }, + { + "name": "一季度", + "value": "4" + }, + { + "name": "一年", + "value": "5" + }, + { + "name": "全部", + "value": null + } + ], + "sortable": true, + "type": "select", + "value": null + }, + { + "label": "角色", + "name": "role", + "options": [ + { + "name": "执行者", + "value": "0" + }, + { + "name": "审批者", + "value": "1" + }, + { + "name": "监督者", + "value": "2" + }, + { + "name": "执行审批者", + "value": "3" + }, + { + "name": "全部", + "value": null + } + ], + "sortable": true, + "type": "select", + "value": null + }, { "label": "状态", "name": "status", @@ -5488,57 +5541,11 @@ "value": null }, { - "label": "角色", - "name": "role", - "options": [ - { - "name": "执行者", - "value": "0" - }, - { - "name": "审批者", - "value": "1" - }, - { - "name": "监督者", - "value": "2" - }, - { - "name": "执行审批者", - "value": "3" - }, - { - "name": "全部", - "value": null - } - ], - "sortable": true, - "type": "select", - "value": null - }, - { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "异常", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null + "label": "员工", + "link": "admin", + "name": "admin_id", + "type": "tree", + "value": "name" }, { "label": "战区", @@ -5560,13 +5567,6 @@ "name": "department_id", "type": "tree", "value": "name" - }, - { - "label": "员工", - "link": "admin", - "name": "admin_id", - "type": "tree", - "value": "name" } ], "table": "task_admin" @@ -5858,10 +5858,22 @@ "name": "无", "value": null }, + { + "name": "职位", + "value": "position" + }, + { + "name": "ID", + "value": "id" + }, { "name": "手机号码", "value": "phone" }, + { + "name": "昵称", + "value": "nickname" + }, { "name": "微信号", "value": "wechat" @@ -5870,21 +5882,9 @@ "name": "用户姓名", "value": "name" }, - { - "name": "职位", - "value": "position" - }, - { - "name": "ID", - "value": "id" - }, { "name": "邮箱", "value": "email" - }, - { - "name": "昵称", - "value": "nickname" } ], "type": "search", @@ -6043,6 +6043,10 @@ "name": "无", "value": null }, + { + "name": "名称", + "value": "name" + }, { "name": "描述", "value": "description" @@ -6050,10 +6054,6 @@ { "name": "ID", "value": "id" - }, - { - "name": "名称", - "value": "name" } ], "type": "search", @@ -6267,28 +6267,28 @@ "value": "id" }, { - "name": "access_token", - "value": "acttoken" + "name": "openid", + "value": "openid" }, { "name": "微信appid", "value": "appid" }, - { - "name": "微信组id", - "value": "unionid" - }, { "name": "昵称", "value": "nickname" }, { - "name": "openid", - "value": "openid" + "name": "微信组id", + "value": "unionid" }, { "name": "refresh_token", "value": "retoken" + }, + { + "name": "access_token", + "value": "acttoken" } ], "type": "search", @@ -6302,13 +6302,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -6479,13 +6479,13 @@ "name": "无", "value": null }, - { - "name": "名称", - "value": "name" - }, { "name": "ID", "value": "id" + }, + { + "name": "名称", + "value": "name" } ], "type": "search",