no message

src/util/config.go

@@ -40,7 +40,7 @@ var (
 	MatchTypeMap  *[]map[string]interface{} //匹配方式
 	MatchTypeMap2 map[string]interface{}    //匹配方式
 	MatchTypeMap3 *[]map[string]interface{} //匹配方式
-	ExistFiled    []string                  //存在的字段
+	ExistFiled    *[]map[string]interface{} //存在的字段
 	ScopeClassMap *[]map[string]interface{} //公告行业
 	TagFieldMap   *[]map[string]interface{} //标签属性值
 	TaskTypeMap   *[]map[string]interface{} //任务类型
@@ -185,11 +185,11 @@ func initMatchType() {
 }
 
 func initExitField() {
-	datas, _ := Mgo.Find("code_field", `{}`, `{"_id":1}`, `{}`, false, -1, -1)
-	for _, data := range *datas {
-		name := data["name"].(string)
-		ExistFiled = append(ExistFiled, name)
-	}
+	ExistFiled, _ = Mgo.Find("code_field", `{}`, `{"_id":1}`, `{}`, false, -1, -1)
+	//for _, data := range *datas {
+	//	name := data["name"].(string)
+	//	ExistFiled = append(ExistFiled, name)
+	//}
 }
 
 func initScopeClass() {

src/web/templates/private/common_rule_create.html

@@ -457,8 +457,8 @@
         });
         for (var i in existField) {
             var opt = document.createElement('option');
-            opt.innerText = existField[i];
-            opt.value = existField[i];
+            opt.innerText = existField[i]["name"];
+            opt.value = existField[i]["code"];
             $('#existFieldSelect')[0].appendChild(opt)
         }
         $("#existFieldSelect").selectpicker("refresh");

src/web/templates/private/common_rule_edit.html

@@ -506,9 +506,9 @@
 
         for (var i in existField) {
             var opt = document.createElement('option');
-            opt.innerText = existField[i];
-            opt.value = existField[i];
-            if (dataMap.s_existfields && dataMap.s_existfields.indexOf(existField[i]) != -1) {
+            opt.innerText = existField[i]["name"];
+            opt.value = existField[i]["code"];
+            if (dataMap.s_existfields && dataMap.s_existfields.indexOf(existField[i]["code"]) != -1) {
                 opt.selected = true
             }
             $('#existFieldSelect')[0].appendChild(opt)

src/web/templates/private/cuser_rule_create.html

@@ -455,8 +455,8 @@
 
         for (var i in existField) {
             var opt = document.createElement('option');
-            opt.innerText = existField[i];
-            opt.value = existField[i];
+            opt.innerText = existField[i]["name"];
+            opt.value = existField[i]["code"];
             $('#existFieldSelect')[0].appendChild(opt)
         }
         $("#existFieldSelect").selectpicker("refresh");

src/web/templates/private/cuser_rule_edit.html

@@ -526,9 +526,9 @@
         //选择字段
         for (var i in existField) {
             var opt = document.createElement('option');
-            opt.innerText = existField[i];
-            opt.value = existField[i];
-            if (dataMap.s_existfields && dataMap.s_existfields.indexOf(existField[i]) != -1) {
+            opt.innerText = existField[i]["name"];
+            opt.value = existField[i]["code"];
+            if (dataMap.s_existfields && dataMap.s_existfields.indexOf(existField[i]["code"]) != -1) {
                 opt.selected = true
             }
             $('#existFieldSelect')[0].appendChild(opt)

src/web/templates/private/customer_create.html

@@ -33,7 +33,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label"><span style="color:red;">* </span>客户名称</label>
                                         <div class="col-sm-3">
-                                            <input type="text" class="form-control" id="customername" placeholder="客户名称" required>
+                                            <input type="text" class="form-control" id="customername" placeholder="公司名称" required>
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -94,7 +94,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label"><span style="color:red;">* </span>部门名称</label>
                                 <div class="col-sm-6">
-                                    <input class="form-control" placeholder="输入部门名称" id="depart_name"/></div>
+                                    <input class="form-control" placeholder="销售部、销售部-xx子部门" id="depart_name"/></div>
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">联系人</label>

src/web/templates/private/customer_edit.html

@@ -35,7 +35,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label"><span style="color:red;">* </span>客户名称</label>
                                         <div class="col-sm-3">
-                                            <input type="text" class="form-control" id="customername" placeholder="客户名称"
+                                            <input type="text" class="form-control" id="customername" placeholder="公司名称"
                                                    value="{{.T.data.s_name}}" required>
                                         </div>
                                     </div>
@@ -175,7 +175,7 @@
 
 <!-- 新增部门 -->
 <div class="modal fade" id="modal-add-depart" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog" style="width: 40%">
+    <div class="modal-dialog" style="width: 50%">
         <div class="modal-content">
             <div class="modal-header">
                 <div class="modal-header">
@@ -189,7 +189,7 @@
                             <div class="form-group">
                                 <label class="col-sm-3 control-label"><span style="color:red;">* </span>部门名称</label>
                                 <div class="col-sm-6">
-                                    <input class="form-control" placeholder="输入部门名称" id="depart_name"/></div>
+                                    <input class="form-control" placeholder="销售部、销售部-xx子部门" id="depart_name"/></div>
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">联系人</label>

src/web/templates/private/rule_create.html

@@ -477,8 +477,8 @@
 
         for (var i in existField) {
             var opt = document.createElement('option');
-            opt.innerText = existField[i];
-            opt.value = existField[i];
+            opt.innerText = existField[i]["name"];
+            opt.value = existField[i]["code"];
             $('#existFieldSelect')[0].appendChild(opt)
         }
         $("#existFieldSelect").selectpicker("refresh");

src/web/templates/private/rule_edit.html

@@ -548,9 +548,9 @@
         //选择字段
         for (var i in existField) {
             var opt = document.createElement('option');
-            opt.innerText = existField[i];
-            opt.value = existField[i];
-            if (dataMap.s_existfields && dataMap.s_existfields.indexOf(existField[i]) != -1) {
+            opt.innerText = existField[i]["name"];
+            opt.value = existField[i]["code"];
+            if (dataMap.s_existfields && dataMap.s_existfields.indexOf(existField[i]["code"]) != -1) {
                 opt.selected = true
             }
             $('#existFieldSelect')[0].appendChild(opt)