Merge branch 'master' of http://192.168.3.207:10080/qmx/datatag

src/service/private_service.go

@@ -197,6 +197,7 @@ func (f *Private) Keydataoption(world string) {
 					savetmp["s_title"] = qu.ObjToString(v["title"])
 					savetmp["s_buyerclass"] = qu.ObjToString(v["s_buyerclass"])
 					savetmp["s_subtype"] = qu.ObjToString(v["s_subtype"])
+					savetmp["s_purchasing"] = qu.ObjToString(v["s_purchasing"])
 					util.Mgo.Save("feedback_info", savetmp)
 				}
 				f.ServeJson(map[string]string{

src/service/rule_service.go

@@ -345,11 +345,12 @@ func (r *Rule) ProductData() {
 }
 func (r *Rule) DownloadData() {
 	defer qu.Catch()
-
-	dataId := r.GetString("s_dataid")
-	if path := ResponseXlsx(dataId); path == "" {
-		r.ServeJson("内部错误")
-	} else {
-		r.ServeFile(path)
+	if r.Method() == "POST" {
+		dataId := r.GetString("s_dataid")
+		if path := ResponseXlsx(dataId); path == "" {
+			r.ServeJson("内部错误")
+		} else {
+			r.ServeFile(path)
+		}
 	}
-}
+}

src/web/templates/private/feedback_detail.html

@@ -92,12 +92,7 @@ $(function () {
       { "data": "s_matchkey"},
 			{ "data": "s_projectname",width:"10%"},
 			{ "data": "s_title"},
-      { "data": "s_subtype", render: function (val) {
-        if(val==undefined){
-          return "";
-        }
-        return val
-      }},
+      { "data": "s_subtype"},
 			{ "data": "s_buyerclass"},
 			{ "data": "s_purchasing"},
       { "data": "s_jyhref",width:"2%"}

src/web/templates/private/feedback_list.html

@@ -71,7 +71,7 @@ $(function () {
 			}},
 			{ "data":"_id","width":"25%",render:function(val,a,row,pos){
 				tmp = '<div>'+
-					'<a class="btn btn-sm btn-primary" href="/service/rule/edit?dataid='+row.s_dataid+'">编辑规则</a>　'+
+					'<a class="btn btn-sm btn-primary" href="/service/rule/edit?dataid='+encodeURI(row.s_dataid)+'">编辑规则</a>　'+
 					'<a class="btn btn-sm btn-success" href="/service/feedback/detail?_id='+val+'">查看</a>　'+
 					'</div>';
 				return  tmp