From b4250243595f9d4c5d010082209c5abecb3d343b Mon Sep 17 00:00:00 2001
From: hoteas <deng1993624>
Date: Thu, 20 Oct 2022 09:00:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B5=81=E7=A8=8B=E5=BC=95?=
 =?UTF-8?q?=E6=93=8E=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/makecode.go            |   90 +--
 example/config/adminDB.json | 1164 ++++++++++++++++++-----------------
 2 files changed, 632 insertions(+), 622 deletions(-)

diff --git a/code/makecode.go b/code/makecode.go
index 07c2af8..1a01a05 100644
--- a/code/makecode.go
+++ b/code/makecode.go
@@ -555,6 +555,13 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 					ta := flow.GetMap(fk)
 					ta["stop"] = true
 					flow[fk] = ta
+
+					if k == "id" && that.TableColumns[fk]["parent_id"] == nil {
+
+						sql := flow.GetMap(fk).GetMap("sql")
+						sql[k] = av.GetString("name")
+						flow.GetMap(fk)["sql"] = sql
+					}
 				}
 
 			}
@@ -850,7 +857,7 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req
 	keyword := Map{}
 	daterange := Map{}
 	sortMap := Map{}
-	var ruleData Map
+	//var ruleData Map
 	hasUser := false
 
 	keywordStr := req.FormValue("keyword")
@@ -920,41 +927,41 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req
 				userData != nil &&
 				that.TableColumns[v.GetString("link")]["parent_id"] != nil {
 				//初始化ruleData
-				if ruleData == nil {
-					ruleData = Map{}
-					for _, v := range that.TableColumns[that.FileConfig.GetString("table")] {
-						if v.GetString("link") != "" &&
-							v.GetString("name") != "parent_id" &&
-							userData.Get(v.GetString("name")) != nil {
-							ruleData[v.GetString("link")] = userData.Get(v.GetString("name"))
-						}
-					}
-				}
-				if ruleData[v.GetString("link")] != nil {
-					parent_idsStr := ""
-					parent_ids := that.TableColumns[v.GetString("link")]["parent_ids"]
-					if parent_ids != nil {
-						parent_idsStr = "parent_ids[~]"
-					}
-					index := that.TableColumns[v.GetString("link")]["index"]
-					if index != nil {
-						parent_idsStr = "index[~]"
-					}
-
-					if v.GetString("name") == "parent_id" {
-
-						data[table+"."+parent_idsStr] = "," + ruleData.GetString(v.GetString("link")) + ","
-
-					} else {
-						idMap := db.Select(v.GetString("link"), "id", Map{parent_idsStr: "," + ruleData.GetString(v.GetString("link")) + ","})
-						ids := Slice{ruleData.GetCeilInt(v.GetString("link"))}
-						for _, v := range idMap {
-							ids = append(ids, v.GetCeilInt("id"))
-						}
-						data[table+"."+v.GetString("name")] = ids
-					}
-
-				}
+				//if ruleData == nil {
+				//	ruleData = Map{}
+				//	for _, v := range that.TableColumns[that.FileConfig.GetString("table")] {
+				//		if v.GetString("link") != "" &&
+				//			v.GetString("name") != "parent_id" &&
+				//			userData.Get(v.GetString("name")) != nil {
+				//			ruleData[v.GetString("link")] = userData.Get(v.GetString("name"))
+				//		}
+				//	}
+				//}
+				//if ruleData[v.GetString("link")] != nil {
+				//	parent_idsStr := ""
+				//	parent_ids := that.TableColumns[v.GetString("link")]["parent_ids"]
+				//	if parent_ids != nil {
+				//		parent_idsStr = "parent_ids[~]"
+				//	}
+				//	index := that.TableColumns[v.GetString("link")]["index"]
+				//	if index != nil {
+				//		parent_idsStr = "index[~]"
+				//	}
+				//
+				//	if v.GetString("name") == "parent_id" {
+				//
+				//		data[table+"."+parent_idsStr] = "," + ruleData.GetString(v.GetString("link")) + ","
+				//
+				//	} else {
+				//		idMap := db.Select(v.GetString("link"), "id", Map{parent_idsStr: "," + ruleData.GetString(v.GetString("link")) + ","})
+				//		ids := Slice{ruleData.GetCeilInt(v.GetString("link"))}
+				//		for _, v := range idMap {
+				//			ids = append(ids, v.GetCeilInt("id"))
+				//		}
+				//		data[table+"."+v.GetString("name")] = ids
+				//	}
+				//
+				//}
 
 			}
 
