s_tagname改为s_name

customerdata/src/util.go

@@ -83,7 +83,7 @@ func GetNotkeyAndKeyAddWord(list primitive.A, fieldMap map[string]interface{}, h
 			nkw.KeyReg = nkw_reg
 			nkws = append(nkws, nkw)
 			//获取每组关键词的标签名称
-			tagname := qu.ObjToString(ruleMap["s_tagname"])
+			tagname := qu.ObjToString(ruleMap["s_name"])
 			tagnames = append(tagnames, tagname)
 		}
 		//附加词匹配方式

src/history/util_history.go

@@ -89,7 +89,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 			nkw.KeyReg = nkw_reg
 			nkws = append(nkws, nkw)
 			//获取每组关键词的标签名称
-			tagname := qu.ObjToString(ruleMap["s_tagname"])
+			tagname := qu.ObjToString(ruleMap["s_name"])
 			tagnames = append(tagnames, tagname)
 		}
 		//附加词匹配方式

src/models/tag.go

@@ -7,8 +7,8 @@ type Tag struct {
 	Scustomer            string        `json:"s_customer" bson:"s_customer"`
 	Scustomerkey         string        `json:"s_customerkey" bson:"s_customerkey"`
 	Scustomername        string        `json:"s_customername" bson:"s_customername"`
-	Stagname             string        `json:"s_tagname" bson:"s_tagname"`
-	Stagnamekey          string        `json:"s_tagnamekey" bson:"s_tagnamekey"`
+	Stagname             string        `json:"s_name" bson:"s_name"`
+	Stagnamekey          string        `json:"s_namekey" bson:"s_namekey"`
 	Ssalesperson         string        `json:"s_salesperson" bson:"s_salesperson"`
 	Istarttime           int           `json:"i_starttime" bson:"i_starttime"`
 	Iendtime             int           `json:"i_endtime" bson:"i_endtime"`

src/service/customer_service.go

@@ -544,10 +544,10 @@ func (c *Customer) CuserRuleCreate() {
 			data["s_departid"] = ids[0]
 			data["i_createtime"] = i_createtime
 			data["s_createuser"] = user["name"]
-			s_tagnamekey := gopinyin.Convert(qu.ObjToString(data["s_tagname"]), false)
-			data["s_tagnamekey"] = s_tagnamekey
+			s_namekey := gopinyin.Convert(qu.ObjToString(data["s_name"]), false)
+			data["s_namekey"] = s_namekey
 			data["b_delete"] = false
-			data["s_dataid"] = qu.SE.EncodeString(fmt.Sprintf("%v", i_createtime) + s_tagnamekey + ids[0])
+			data["s_dataid"] = qu.SE.EncodeString(fmt.Sprintf("%v", i_createtime) + s_namekey + ids[0])
 			id = Mgo.Save("cuserdepartrule", data)
 			if id != "" {
 				rep = true
@@ -950,7 +950,7 @@ func (c *Customer) CustomerAllRule() {
 			if !t.(map[string]interface{})["is_new"].(bool) {
 				inc_rule["id"] = t.(map[string]interface{})["_id"].(bson.ObjectId).Hex() //规则id
 				inc_rule["s_depart_name"] = t.(map[string]interface{})["s_depart_name"]
-				inc_rule["s_name"] = t.(map[string]interface{})["s_tagname"]
+				inc_rule["s_name"] = t.(map[string]interface{})["s_name"]
 				inc_rule["s_depart_status"] = t.(map[string]interface{})["s_depart_status"]
 				inc_rule["s_rule_status"] = t.(map[string]interface{})["s_rule_status"]
 				inc_rule["rule_updatetime"] = t.(map[string]interface{})["i_updatetime"]
@@ -970,7 +970,7 @@ func (c *Customer) CustomerAllRule() {
 			}
 			history_rule_data["department_isuse"] = m["i_isuse"]
 			history_rule_data["depart_name"] = m["s_name"]
-			depart_rule_data, _ := Mgo.Find("euserdepartrule", q, `{"i_createtime":-1}`, `{"s_tagname":1,"i_updatetime":1,"i_isuse":1,"_id":1}`, false, 0, 0)
+			depart_rule_data, _ := Mgo.Find("euserdepartrule", q, `{"i_createtime":-1}`, `{"s_name":1,"i_updatetime":1,"i_isuse":1,"_id":1}`, false, 0, 0)
 			if depart_rule_data != nil && len(*depart_rule_data) != 0 {
 				for _, j := range *depart_rule_data {
 					j["_id"] = j["_id"].(bson.ObjectId).Hex()
@@ -1137,10 +1137,10 @@ func (c *Customer) HistoryRuleCreate() {
 			data["s_departid"] = s_id
 			data["i_createtime"] = i_createtime
 			data["s_createuser"] = user["name"]
-			s_tagnamekey := gopinyin.Convert(qu.ObjToString(data["s_tagname"]), false)
-			data["s_tagnamekey"] = s_tagnamekey
+			s_namekey := gopinyin.Convert(qu.ObjToString(data["s_name"]), false)
+			data["s_namekey"] = s_namekey
 			data["b_delete"] = true
-			data["s_dataid"] = qu.SE.EncodeString(fmt.Sprintf("%v", i_createtime) + s_tagnamekey + s_id)
+			data["s_dataid"] = qu.SE.EncodeString(fmt.Sprintf("%v", i_createtime) + s_namekey + s_id)
 			data["i_type"] = "historyData"
 			id = Mgo.Save("euserdepartrule", data)
 			if id != "" {

src/service/feedback_service.go

@@ -29,7 +29,7 @@ func (f *Feedback) FeedbackList() {
 		if search != "" {
 			query["$or"] = []interface{}{
 				bson.M{"s_customer": bson.M{"$regex": search}},
-				bson.M{"s_tagname": bson.M{"$regex": search}},
+				bson.M{"s_name": bson.M{"$regex": search}},
 			}
 		}
 

src/service/private_service.go

@@ -153,7 +153,7 @@ func (f *Private) Keydataoption(world string) {
 				feedback := make(map[string]interface{})
 				feedback["s_dataid"] = world
 				feedback["s_customer"] = (*res)["s_customer"]
-				feedback["s_tagname"] = (*res)["s_tagname"]
+				feedback["s_name"] = (*res)["s_name"]
 				feedback["s_opinion"] = tmp["option"]
 				feedback["i_num"] = len(tmp["urls"].([]interface{}))
 				feedback["l_feedbacktime"] = time.Now().Unix()
@@ -250,7 +250,7 @@ func deletefields(fieldnum int,data *map[string]interface{}) map[string]interfac
 func sendMail(tag map[string]interface{}, option string) {
 	jkmail, _ := Sysconfig["jkmail"].(map[string]interface{})
 	title := "标签系统" + qu.ObjToString(tag["s_customername"]) + "反馈信息"
-	content := "客户姓名：" + qu.ObjToString(tag["s_customername"]) + "</br>" + "标签名称：" + qu.ObjToString(tag["s_tagname"]) + "</br>" +
+	content := "客户姓名：" + qu.ObjToString(tag["s_customername"]) + "</br>" + "标签名称：" + qu.ObjToString(tag["s_name"]) + "</br>" +
 		"销售经理：" + qu.ObjToString(tag["s_salesperson"]) + "</br>" + "反馈内容：" + option
 	if jkmail != nil {
 		tomail, _ := jkmail["to"].(string)

src/util/parsxlsx.go

@@ -22,11 +22,11 @@ const (
 	Globalnotkey   = "s_globalnotkey"   //全局排除词
 	Globalclearkey = "s_globalclearkey" //全局排除词
 
-	Tagname			= "s_tagname"		//标签的关键词规则名称
+	Tagname			= "s_name"		//标签的关键词规则名称
 )
 
 //通用标签相关字段
-var export_fields = []string{"s_userid", "s_tagname", "", "s_area", "s_city", "s_district", "s_toptype", "s_subtype", "i_starttime", "i_endtime", "s_budgetlimit", "s_bidamountlimit", "s_globaltopscopeclass", "s_globalsubscopeclass", "s_globalbuyerclass", "s_globaladdkey", "s_globaladdkeymatch", "s_globalnotkey", "s_globalnotkeymatch", "s_globalclearkey", "s_globalclearkeymatch", "s_existfields", "i_extfieldstype"}
+var export_fields = []string{"s_userid", "s_name", "", "s_area", "s_city", "s_district", "s_toptype", "s_subtype", "i_starttime", "i_endtime", "s_budgetlimit", "s_bidamountlimit", "s_globaltopscopeclass", "s_globalsubscopeclass", "s_globalbuyerclass", "s_globaladdkey", "s_globaladdkeymatch", "s_globalnotkey", "s_globalnotkeymatch", "s_globalclearkey", "s_globalclearkeymatch", "s_existfields", "i_extfieldstype"}
 
 //关键词标签相关字段
 var export_o_rules = []string{"s_matchkey", "s_keymatch", "s_addkey", "s_addkeymatch", "s_notkey", "s_notkeymatch", "s_buyerclass"}

src/web/templates/com/modal.html

@@ -286,7 +286,7 @@
                         return "<input type='checkbox' value='" + val + "' addkeytype='" + row.i_globaladdkeytype + "' notkeytype='" + row.i_globalnotkeytype + "' style='text-align: center'/>"
                     }
                 },
-                {"data": "s_tagname"},
+                {"data": "s_name"},
                 {"data": "i_globaladdkeytype"},
                 {"data": "i_globalnotkeytype"},
                 {"data": "s_globalbuyerclass", render: function (val) {

src/web/templates/private/cuser_rule_create.html

@@ -406,7 +406,7 @@
     //表单数据
     var dataMap = {
         "id": "",
-        "s_tagname": "",
+        "s_name": "",
         "s_area": "",
         "s_city": "",
         "s_district": "",
@@ -1035,11 +1035,11 @@
                 }
             }
         }
-        dataMap["s_tagname"] = $('#tagname').val();
+        dataMap["s_name"] = $('#tagname').val();
         dataMap["s_globaladdkey"] = $('#g_addkey').val();
         dataMap["s_globalnotkey"] = $('#g_notkey').val();
         dataMap["s_globalclearkey"] = $('#s_globalclearkey').val();
-        if (dataMap["s_tagname"] == "") {
+        if (dataMap["s_name"] == "") {
             alert("请填写必须字段！")
             return
         }

src/web/templates/private/cuser_rule_edit.html

@@ -58,7 +58,7 @@
                                         <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="tagname" placeholder="标签名称"
-                                                   value="{{.T.data.s_tagname}}">
+                                                   value="{{.T.data.s_name}}">
                                         </div>
                                     </div>
                                     <hr>
@@ -1167,14 +1167,14 @@
             }
         }
         dataMap["s_customer"] = $('#customer').val();
-        dataMap["s_tagname"] = $('#tagname').val();
+        dataMap["s_name"] = $('#tagname').val();
         dataMap["s_salesperson"] = $('#salename').val();
         dataMap["s_serverperson"] = $("#serverperson").val();
         dataMap["s_customername"] = $("#customername").val();
         dataMap["s_globaladdkey"] = $('#g_addkey').val();
         dataMap["s_globalnotkey"] = $('#g_notkey').val();
         dataMap["s_globalclearkey"] = $('#s_globalclearkey').val();
-        if (dataMap["s_customer"] == "" || dataMap["s_tagname"] == "" || dataMap["s_salesperson"] == "" || dataMap["s_serverperson"] == "") {
+        if (dataMap["s_customer"] == "" || dataMap["s_name"] == "" || dataMap["s_salesperson"] == "" || dataMap["s_serverperson"] == "") {
             alert("请填写必须字段！")
             return
         }

src/web/templates/private/cuser_rule_history_edit.html

@@ -412,7 +412,7 @@
     //表单数据
     var dataMap = {
         "id": "",
-        "s_tagname": "",
+        "s_name": "",
         "s_area": "",
         "s_city": "",
         "s_district": "",
@@ -1041,11 +1041,11 @@
                 }
             }
         }
-        dataMap["s_tagname"] = $('#tagname').val();
+        dataMap["s_name"] = $('#tagname').val();
         dataMap["s_globaladdkey"] = $('#g_addkey').val();
         dataMap["s_globalnotkey"] = $('#g_notkey').val();
         dataMap["s_globalclearkey"] = $('#s_globalclearkey').val();
-        if (dataMap["s_tagname"] == "") {
+        if (dataMap["s_name"] == "") {
             alert("请填写必须字段！")
             return
         }

src/web/templates/private/cuser_rule_list.html

@@ -101,7 +101,7 @@
             },
             "columns": [
                 {"data": null,width:"5%"},
-                {"data": "s_tagname"},
+                {"data": "s_name"},
                 {"data": "i_updatetime",width:"9%", render: function (val) {
                   var dt = new Date()
                   dt.setTime(parseInt(val) * 1000);

src/web/templates/private/customer_edit.html

@@ -689,7 +689,7 @@
                 {"data": "", width: "1%", render: function() {
                         return `<input type="checkbox" name="ckb-rule" onclick="singleSelect(this)" style="text-align: center">`
                     }},
-                {"data": "s_tagname", width: "20%"},
+                {"data": "s_name", width: "20%"},
                 {"data": "s_depart", width: "10%"},
                 {"data": "i_updatetime", width:"10%", render: function (val) {
                         var dt = new Date()

src/web/templates/private/customer_edit_euser.html

@@ -313,7 +313,7 @@
                 {"data": "", width: "1%", render: function() {
                         return `<input type="checkbox" name="ckb-rule" onclick="singleSelect(this)" style="text-align: center">`
                     }},
-                {"data": "s_tagname", width: "20%"},
+                {"data": "s_name", width: "20%"},
                 {"data": "s_depart", width: "10%"},
                 {"data": "i_updatetime", width:"10%", render: function (val) {
                         var dt = new Date()

src/web/templates/private/customer_history.html

@@ -265,7 +265,7 @@
             for (var i=0;i<history_rule.length;i++){
                 var selected_rule = {};
                 selected_rule.department_name = history_rule[i].s_depart_name;
-                selected_rule.rule_name = history_rule[i].s_tagname;
+                selected_rule.rule_name = history_rule[i].s_name;
                 selected_rule.update_time = formattime(history_rule[i].i_updatetime);
                 selected_rule.department_status = "已启用";
                 selected_rule.rule_status = "已启用";
@@ -578,7 +578,7 @@
                     for (var i=0;i<r.data.length;i++){
                         if (r.data[i].department_rule.length!=0){
                             for (var l=0;l<r.data[i].department_rule.length;l++){
-                                html += '<tr><td><input type="checkbox" id="rule_id" onclick="getcheck(this)"/></td><td>'+number+'</td><td>'+r.data[i].depart_name+'</td><td>'+r.data[i].department_rule[l].s_tagname+'</td><td>'+formattime(r.data[i].department_rule[l].i_updatetime)+'</td>';
+                                html += '<tr><td><input type="checkbox" id="rule_id" onclick="getcheck(this)"/></td><td>'+number+'</td><td>'+r.data[i].depart_name+'</td><td>'+r.data[i].department_rule[l].s_name+'</td><td>'+formattime(r.data[i].department_rule[l].i_updatetime)+'</td>';
                                 if (r.data[i].department_isuse ==1){
                                     html += "<td>"+"已启用"
                                 }else{

src/web/templates/private/euser_rule_edit.html

@@ -47,7 +47,7 @@
                                         <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="tagname" placeholder="标签名称"
-                                                   value="{{.T.data.s_tagname}}" disabled>
+                                                   value="{{.T.data.s_name}}" disabled>
                                         </div>
                                     </div>
                                     <hr>

src/web/templates/private/euser_rule_list.html

@@ -101,7 +101,7 @@
             },
             "columns": [
                 {"data": null,width:"5%"},
-                {"data": "s_tagname"},
+                {"data": "s_name"},
                 {"data": "i_updatetime",width:"9%", render: function (val) {
                   var dt = new Date()
                   dt.setTime(parseInt(val) * 1000);

src/web/templates/private/euser_tag_rule.html

@@ -301,7 +301,7 @@
                         }
                         return ""
                     }, width: "5%"},
-                {"data": "s_tagname", width: "10%"},
+                {"data": "s_name", width: "10%"},
             ],
             "columnDefs": [{
                 "targets": [2],
@@ -420,7 +420,7 @@
     }
     function saveTag1() {
         dataMap.s_name = $('#tagname').val()
-        if (dataMap.s_tagname == "") {
+        if (dataMap.s_name == "") {
             alert("请填写必须字段！")
             return
         }
@@ -586,7 +586,7 @@
             key_flag = 1;
             var index = selectIndex[0] - 1;
             $('#modal-add-keyword').modal("show");
-            $('#rulename').val(o_list[index].s_tagname)
+            $('#rulename').val(o_list[index].s_name)
             $('#keyword_txt').val(o_list[index].s_matchkey)
             $('#addword_txt').val(o_list[index].s_addkey);
             $('#notword_txt').val(o_list[index].s_notkey);
@@ -602,7 +602,7 @@
         var notkey = $('#notword_txt').val()
         if (tagname != "" || key != "") {
             var rule = {};
-            rule["s_tagname"] = tagname
+            rule["s_name"] = tagname
             rule["s_matchkey"] = key.replace("，", ",");
             if (addkey != "") rule["s_addkey"] = addkey.replace("，", ",");
             if (notkey != "") rule["s_notkey"] = addkey.replace("，", ",");

src/web/templates/private/euser_tag_rule_l.html

@@ -199,7 +199,7 @@
                         }
                         return ""
                     }, width: "5%"},
-                {"data": "s_tagname", width: "10%"},
+                {"data": "s_name", width: "10%"},
             ],
             "columnDefs": [{
                 "targets": [1],

src/web/templates/private/feedback_detail.html

@@ -31,7 +31,7 @@
                                 <label class="col-sm-1 control-label">标签名称</label>
                                 <div class="col-sm-3">
                                     <input type="text" class="form-control" id="feedbackrule"
-                                           value={{.T.data.s_tagname}}>
+                                           value={{.T.data.s_name}}>
                                 </div>
                                 <label class="col-sm-1 control-label">反馈日期</label>
                                 <div class="col-sm-3">

src/web/templates/private/feedback_list.html

@@ -60,7 +60,7 @@
             },
             "columns": [
                 {"data": "s_customer"},
-                {"data": "s_tagname"},
+                {"data": "s_name"},
                 {"data": "s_opinion"},
                 {"data": "i_num"},
                 {"data": "l_feedbacktime", render: function (val) {

src/web/templates/private/history_rule_edit.html

@@ -58,7 +58,7 @@
                                         <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="tagname" placeholder="标签名称"
-                                                   value="{{.T.data.s_tagname}}">
+                                                   value="{{.T.data.s_name}}">
                                         </div>
                                         <label class="col-sm-2 control-label"><span style="color:red;">* </span>部门名称</label>
                                         <div class="col-sm-3">
@@ -1175,14 +1175,14 @@
             }
         }
         dataMap["s_customer"] = $('#customer').val();
-        dataMap["s_tagname"] = $('#tagname').val();
+        dataMap["s_name"] = $('#tagname').val();
         dataMap["s_salesperson"] = $('#salename').val();
         dataMap["s_serverperson"] = $("#serverperson").val();
         dataMap["s_customername"] = $("#customername").val();
         dataMap["s_globaladdkey"] = $('#g_addkey').val();
         dataMap["s_globalnotkey"] = $('#g_notkey').val();
         dataMap["s_globalclearkey"] = $('#s_globalclearkey').val();
-        if (dataMap["s_customer"] == "" || dataMap["s_tagname"] == "" || dataMap["s_salesperson"] == "" || dataMap["s_serverperson"] == "") {
+        if (dataMap["s_customer"] == "" || dataMap["s_name"] == "" || dataMap["s_salesperson"] == "" || dataMap["s_serverperson"] == "") {
             alert("请填写必须字段！")
             return
         }