xg

CMPlatform/config.json

@@ -65,7 +65,7 @@
     "size": 15
   },
   "es": {
-    "addr": "http://127.0.0.1:19908",
+    "addr": "http://192.168.3.241:9205",
     "index": "bidding",
     "itype": "bidding",
     "pool": 15,
@@ -74,7 +74,7 @@
     "password": "Top2023_JEB01i@31"
   },
   "es_customer": {
-    "addr": "http://127.0.0.1:19908",
+    "addr": "http://192.168.3.241:9205",
     "index": "bidding",
     "pool": 15,
     "version": "v7",

CMPlatform/service/customer_service.go

@@ -123,17 +123,22 @@ func (c *Customer) CustomerEdit() {
 	depart, _ := util.Mgo.Find("cuserdepart", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
 	(*data)["_id"] = mongodb.BsonIdToSId((*data)["_id"])
 	tagRule, tagRule2, tagRule3 := []map[string]interface{}{}, []map[string]interface{}{}, []map[string]interface{}{}
+	tagRule4, tagRule5 := []map[string]interface{}{}, []map[string]interface{}{}
 	if common.IntAll((*data)["i_state"]) == 1 {
 		tagRules, _ := util.Mgo.Find("eusertagrule", bson.M{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
 		if tagRules != nil && len(*tagRules) > 0 {
 			for _, v := range *tagRules {
 				tagType := common.ObjToString(v["tagType"])
-				if tagType == "2" {
+				if tagType == "1" {
+					tagRule = append(tagRule, v)
+				} else if tagType == "2" {
 					tagRule2 = append(tagRule2, v)
 				} else if tagType == "3" {
 					tagRule3 = append(tagRule3, v)
+				} else if tagType == "4" {
+					tagRule4 = append(tagRule4, v)
 				} else {
-					tagRule = append(tagRule, v)
+					tagRule5 = append(tagRule5, v)
 				}
 			}
 		}
@@ -141,6 +146,8 @@ func (c *Customer) CustomerEdit() {
 	c.T["tagrule"] = tagRule
 	c.T["tagrule2"] = tagRule2
 	c.T["tagrule3"] = tagRule3
+	c.T["tagrule4"] = tagRule4
+	c.T["tagrule5"] = tagRule5
 	c.T["data"] = *data
 	c.T["depart"] = *depart
 	c.Render("private/customer_edit.html", &c.T)

CMPlatform/web/templates/private/customer_edit.html

@@ -22,6 +22,8 @@
                     <li data-mode="guide" class="tab_2"><a href="#tab_2" data-toggle="tab" aria-expanded="false">私有标签1</a></li>
                     <li data-mode="guide" class="tab_2"><a href="#tab_3" data-toggle="tab" aria-expanded="false">私有标签2</a></li>
                     <li data-mode="guide" class="tab_2"><a href="#tab_4" data-toggle="tab" aria-expanded="false">私有标签3</a></li>
+                    <li data-mode="guide" class="tab_2"><a href="#tab_5" data-toggle="tab" aria-expanded="false">私有标签4</a></li>
+                    <li data-mode="guide" class="tab_2"><a href="#tab_6" data-toggle="tab" aria-expanded="false">私有标签5</a></li>
                 </ul>
                 <div class="tab-content">
 
@@ -276,6 +278,54 @@
                             </table>
                         </div>
                     </div>
+                    <div class="tab-pane" id="tab_5">
+                        <div class="box box-primary">
+                            <div class="box-header with-border">
+                                <i class="fa fa-bookmark"></i>
+                                <h3 class="box-title">私有标签4</h3>
+                                <a class="btn btn-primary btn-sm"
+                                   style="float: right;margin-top: 7px;margin-right: 10px"
+                                   href="/service/euser/tag/edit?tag=4&cid={{.T.data._id}}"><i
+                                        class="fa fa-fw fa-file-code-o fa-lg"></i>新建标签</a>
+                            </div>
+                            <table id="tagrule4" class="table table-bordered">
+                                <thead>
+                                <tr>
+                                    <th>编号</th>
+                                    <th>标签规则名称</th>
+                                    <th>修改时间</th>
+                                    <th>启用状态</th>
+                                    <th>操作</th>
+                                    <th>功能</th>
+                                </tr>
+                                </thead>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="tab-pane" id="tab_6">
+                        <div class="box box-primary">
+                            <div class="box-header with-border">
+                                <i class="fa fa-bookmark"></i>
+                                <h3 class="box-title">私有标签5</h3>
+                                <a class="btn btn-primary btn-sm"
+                                   style="float: right;margin-top: 7px;margin-right: 10px"
+                                   href="/service/euser/tag/edit?tag=5&cid={{.T.data._id}}"><i
+                                        class="fa fa-fw fa-file-code-o fa-lg"></i>新建标签</a>
+                            </div>
+                            <table id="tagrule5" class="table table-bordered">
+                                <thead>
+                                <tr>
+                                    <th>编号</th>
+                                    <th>标签规则名称</th>
+                                    <th>修改时间</th>
+                                    <th>启用状态</th>
+                                    <th>操作</th>
+                                    <th>功能</th>
+                                </tr>
+                                </thead>
+                            </table>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -371,6 +421,8 @@
     var tagruleArr = []
     var tagruleArr2 = []
     var tagruleArr3 = []
+    var tagruleArr4 = []
+    var tagruleArr5 = []
     var ruleArr = []
 
     var selectIndex = [];               //选中的编号
@@ -383,6 +435,8 @@
             tagruleArr = {{.T.tagrule}}
             tagruleArr2 = {{.T.tagrule2}}
             tagruleArr3 = {{.T.tagrule3}}
+            tagruleArr4 = {{.T.tagrule4}}
+            tagruleArr5 = {{.T.tagrule5}}
             $('#pushSwitch').bootstrapSwitch({
                 onText: "开启",
                 offText: "关闭",
@@ -668,6 +722,120 @@
                 },
             ],
         });
+        $('#tagrule4').DataTable({
+            "paging": false,
+            "lengthChange": false,
+            "searching": false,
+            "ordering": false,
+            "info": true,
+            "autoWidth": false,
+            "language": {
+                "url": "/dist/js/dataTables.chinese.lang"
+            },
+            "fnDrawCallback": function () {
+                this.api().column(0).nodes().each(function (cell, i) {
+                    cell.innerHTML = i + 1;
+                });
+            },
+            "data": tagruleArr4,
+            "columns": [
+                {"data": null, width: "1%"},
+                {"data": "s_name", width: "10%"},
+                {
+                    "data": "i_updatetime", width: "9%", render: function (val) {
+                        var dt = new Date()
+                        dt.setTime(parseInt(val) * 1000);
+                        return dt.format("yyyy-MM-dd hh:mm:ss")
+                    }
+                },
+                {
+                    "data": "i_isuse", render: function (val, a, row) {
+                        tmp = ""
+                        if (val == 1) {
+                            tmp = "<a href='#' title='停用' onclick='setupTag(\"" + row._id + "\",false)'><i class='fa fa-fw fa-circle text-green'></i></a>已启用"
+                        } else {
+                            tmp = "<a href='#' title='启用' onclick='setupTag(\"" + row._id + "\",true)'><i class='fa fa-fw fa-circle text-red'></i></a>未启用"
+                        }
+                        return tmp
+                    }, width: "10%"
+                },
+                {
+                    "data": "_id", width: "11%", render: function (val, a, row, pos) {
+                        tmp = '<div>' +
+                            '<a class="btn btn-sm btn-primary" href="/service/euser/tag/edit?tag=4&id=' + val + '&cid=' + row.s_userid + '">编辑</a>&nbsp&nbsp' +
+                            '<a class="btn btn-sm btn-danger" onclick="delTag(\'' + val + '\')">删除</a>' +
+                            '</div>';
+                        return tmp
+                    }
+                },
+                {
+                    "data": "_id", width: "11%", render: function (val, a, row, pos) {
+                        var s = [val, row.s_userid,"4"]
+                        tmp = '<div>' +
+                            '<a class="btn btn-sm btn-primary" onclick="associated(\'' + s + '\',\'' + row.o_departruleids + '\')">关联数据范围</a>&nbsp&nbsp' +
+                            '</div>';
+                        return tmp
+                    }
+                },
+            ],
+        });
+        $('#tagrule5').DataTable({
+            "paging": false,
+            "lengthChange": false,
+            "searching": false,
+            "ordering": false,
+            "info": true,
+            "autoWidth": false,
+            "language": {
+                "url": "/dist/js/dataTables.chinese.lang"
+            },
+            "fnDrawCallback": function () {
+                this.api().column(0).nodes().each(function (cell, i) {
+                    cell.innerHTML = i + 1;
+                });
+            },
+            "data": tagruleArr5,
+            "columns": [
+                {"data": null, width: "1%"},
+                {"data": "s_name", width: "10%"},
+                {
+                    "data": "i_updatetime", width: "9%", render: function (val) {
+                        var dt = new Date()
+                        dt.setTime(parseInt(val) * 1000);
+                        return dt.format("yyyy-MM-dd hh:mm:ss")
+                    }
+                },
+                {
+                    "data": "i_isuse", render: function (val, a, row) {
+                        tmp = ""
+                        if (val == 1) {
+                            tmp = "<a href='#' title='停用' onclick='setupTag(\"" + row._id + "\",false)'><i class='fa fa-fw fa-circle text-green'></i></a>已启用"
+                        } else {
+                            tmp = "<a href='#' title='启用' onclick='setupTag(\"" + row._id + "\",true)'><i class='fa fa-fw fa-circle text-red'></i></a>未启用"
+                        }
+                        return tmp
+                    }, width: "10%"
+                },
+                {
+                    "data": "_id", width: "11%", render: function (val, a, row, pos) {
+                        tmp = '<div>' +
+                            '<a class="btn btn-sm btn-primary" href="/service/euser/tag/edit?tag=5&id=' + val + '&cid=' + row.s_userid + '">编辑</a>&nbsp&nbsp' +
+                            '<a class="btn btn-sm btn-danger" onclick="delTag(\'' + val + '\')">删除</a>' +
+                            '</div>';
+                        return tmp
+                    }
+                },
+                {
+                    "data": "_id", width: "11%", render: function (val, a, row, pos) {
+                        var s = [val, row.s_userid, "5"]
+                        tmp = '<div>' +
+                            '<a class="btn btn-sm btn-primary" onclick="associated(\'' + s + '\',\'' + row.o_departruleids + '\')">关联数据范围</a>&nbsp&nbsp' +
+                            '</div>';
+                        return tmp
+                    }
+                },
+            ],
+        });
 
         if (dataMap.s_phone !== undefined && dataMap.s_phone !== "") {
             $('#phone').attr("disabled","disabled");