@@ -1005,9 +1012,9 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req
 	for k, _ := range search {
 		searchItem := search.GetMap(k)
 		searchItemName := searchItem.GetString("name")
-		if data[table+"."+searchItemName] != nil {
-			delete(data, table+"."+searchItemName)
-		}
+		//if data[table+"."+searchItemName] != nil {
+		//	delete(data, table+"."+searchItemName)
+		//}
 		reqValue := req.Form[searchItemName]
 		parent_idsStr := ""
 		if searchItem.GetString("link") != "" {
@@ -1031,8 +1038,9 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req
 					for _, v := range r {
 						reqValue = append(reqValue, v.GetString("id"))
 					}
-
-					data[table+"."+searchItemName] = reqValue
+					if data[table+"."+searchItemName] != nil {
+						data[table+"."+searchItemName] = reqValue
+					}
 
 				}
 
diff --git a/example/config/adminDB.json b/example/config/adminDB.json
index 30ea0ee..fffeede 100644
--- a/example/config/adminDB.json
+++ b/example/config/adminDB.json
@@ -56,7 +56,9 @@
 			"table": "proj"
 		},
 		"role": {
-			"sql": {},
+			"sql": {
+				"id": "role_id"
+			},
 			"stop": true,
 			"table": "role"
 		},
@@ -134,8 +136,8 @@
 						"info",
 						"download"
 					],
-					"label": "标签管理",
-					"table": "visit_tag"
+					"label": "角色管理",
+					"table": "role"
 				},
 				{
 					"auth": [
@@ -146,8 +148,8 @@
 						"info",
 						"download"
 					],
-					"label": "车辆管理",
-					"table": "car"
+					"label": "联络人管理",
+					"table": "user"
 				},
 				{
 					"auth": [
@@ -158,64 +160,8 @@
 						"info",
 						"download"
 					],
-					"label": "供应商管理",
-					"table": "channel"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "城市管理",
-					"table": "city"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "项目归口",
-					"table": "department"
-				},
-				{
-					"auth": [
-						"show",
-						"download"
-					],
-					"label": "日志管理",
-					"table": "logs"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "客户管理",
-					"table": "company"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "部门管理",
-					"table": "org"
+					"label": "项目分类",
+					"table": "category"
 				},
 				{
 					"auth": [
@@ -229,18 +175,6 @@
 					"label": "标签管理",
 					"table": "out_tag"
 				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "用章管理",
-					"table": "seal_tag"
-				},
 				{
 					"auth": [
 						"show",
@@ -262,8 +196,16 @@
 						"info",
 						"download"
 					],
-					"label": "人员管理",
-					"table": "admin"
+					"label": "车辆管理",
+					"table": "car"
+				},
+				{
+					"auth": [
+						"show",
+						"download"
+					],
+					"label": "日志管理",
+					"table": "logs"
 				},
 				{
 					"auth": [
@@ -274,8 +216,8 @@
 						"info",
 						"download"
 					],
-					"label": "角色管理",
-					"table": "role"
+					"label": "系统设置",
+					"table": "system"
 				},
 				{
 					"auth": [
@@ -286,8 +228,80 @@
 						"info",
 						"download"
 					],
-					"label": "联络人管理",
-					"table": "user"
+					"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": [
@@ -322,8 +336,8 @@
 						"info",
 						"download"
 					],
-					"label": "项目分类",
-					"table": "category"
+					"label": "人员管理",
+					"table": "admin"
 				},
 				{
 					"auth": [
@@ -334,20 +348,8 @@
 						"info",
 						"download"
 					],
-					"label": "项目管理",
-					"table": "proj"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "系统设置",
-					"table": "system"
+					"label": "供应商管理",
+					"table": "channel"
 				}
 			],
 			"name": "sys"
