xg

src/service/feedback_service.go

@@ -56,17 +56,22 @@ func (f *Feedback) FeedbackDetail() {
 		draw, _ := f.GetInteger("draw")
 		searchStr := f.GetString("search[value]")
 		search := strings.TrimSpace(searchStr)
-		//qu.Debug(start, limit, draw, search)
-		query := bson.M{}
-		if search != "" {
-			query["$or"] = []interface{}{
-				bson.M{"s_customername": bson.M{"$regex": search}},
-				bson.M{"s_tagname": bson.M{"$regex": search}},
+		matchkey := f.GetString("matchkey")
+		id := f.GetString("id")
+		query := bson.M{
+			"s_pid": id,
+		}
+		if matchkey != "-1" {
+			query["s_matchkey"] = bson.M{
+				"$regex": matchkey,
+			}
+		} else if search != "" {
+			query["s_matchkey"] = bson.M{
+				"$regex": search,
 			}
 		}
-
-		data, _ := Mgo.Find("feedback", query, nil, nil, false, start, limit)
-		count := Mgo.Count("feedback", query)
+		data, _ := Mgo.Find("feedback_info", query, nil, nil, false, start, limit)
+		count := Mgo.Count("feedback_info", query)
 		f.ServeJson(map[string]interface{}{
 			"draw":            draw,
 			"data":            data,
@@ -74,6 +79,13 @@ func (f *Feedback) FeedbackDetail() {
 			"recordsTotal":    count,
 		})
 	} else {
-		f.Render("private/feedback_detail.html")
+		id := f.GetString("_id")
+		query := bson.M{
+			"_id": qu.StringTOBsonId(id),
+		}
+		data, _ := Mgo.FindOne("feedback", query)
+		f.T["id"] = id
+		f.T["data"] = data
+		f.Render("private/feedback_detail.html", &f.T)
 	}
 }

src/service/rule_service.go

@@ -17,10 +17,10 @@ type Rule struct {
 
 	//rule
 	ruleList   xweb.Mapper `xweb:"/service/rule/list"`   //规则列表
-	ruleCreate xweb.Mapper `xweb:"/service/rule/create"` //规则新建
-	ruleDel    xweb.Mapper `xweb:"/service/rule/del"`    //规则删除
-	ruleEdit   xweb.Mapper `xweb:"/service/rule/edit"`   //规则删除
-	ruleSave   xweb.Mapper `xweb:"/service/rule/save"`   //规则删除
+	ruleCreate xweb.Mapper `xweb:"/service/rule/create"` //新建规则
+	ruleDel    xweb.Mapper `xweb:"/service/rule/del"`    //删除规则
+	ruleEdit   xweb.Mapper `xweb:"/service/rule/edit"`   //编辑规则
+	ruleSave   xweb.Mapper `xweb:"/service/rule/save"`   //保存规则
 	ruleImport xweb.Mapper `xweb:"/service/rule/import"` //导入文件excel
 }
 
@@ -118,8 +118,15 @@ func (r *Rule) RuleImport() {
 
 func (r *Rule) RuleEdit() {
 	defer qu.Catch()
-	id := r.GetString("id")
-	data, _ := Mgo.FindById("tags", id, `{}`)
+	id := r.GetString("id")         //规则列表编辑
+	dataid := r.GetString("dataid") //反馈列表编辑
+	query := bson.M{}
+	if id != "" {
+		query["_id"] = qu.StringTOBsonId(id)
+	} else if dataid != "" {
+		query["s_dataid"] = dataid
+	}
+	data, _ := Mgo.FindOneByField("tags", query, `{}`)
 	r.T["data"] = *data
 	r.Render("private/rule_edit.html", &r.T)
 }
@@ -128,7 +135,8 @@ func (r *Rule) RuleSave() {
 	defer qu.Catch()
 	if r.Method() == "POST" {
 		data := GetPostForm(r.Request)
-		qu.Debug(data)
+		id := r.GetString("id")
+		qu.Debug(id, data)
 	}
 }
 

src/web/templates/private/feedback_detail.html

@@ -7,12 +7,11 @@
 <div class="content-wrapper">
 	<section class="content-header">
 		<h1>
-			<small><a class="btn btn-primary opr" opr="new">编辑规则</a></small>
+			<small><a class="btn btn-primary" href="/service/rule/edit?dataid={{.T.data.s_dataid}}">编辑规则</a></small>
 		</h1>
 		<ol class="breadcrumb">
-		 <li><a href="#"><!--<i class="fa fa-dashboard"></i>--> 首页</a></li>
-      <li class="active"><a href="#">规则管理</a></li>
-      <li><a href="/service/feedback/list"><i class="active"></i> 反馈列表</a></li>
+		 <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
+      <li><a href="/service/feedback/detail?_id={{.T.id}}"><i class="active"></i> 反馈列表</a></li>
 		</ol>
     </section>
   <!-- Main content -->
@@ -25,11 +24,11 @@
               <div class="form-group">
                 <label class="col-sm-1 control-label">客户名称</label>
                 <div class="col-sm-3">
-                  <input type="text" class="form-control" id="username">
+                  <input type="text" class="form-control" id="username" value={{.T.data.s_customername}}>
                 </div>
                 <label class="col-sm-1 control-label">规则名称</label>
                 <div class="col-sm-3">
-                  <input type="text" class="form-control" id="feedbackrule">
+                  <input type="text" class="form-control" id="feedbackrule" value={{.T.data.s_tagname}}>
                 </div>
                 <label class="col-sm-1 control-label">反馈日期</label>
                 <div class="col-sm-3">
@@ -39,11 +38,11 @@
             <div class="form-group">
               <label class="col-sm-1 control-label">反馈数量</label>
               <div class="col-sm-3">
-                <input type="text" class="form-control" id="feedbacknum">
+                <input type="text" class="form-control" id="feedbacknum" value={{.T.data.i_num}}>
               </div>
               <label class="col-sm-1 control-label">反馈意见</label>
               <div class="col-sm-7">
-                <textarea type="text" style="height:34px" class="form-control" id="feedbackview"></textarea>
+                <textarea type="text" style="height:34px" class="form-control" id="feedbackview">{{.T.data.s_opinion}}</textarea>
               </div>
             </div>
           </form>
@@ -81,27 +80,21 @@ $(function () {
 		"autoWidth"   : false,
     "serverSide"  : true,
 		"ajax": {
-			"url": "/service/feedback/list",
+			"url": "/service/feedback/detail",
 			"type": "post",
-			"data":{}
+			"data":{"id":{{.T.id}}}
 		 },
 		"language": {
             "url": "/dist/js/dataTables.chinese.lang"
         },
 		"columns": [
-      { "data": "s_username"},
-			{ "data": "s_tagname"},
-			{ "data": "s_feedback"},
-      { "data": "s_feedbnum",render:function(val){
-			  return "";
-			}},
-			{ "data": "l_feedbacktime",render:function(val){
-				var dt=new Date()
-				dt.setTime(parseInt(val)*1000)
-				return dt.format("yyyy-MM-dd hh:mm:ss")
-			}},
-			{ "data": "s_feedback"},
-      { "data": "s_feedback"}
+      { "data": "s_matchkey"},
+			{ "data": "s_projectname"},
+			{ "data": "s_title"},
+      { "data": "s_subtype"},
+			{ "data": "s_buyerclass"},
+			{ "data": "s_purchasing"},
+      { "data": "s_jyhref"}
     ],
     "fnDrawCallback": function(table) {
 		 	$("ul.pagination").prepend("&nbsp;&nbsp;&nbsp;转到第 <input type='text' id='changePage'   style='width:20px;'> 页    <a type='text' href='javascript:void(0);' id='dataTable-btn' style='text-align:center'>GO</a>");
@@ -114,21 +107,25 @@ $(function () {
 		  });    
 		},
     "fnServerParams": function (e) {  
-			//var matchkey=$("#matchkey").val()
-			//if(matchkey){
-			//	e.matchkey = matchkey;
-			//}else{
-			//	e.matchkey="-1";
-			//}
+			var matchkey=$("#matchkey").val()
+			if(matchkey){
+				e.matchkey = matchkey;
+			}else{
+				e.matchkey="-1";
+			}
     }
 	});
   ttable.on('init.dt', function () {
+    //反馈日期类型转换并赋值
+    var dt=new Date()
+		dt.setTime(parseInt({{.T.data.l_feedbacktime}})*1000)
+    $("#feedbacktime").val(dt.format("yyyy-MM-dd hh:mm:ss"))
+    //关键词筛选
 		var matchkey="<option value='-1'>全部</option>"
-		//var events={{.T.events}}
-		//for(k in events){
-		//	spiderEvent+="<option value='"+events[k]+"'>"+events[k]+"</option>"
-		//}
-    matchkey+="<option value='11'>11</option>"
+		var matchkeys={{.T.data.o_matchkey}}
+		for(k in matchkeys){
+			matchkey+="<option value='"+matchkeys[k]+"'>"+matchkeys[k]+"</option>"
+		}
 		var selectMatchkey="<div class='form-group'><label for='name'>关键词筛选：</label>"+
 			"<select id='matchkey' onchange='checkclick(this.value)' class='form-control input-sm'>"+
 			matchkey+

src/web/templates/private/feedback_list.html

@@ -62,12 +62,8 @@ $(function () {
 		"columns": [
       { "data": "s_customername"},
 			{ "data": "s_tagname"},
-			{ "data": "s_opinion",render:function(val){
-			  return "";
-			}},
-      { "data": "s_feedbnum",render:function(val){
-			  return "";
-			}},
+			{ "data": "s_opinion"},
+      { "data": "i_num"},
 			{ "data": "l_feedbacktime",render:function(val){
 				var dt=new Date()
 				dt.setTime(parseInt(val)*1000)
@@ -75,8 +71,8 @@ $(function () {
 			}},
 			{ "data":"_id","width":"25%",render:function(val,a,row,pos){
 				tmp = '<div>'+
-					//'<a class="btn btn-sm btn-primary opr" opr="edit" row="'+pos.row+'" onclick="look(\''+val+'\')">编辑规则</a>　'+
-					'<a class="btn btn-sm btn-success" href="/service/feedback/detail">查看</a>　'+
+					'<a class="btn btn-sm btn-primary" href="/service/rule/edit?dataid='+row.s_dataid+'">编辑规则</a>　'+
+					'<a class="btn btn-sm btn-success" href="/service/feedback/detail?_id='+val+'">查看</a>　'+
 					'</div>';
 				return  tmp
 			}}

src/web/templates/private/rule_create.html

@@ -625,7 +625,7 @@
       dataMap["s_customername"] = $('#cusName').val();
       dataMap["s_tagname"] = $('#tagName').val();
       dataMap["s_salesperson"] = $('#saleName').val();
-      if (dataMap["s_customername"] === "" && dataMap["s_tagname"] === "" && dataMap["s_salesperson"] === "") {
+      if (dataMap["s_customername"] == "" || dataMap["s_tagname"] === "" || dataMap["s_salesperson"] == "") {
           alert("请填写必须字段！") 
           return
       }