maxiaoshan 5 năm trước cách đây
mục cha
commit
43d02a0565

+ 1 - 0
src/service/private_service.go

@@ -198,6 +198,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{

+ 8 - 8
src/service/rule_service.go

@@ -27,13 +27,13 @@ type Rule struct {
 	ruleSave   xweb.Mapper `xweb:"/service/rule/save"`   //保存规则
 	ruleImport xweb.Mapper `xweb:"/service/rule/import"` //导入文件excel
 	//history
-	archive 		xweb.Mapper `xweb:"/service/rule/archive"` 	//存档
-	history 		xweb.Mapper `xweb:"/service/rule/history"` 	//变更列表
+	archive xweb.Mapper `xweb:"/service/rule/archive"` //存档
+	history xweb.Mapper `xweb:"/service/rule/history"` //变更列表
 
-	productData		xweb.Mapper `xweb:"/service/rule/produce"`	//生成预览数据
-	downloadData	xweb.Mapper `xweb:"/service/rule/download"`	//下载数据
-	demoData 		xweb.Mapper `xweb:"/service/rule/preview"` 	//预览数据
-	exportEs 		xweb.Mapper `xweb:"/service/rule/exportes"` 	//导出es
+	productData  xweb.Mapper `xweb:"/service/rule/produce"`  //生成预览数据
+	downloadData xweb.Mapper `xweb:"/service/rule/download"` //下载数据
+	demoData     xweb.Mapper `xweb:"/service/rule/preview"`  //预览数据
+	exportEs     xweb.Mapper `xweb:"/service/rule/exportes"` //导出es
 
 }
 
@@ -368,9 +368,9 @@ func (r *Rule) DownloadData() {
 	if r.Method() == "POST" {
 		dataId := r.GetString("s_dataid")
 		qu.Debug(dataId)
-		if path := ResponseXlsx(dataId);path==""{
+		if path := ResponseXlsx(dataId); path == "" {
 			r.ServeJson("内部错误")
-		}else {
+		} else {
 			r.ServeFile(path)
 		}
 	}

+ 1 - 6
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%"}

+ 1 - 1
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