@@ -357,20 +359,8 @@
 				"show"
 			],
 			"icon": "Setting",
-			"label": "任务管理",
+			"label": "任务执行",
 			"menus": [
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "任务管理",
-					"table": "task"
-				},
 				{
 					"auth": [
 						"show",
@@ -382,6 +372,18 @@
 					],
 					"label": "任务执行",
 					"table": "task_admin"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "任务管理",
+					"table": "task"
 				}
 			],
 			"name": "sys:task"
@@ -568,6 +570,14 @@
 							"name": "ID",
 							"value": "id"
 						},
+						{
+							"name": "QQ号",
+							"value": "qq"
+						},
+						{
+							"name": "微信号",
+							"value": "wechat"
+						},
 						{
 							"name": "邮箱",
 							"value": "email"
@@ -576,10 +586,6 @@
 							"name": "手机号",
 							"value": "phone"
 						},
-						{
-							"name": "QQ号",
-							"value": "qq"
-						},
 						{
 							"name": "职位",
 							"value": "title"
@@ -587,10 +593,6 @@
 						{
 							"name": "名称",
 							"value": "name"
-						},
-						{
-							"name": "微信号",
-							"value": "wechat"
 						}
 					],
 					"type": "search",
@@ -604,13 +606,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -658,13 +660,6 @@
 					"type": "select",
 					"value": null
 				},
-				{
-					"label": "主管",
-					"link": "admin",
-					"name": "parent_id",
-					"type": "tree",
-					"value": "name"
-				},
 				{
 					"label": "部门",
 					"link": "org",
@@ -678,6 +673,13 @@
 					"name": "zone_id",
 					"type": "tree",
 					"value": "name"
+				},
+				{
+					"label": "主管",
+					"link": "admin",
+					"name": "parent_id",
+					"type": "tree",
+					"value": "name"
 				}
 			],
 			"table": "admin"
@@ -961,13 +963,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -1204,6 +1206,18 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "企业地址",
+							"value": "address"
+						},
+						{
+							"name": "统一社会信用代码",
+							"value": "sn"
+						},
+						{
+							"name": "联系方式",
+							"value": "contact"
+						},
 						{
 							"name": "id",
 							"value": "id"
@@ -1212,21 +1226,9 @@
 							"name": "企业名称",
 							"value": "name"
 						},
-						{
-							"name": "统一社会信用代码",
-							"value": "sn"
-						},
 						{
 							"name": "备注",
 							"value": "description"
-						},
-						{
-							"name": "企业地址",
-							"value": "address"
-						},
-						{
-							"name": "联系方式",
-							"value": "contact"
 						}
 					],
 					"type": "search",
@@ -1319,13 +1321,6 @@
 					"type": "select",
 					"value": null
 				},
-				{
-					"label": "部门",
-					"link": "org",
-					"name": "org_id",
-					"type": "tree",
-					"value": "name"
-				},
 				{
 					"label": "城市",
 					"link": "city",
@@ -1340,6 +1335,13 @@
 					"type": "tree",
 					"value": "name"
 				},
+				{
+					"label": "部门",
+					"link": "org",
+					"name": "org_id",
+					"type": "tree",
+					"value": "name"
+				},
 				{
 					"label": "创建员工",
 					"link": "admin",
@@ -1730,6 +1732,14 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "企业地址",
+							"value": "address"
+						},
+						{
+							"name": "客户基本情况",
+							"value": "description"
+						},
 						{
 							"name": "客户名称",
 							"value": "name"
@@ -1741,14 +1751,6 @@
 						{
 							"name": "营业执照代码",
 							"value": "sn"
-						},
-						{
-							"name": "企业地址",
-							"value": "address"
-						},
-						{
-							"name": "客户基本情况",
-							"value": "description"
 						}
 					],
 					"type": "search",
@@ -1766,13 +1768,13 @@
 							"name": "变更时间",
 							"value": "modify_time"
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "注册时间",
 							"value": "time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -1796,6 +1798,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",
@@ -1874,40 +1900,16 @@
 					"value": null
 				},
 				{
-					"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",
+					"label": "所属联盟公司",
+					"link": "zone",
+					"name": "zone_id",
 					"type": "tree",
 					"value": "name"
 				},
 				{
-					"label": "所属联盟公司",
-					"link": "zone",
-					"name": "zone_id",
+					"label": "城市",
+					"link": "city",
+					"name": "city_id",
 					"type": "tree",
 					"value": "name"
 				},
@@ -1919,9 +1921,9 @@
 					"value": "name"
 				},
 				{
-					"label": "城市",
-					"link": "city",
-					"name": "city_id",
+					"label": "部门",
+					"link": "org",
+					"name": "org_id",
 					"type": "tree",
 					"value": "name"
 				}
@@ -2028,10 +2030,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "归口名称",
 							"value": "name"
@@ -2039,6 +2037,10 @@
 						{
 							"name": "描述",
 							"value": "description"
+						},
+						{
+							"name": "ID",
+							"value": "id"
 						}
 					],
 					"type": "search",
@@ -2052,13 +2054,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -2107,16 +2109,16 @@
 					"value": null
 				},
 				{
-					"label": "上级",
-					"link": "department",
-					"name": "parent_id",
+					"label": "所在地区",
+					"link": "city",
+					"name": "city_id",
 					"type": "tree",
 					"value": "name"
 				},
 				{
-					"label": "所在地区",
-					"link": "city",
-					"name": "city_id",
+					"label": "上级",
+					"link": "department",
+					"name": "parent_id",
 					"type": "tree",
 					"value": "name"
 				}
@@ -2254,21 +2256,21 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "IP",
-							"value": "ip"
-						},
 						{
 							"name": "描述",
 							"value": "description"
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "日志名",
 							"value": "name"
+						},
+						{
+							"name": "IP",
+							"value": "ip"
+						},
+						{
+							"name": "ID",
+							"value": "id"
 						}
 					],
 					"type": "search",
@@ -2308,6 +2310,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",
@@ -2341,30 +2367,6 @@
 					"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",
@@ -2477,13 +2479,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "组织名称",
 							"value": "name"
+						},
+						{
+							"name": "ID",
+							"value": "id"
 						}
 					],
 					"type": "search",
@@ -2551,6 +2553,13 @@
 					"type": "select",
 					"value": null
 				},
+				{
+					"label": "联盟公司",
+					"link": "zone",
+					"name": "zone_id",
+					"type": "tree",
+					"value": "name"
+				},
 				{
 					"label": "上级组织",
 					"link": "org",
@@ -2564,13 +2573,6 @@
 					"name": "admin_id",
 					"type": "tree",
 					"value": "name"
-				},
-				{
-					"label": "联盟公司",
-					"link": "zone",
-					"name": "zone_id",
-					"type": "tree",
-					"value": "name"
 				}
 			],
 			"table": "org"
@@ -3067,24 +3069,24 @@
 							"value": null
 						},
 						{
-							"name": "名称",
-							"value": "name"
+							"name": "来源备注",
+							"value": "source"
+						},
+						{
+							"name": "ID",
+							"value": "id"
 						},
 						{
 							"name": "项目备注",
 							"value": "description"
 						},
-						{
-							"name": "来源备注",
-							"value": "source"
-						},
 						{
 							"name": "负责人清单",
 							"value": "user_data"
 						},
 						{
-							"name": "ID",
-							"value": "id"
+							"name": "名称",
+							"value": "name"
 						}
 					],
 					"type": "search",
@@ -3099,24 +3101,24 @@
 							"value": null
 						},
 						{
-							"name": "变更时间",
-							"value": "modify_time"
+							"name": "项目启动时间",
+							"value": "start_time"
 						},
 						{
 							"name": "验收时间",
 							"value": "finish_time"
 						},
 						{
-							"name": "项目启动时间",
-							"value": "start_time"
+							"name": "创建时间",
+							"value": "create_time"
+						},
+						{
+							"name": "变更时间",
+							"value": "modify_time"
 						},
 						{
 							"name": "材料提交时间",
 							"value": "data_time"
-						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -3140,30 +3142,6 @@
 					"type": "search",
 					"value": null
 				},
-				{
-					"label": "项目状态",
-					"name": "status",
-					"options": [
-						{
-							"name": "跟进",
-							"value": "0"
-						},
-						{
-							"name": "意向",
-							"value": "1"
-						},
-						{
-							"name": "已签订",
-							"value": "2"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"type": "select",
-					"value": null
-				},
 				{
 					"label": "结果状态",
 					"name": "result_status",
@@ -3213,30 +3191,6 @@
 					"type": "select",
 					"value": null
 				},
-				{
-					"label": "状态",
-					"name": "state",
-					"options": [
-						{
-							"name": "已启用",
-							"value": "0"
-						},
-						{
-							"name": "未启用",
-							"value": "1"
-						},
-						{
-							"name": "异常",
-							"value": "2"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"type": "select",
-					"value": null
-				},
 				{
 					"add": false,
 					"edit": false,
@@ -3265,6 +3219,84 @@
 					"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",
+					"options": [
+						{
+							"name": "跟进",
+							"value": "0"
+						},
+						{
+							"name": "意向",
+							"value": "1"
+						},
+						{
+							"name": "已签订",
+							"value": "2"
+						},
+						{
+							"name": "全部",
+							"value": null
+						}
+					],
+					"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": "report_status",
@@ -3297,36 +3329,6 @@
 					"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",
@@ -3335,16 +3337,16 @@
 					"value": "name"
 				},
 				{
-					"label": "联盟公司",
-					"link": "zone",
-					"name": "zone_id",
+					"label": "项目归口",
+					"link": "department",
+					"name": "department_id",
 					"type": "tree",
 					"value": "name"
 				},
 				{
-					"label": "项目归口",
-					"link": "department",
-					"name": "department_id",
+					"label": "项目负责人",
+					"link": "admin",
+					"name": "admin_id",
 					"type": "tree",
 					"value": "name"
 				},
@@ -3363,16 +3365,16 @@
 					"value": "name"
 				},
 				{
-					"label": "市场部负责人",
-					"link": "admin",
-					"name": "sc_admin_id",
+					"label": "联盟公司",
+					"link": "zone",
+					"name": "zone_id",
 					"type": "tree",
 					"value": "name"
 				},
 				{
-					"label": "项目负责人",
+					"label": "市场部负责人",
 					"link": "admin",
-					"name": "admin_id",
+					"name": "sc_admin_id",
 					"type": "tree",
 					"value": "name"
 				}
@@ -3459,10 +3461,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "描述",
-							"value": "description"
-						},
 						{
 							"name": "ID",
 							"value": "id"
@@ -3470,6 +3468,10 @@
 						{
 							"name": "名称",
 							"value": "name"
+						},
+						{
+							"name": "描述",
+							"value": "description"
 						}
 					],
 					"type": "search",
@@ -3711,10 +3713,22 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "客户名",
+							"value": "name"
+						},
+						{
+							"name": "来源备注",
+							"value": "source"
+						},
 						{
 							"name": "客户基本情况",
 							"value": "description"
 						},
+						{
+							"name": "跟进时间及动态",
+							"value": "notes"
+						},
 						{
 							"name": "id",
 							"value": "id"
@@ -3722,18 +3736,6 @@
 						{
 							"name": "拟申报项目",
 							"value": "notes_proj"
-						},
-						{
-							"name": "跟进时间及动态",
-							"value": "notes"
-						},
-						{
-							"name": "来源备注",
-							"value": "source"
-						},
-						{
-							"name": "客户名",
-							"value": "name"
 						}
 					],
 					"type": "search",
@@ -3777,6 +3779,34 @@
 					"type": "search",
 					"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",
@@ -3825,34 +3855,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": "负责人",
 					"link": "admin",
@@ -3937,6 +3939,10 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "描述",
+							"value": "description"
+						},
 						{
 							"name": "ID",
 							"value": "id"
@@ -3944,10 +3950,6 @@
 						{
 							"name": "名称",
 							"value": "name"
-						},
-						{
-							"name": "描述",
-							"value": "description"
 						}
 					],
 					"type": "search",
@@ -4626,30 +4628,10 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
-						{
-							"name": "额外数据",
-							"value": "extend_data"
-						},
 						{
 							"name": "审批人",
 							"value": "approver_data"
 						},
-						{
-							"name": "监督人",
-							"value": "reader_data"
-						},
-						{
-							"name": "任务名",
-							"value": "name"
-						},
-						{
-							"name": "过失描述",
-							"value": "reward_description"
-						},
 						{
 							"name": "任务描述",
 							"value": "description"
@@ -4658,9 +4640,29 @@
 							"name": "地址",
 							"value": "address"
 						},
+						{
+							"name": "ID",
+							"value": "id"
+						},
+						{
+							"name": "监督人",
+							"value": "reader_data"
+						},
+						{
+							"name": "任务名",
+							"value": "name"
+						},
 						{
 							"name": "执行人",
 							"value": "executor_data"
+						},
+						{
+							"name": "额外数据",
+							"value": "extend_data"
+						},
+						{
+							"name": "过失描述",
+							"value": "reward_description"
 						}
 					],
 					"type": "search",
@@ -4678,6 +4680,10 @@
 							"name": "结束时间",
 							"value": "end_time"
 						},
+						{
+							"name": "开始时间",
+							"value": "start_time"
+						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
@@ -4685,10 +4691,6 @@
 						{
 							"name": "变更时间",
 							"value": "modify_time"
-						},
-						{
-							"name": "开始时间",
-							"value": "start_time"
 						}
 					],
 					"type": "search",
@@ -4712,70 +4714,6 @@
 					"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": "state",
-					"options": [
-						{
-							"name": "已启用",
-							"value": "0"
-						},
-						{
-							"name": "未启用",
-							"value": "1"
-						},
-						{
-							"name": "异常",
-							"value": "2"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"type": "select",
-					"value": null
-				},
 				{
 					"label": "类型",
 					"name": "type",
@@ -4833,6 +4771,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",
@@ -4855,16 +4817,56 @@
 					"value": null
 				},
 				{
-					"label": "战区",
-					"link": "zone",
-					"name": "zone_id",
+					"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": "admin",
+					"name": "admin_id",
 					"type": "tree",
 					"value": "name"
 				},
 				{
-					"label": "归口",
-					"link": "department",
-					"name": "department_id",
+					"label": "战区",
+					"link": "zone",
+					"name": "zone_id",
 					"type": "tree",
 					"value": "name"
 				},
@@ -4876,9 +4878,9 @@
 					"value": "name"
 				},
 				{
-					"label": "创建员工",
-					"link": "admin",
-					"name": "admin_id",
+					"label": "归口",
+					"link": "department",
+					"name": "department_id",
 					"type": "tree",
 					"value": "name"
 				}
@@ -5264,6 +5266,10 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "ID",
+							"value": "id"
+						},
 						{
 							"name": "任务名",
 							"value": "name"
@@ -5272,21 +5278,17 @@
 							"name": "额外数据",
 							"value": "extend_data"
 						},
+						{
+							"name": "过失描述",
+							"value": "reward_description"
+						},
 						{
 							"name": "地址",
 							"value": "address"
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "任务描述",
 							"value": "description"
-						},
-						{
-							"name": "过失描述",
-							"value": "reward_description"
 						}
 					],
 					"type": "search",
@@ -5300,10 +5302,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "完成时间",
-							"value": "finish_time"
-						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
@@ -5311,6 +5309,10 @@
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "完成时间",
+							"value": "finish_time"
 						}
 					],
 					"type": "search",
@@ -5335,17 +5337,33 @@
 					"value": null
 				},
 				{
-					"label": "奖惩设置",
-					"name": "reward",
+					"label": "循环",
+					"name": "round",
 					"options": [
 						{
-							"name": "无",
+							"name": "一次",
 							"value": "0"
 						},
 						{
-							"name": "惩罚",
+							"name": "一天",
 							"value": "1"
 						},
+						{
+							"name": "一周",
+							"value": "2"
+						},
+						{
+							"name": "一月",
+							"value": "3"
+						},
+						{
+							"name": "一季度",
+							"value": "4"
+						},
+						{
+							"name": "一年",
+							"value": "5"
+						},
 						{
 							"name": "全部",
 							"value": null
@@ -5417,33 +5435,17 @@
 					"value": null
 				},
 				{
-					"label": "循环",
-					"name": "round",
+					"label": "奖惩设置",
+					"name": "reward",
 					"options": [
 						{
-							"name": "一次",
+							"name": "无",
 							"value": "0"
 						},
 						{
-							"name": "一天",
+							"name": "惩罚",
 							"value": "1"
 						},
-						{
-							"name": "一周",
-							"value": "2"
-						},
-						{
-							"name": "一月",
-							"value": "3"
-						},
-						{
-							"name": "一季度",
-							"value": "4"
-						},
-						{
-							"name": "一年",
-							"value": "5"
-						},
 						{
 							"name": "全部",
 							"value": null
@@ -5538,6 +5540,13 @@
 					"type": "select",
 					"value": null
 				},
+				{
+					"label": "战区",
+					"link": "zone",
+					"name": "zone_id",
+					"type": "tree",
+					"value": "name"
+				},
 				{
 					"label": "地区",
 					"link": "city",
@@ -5558,13 +5567,6 @@
 					"name": "admin_id",
 					"type": "tree",
 					"value": "name"
-				},
-				{
-					"label": "战区",
-					"link": "zone",
-					"name": "zone_id",
-					"type": "tree",
-					"value": "name"
 				}
 			],
 			"table": "task_admin"
@@ -5667,13 +5669,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -5861,28 +5863,28 @@
 							"value": "phone"
 						},
 						{
-							"name": "职位",
-							"value": "position"
+							"name": "微信号",
+							"value": "wechat"
 						},
 						{
 							"name": "用户姓名",
 							"value": "name"
 						},
+						{
+							"name": "职位",
+							"value": "position"
+						},
 						{
 							"name": "ID",
 							"value": "id"
 						},
-						{
-							"name": "昵称",
-							"value": "nickname"
-						},
-						{
-							"name": "微信号",
-							"value": "wechat"
-						},
 						{
 							"name": "邮箱",
 							"value": "email"
+						},
+						{
+							"name": "昵称",
+							"value": "nickname"
 						}
 					],
 					"type": "search",
@@ -5896,13 +5898,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -6273,20 +6275,20 @@
 							"value": "appid"
 						},
 						{
-							"name": "昵称",
-							"value": "nickname"
+							"name": "微信组id",
+							"value": "unionid"
 						},
 						{
-							"name": "refresh_token",
-							"value": "retoken"
+							"name": "昵称",
+							"value": "nickname"
 						},
 						{
 							"name": "openid",
 							"value": "openid"
 						},
 						{
-							"name": "微信组id",
-							"value": "unionid"
+							"name": "refresh_token",
+							"value": "retoken"
 						}
 					],
 					"type": "search",
@@ -6375,16 +6377,16 @@
 					"value": null
 				},
 				{
-					"label": "员工",
-					"link": "admin",
-					"name": "admin_id",
+					"label": "关联组织",
+					"link": "org",
+					"name": "org_id",
 					"type": "tree",
 					"value": "name"
 				},
 				{
-					"label": "关联组织",
-					"link": "org",
-					"name": "org_id",
+					"label": "员工",
+					"link": "admin",
+					"name": "admin_id",
 					"type": "tree",
 					"value": "name"
 				}
@@ -6477,13 +6479,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "名称",
 							"value": "name"
+						},
+						{
+							"name": "ID",
+							"value": "id"
 						}
 					],
 					"type": "search",