审核

src/jy/admin/audit/dataaudit.go

@@ -1,10 +1,14 @@
 package audit
 
 import (
+	"encoding/json"
 	. "jy/admin"
+	"jy/clear"
 	. "jy/mongodbutil"
+	"jy/util"
 	"log"
 	qu "qfw/util"
+	"qfw/util/elastic"
 	redis "qfw/util/redis"
 	"strings"
 	"time"
@@ -23,7 +27,8 @@ func init() {
 	Admin.POST("/audit/addsave", AddSave)     //新增
 	Admin.POST("/audit/auditsave", AuditSave) //保存
 	Admin.POST("/audit/alldel", AllDel)       //批量删除
-
+	Admin.POST("/audit/allaudit", AllAudit)   //批量审核
+	Admin.POST("/audit/datasave", DataSave)   //标准库数据审核
 }
 
 func AuditData(c *gin.Context) {
@@ -58,6 +63,7 @@ func AllDel(c *gin.Context) {
 	}
 	c.JSON(200, gin.H{"rep": true})
 }
+
 func AuditOneField(c *gin.Context) {
 	field, _ := c.GetPostForm("field")
 	coll, _ := c.GetPostForm("coll")
@@ -83,10 +89,216 @@ func AuditOneField(c *gin.Context) {
 	for k, d := range *data {
 		d["num"] = k + 1 + page*10
 		d["topscopeclass"] = strings.Join(qu.ObjArrToStringArr(d["topscopeclass"].([]interface{})), ",")
+		d["text"] = d[field]
 	}
 	c.JSON(200, gin.H{"data": data, "recordsFiltered": count, "recordsTotal": count})
 }
 
+func AllAudit(c *gin.Context) {
+	field, _ := c.GetPostForm("field")
+	coll, _ := c.GetPostForm("coll")
+	ids, _ := c.GetPostForm("ids")
+	idsArr := strings.Split(ids, ",")
+	log.Println("Audit Ids:", idsArr)
+	names, _ := c.GetPostForm("names")
+	namesArr := strings.Split(names, ",")
+	if len(idsArr) != len(namesArr) {
+		c.JSON(200, gin.H{"rep": false, "msg": "数据错误"})
+	} else { //批量审核
+		SaveDb := ""
+		FieldBd := 0
+		ElasticClientIndex := ""
+		ElasticClientType := ""
+		RedisName := util.QYK_RedisName
+		if field == "winner" {
+			SaveDb = util.ElasticClientDB
+			FieldBd = util.WinnerDB
+			ElasticClientIndex = util.ElasticClientIndex
+			ElasticClientType = util.ElasticClientType
+		} else if field == "buyer" {
+			SaveDb = util.ElasticClientBuyerDB
+			FieldBd = util.BuyerDB
+			ElasticClientIndex = util.ElasticClientBuyerIndex
+			ElasticClientType = util.ElasticClientBuyerType
+		} else {
+			SaveDb = util.ElasticClientAgencyDB
+			FieldBd = util.AgencyDB
+			ElasticClientIndex = util.ElasticClientAgencyIndex
+			ElasticClientType = util.ElasticClientAgencyType
+		}
+		//redis
+		qykredis := redis.RedisPool[RedisName].Get()
+		defer qykredis.Close()
+		//es
+		escon := elastic.GetEsConn()
+		defer elastic.DestoryEsConn(escon)
+		for i, name := range namesArr {
+			e := make(map[string]interface{})
+			e["comeintime"] = time.Now().Unix()
+			if field == "winner" {
+				e["company_name"] = name
+			} else if field == "buyer" {
+				e["buyer_name"] = name
+			} else {
+				e["agency_name"] = name
+			}
+			sid := Mgo.Save(SaveDb, e)
+			if sid == "" {
+				c.JSON(200, gin.H{"rep": false, "msg": "保存mongo出错"})
+				return
+			} else {
+				if _, err := qykredis.Do("SELECT", FieldBd); err != nil {
+					c.JSON(200, gin.H{"rep": false, "msg": "select redis出错"})
+					return
+				} else {
+					if _, saveRedisErr := qykredis.Do("SET", name, sid); saveRedisErr != nil {
+						c.JSON(200, gin.H{"rep": false, "msg": "保存redis出错"})
+						return
+					}
+				}
+				_, err := escon.Index().Index(ElasticClientIndex).Type(ElasticClientType).Id(sid).BodyJson(e).Refresh(true).Do()
+				if err != nil {
+					c.JSON(200, gin.H{"rep": false, "msg": "更新es错误"})
+					return
+				}
+			}
+			//删除标记数据
+			coll, _ := c.GetPostForm("coll")
+			query := map[string]interface{}{
+				"_id": qu.StringTOBsonId(idsArr[i]),
+			}
+			b := Mgo.Del(coll, query)
+			if !b {
+				log.Println("Del Audit Data Error 	coll:", coll, "	field:", field, "	id:", idsArr[i])
+			}
+		}
+	}
+}
+func DataSave(c *gin.Context) {
+	SaveDb := ""
+	FieldBd := 0
+	ElasticClientIndex := ""
+	ElasticClientType := ""
+	RedisName := util.QYK_RedisName
+	//企业名称
+	e := make(map[string]interface{})
+	field, _ := c.GetPostForm("field")
+	name, _ := c.GetPostForm("name")
+	address, _ := c.GetPostForm("address")
+	if field == "winner" {
+		SaveDb = util.ElasticClientDB
+		FieldBd = util.WinnerDB
+		ElasticClientIndex = util.ElasticClientIndex
+		ElasticClientType = util.ElasticClientType
+		capital, _ := c.GetPostForm("capital")
+		capitalfloat := clear.ObjToMoney([]interface{}{capital, ""})[0]
+		business_scope, _ := c.GetPostForm("business_scope")
+		e["capital"] = capitalfloat
+		e["business_scope"] = business_scope
+		e["company_name"] = name
+		e["company_address"] = address
+	} else if field == "buyer" {
+		SaveDb = util.ElasticClientBuyerDB
+		FieldBd = util.BuyerDB
+		ElasticClientIndex = util.ElasticClientBuyerIndex
+		ElasticClientType = util.ElasticClientBuyerType
+		buyerclass, _ := c.GetPostForm("buyerclass")
+		ranks, _ := c.GetPostForm("ranks")
+		buyer_type, _ := c.GetPostForm("type")
+		e["buyerclass"] = buyerclass
+		e["ranks"] = ranks
+		e["type"] = buyer_type
+		e["buyer_name"] = name
+		e["address"] = address
+	} else {
+		SaveDb = util.ElasticClientAgencyDB
+		FieldBd = util.AgencyDB
+		ElasticClientIndex = util.ElasticClientAgencyIndex
+		ElasticClientType = util.ElasticClientAgencyType
+		ranks, _ := c.GetPostForm("ranks")
+		agency_type, _ := c.GetPostForm("type")
+		e["ranks"] = ranks
+		e["type"] = agency_type
+		e["agency_name"] = name
+		e["address"] = address
+	}
+	//历史名称
+	history_name, _ := c.GetPostForm("history_name")
+	history_name = strings.ReplaceAll(history_name, "；", ";")
+	e["history_name"] = history_name
+	//城市信息
+	area_code, _ := c.GetPostForm("area_code")
+	province, _ := c.GetPostForm("province")
+	city, _ := c.GetPostForm("city")
+	district, _ := c.GetPostForm("district")
+	e["area_code"] = area_code
+	e["province"] = province
+	e["city"] = city
+	e["district"] = district
+	//公众号
+	wechat_accounts, _ := c.GetPostForm("wechat_accounts")
+	wechat_accounts = strings.ReplaceAll(wechat_accounts, "；", ";")
+	if len(wechat_accounts) > 0 {
+		e["wechat_accounts"] = strings.Split(wechat_accounts, ";")
+	} else {
+		e["wechat_accounts"] = []string{}
+	}
+	//网址
+	website, _ := c.GetPostForm("website")
+	e["website"] = website
+	//联系人
+	contact, _ := c.GetPostForm("contact")
+	contacts := make([]map[string]interface{}, 0)
+	jsonerr := json.Unmarshal([]byte(contact), &contacts)
+	if jsonerr != nil {
+		e["contact"] = []map[string]interface{}{}
+	} else {
+		for k, v := range contacts {
+			if v["updatetime"] == nil {
+				contacts[k]["updatetime"] = time.Now().Unix()
+			}
+		}
+		e["contact"] = contacts
+	}
+	//入库时间
+	e["comeintime"] = time.Now().Unix()
+	//新数据保存
+	sid := Mgo.Save(SaveDb, e)
+	if sid == "" {
+		c.JSON(200, gin.H{"rep": false, "msg": "保存mongo出错"})
+		return
+	} else {
+		qykredis := redis.RedisPool[RedisName].Get()
+		defer qykredis.Close()
+		if _, err := qykredis.Do("SELECT", FieldBd); err != nil {
+			c.JSON(200, gin.H{"rep": false, "msg": "select redis出错"})
+			return
+		} else {
+			if _, saveRedisErr := qykredis.Do("SET", name, sid); saveRedisErr != nil {
+				c.JSON(200, gin.H{"rep": false, "msg": "保存redis出错"})
+				return
+			}
+		}
+		escon := elastic.GetEsConn()
+		defer elastic.DestoryEsConn(escon)
+		_, err := escon.Index().Index(ElasticClientIndex).Type(ElasticClientType).Id(sid).BodyJson(e).Refresh(true).Do()
+		if err != nil {
+			c.JSON(200, gin.H{"rep": false, "msg": "更新es错误"})
+			return
+		}
+	}
+	//删除标记数据
+	coll, _ := c.GetPostForm("coll")
+	_id, _ := c.GetPostForm("_id")
+	query := map[string]interface{}{
+		"_id": qu.StringTOBsonId(_id),
+	}
+	b := Mgo.Del(coll, query)
+	if !b {
+		log.Println("Del Audit Data Error 	coll:", coll, "	field:", field, "	id:", _id)
+	}
+	c.JSON(200, gin.H{"rep": true, "msg": "保存成功"})
+}
 func BuyerClass(c *gin.Context) {
 	data, _ := Mgo.Find("classify", `{"i_type":1}`, `{"_id":-1}`, `{"s_name":1,"child":1}`, false, -1, -1)
 	c.JSON(200, gin.H{"data": data})

src/jy/admin/audit/rulemanager.go

@@ -173,24 +173,17 @@ func GetOrder(sel string) int {
 
 func GetRule(c *gin.Context) {
 	fid, _ := c.GetPostForm("fid")
-	rule_type, _ := c.GetPostForm("rule_type")
-	start := c.GetInt("start")
-	limit := c.GetInt("length")
 	query := map[string]interface{}{
 		"s_fid":  fid,
 		"delete": false,
 	}
-	if rule_type != "-1" {
-		query["s_type"] = rule_type
-	}
-
-	data, _ := Mgo.Find("rc_rule", query, `{"_id":1}`, nil, false, start, limit)
-	count := Mgo.Count("rc_rule", query)
+	data, _ := Mgo.Find("rc_rule", query, `{"_id":1}`, nil, false, -1, -1)
+	//count := Mgo.Count("rc_rule", query)
 	for _, d := range *data {
 		timeStr := time.Unix(d["l_createtime"].(int64), 0).Format(Date_Short_Layout)
 		d["l_createtime"] = timeStr
 	}
-	c.JSON(200, gin.H{"data": data, "recordsFiltered": count, "recordsTotal": count})
+	c.JSON(200, gin.H{"data": data})
 }
 
 func SaveRule(c *gin.Context) {

src/web/templates/admin/agencyinfo.html

@@ -3,9 +3,6 @@
 {{template "header"}}
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
-<link href="/res/other/css/other.css" rel="stylesheet" type="text/css">
-<link href="/res/jsoneditor/css/jsoneditor.css" rel="stylesheet" type="text/css">
-<script src="/res/jsoneditor/js/jsoneditor.js"></script>
 <style>
     #dataTable_filter div {
         padding: 0px 10px;
@@ -178,7 +175,7 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">代理机构地址地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">代理机构地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +

src/web/templates/admin/audit_auditone.html

@@ -46,7 +46,23 @@
 	</div>
   </section>
 </div>
-
+<div class="modal fade" id="info_data">
+    <div class="modal-dialog">
+        <form id="update-dataform" class="form-horizontal" role="form">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title" id="info_title"></h4>
+                </div>
+                <div class="modal-body" id="infos">
+                </div>
+            </div>
+            <!-- /.modal-content -->
+        </form>
+    </div>
+    <!-- /.modal-dialog -->
+</div>
 <!--新增标签--> 
 <!--<div class="modal fade" id="modal-info-auditdata">
   	<div class="modal-dialog">
@@ -87,7 +103,8 @@
 {{template "footer"}}
 <script>
 menuActive("audit/recogfield")
-var field = {{.name}}
+var field = {{.name}};
+var id = "";
 $(function () {
 	ttable=$('#dataauditTable').DataTable({
 		"paging"      : true,
@@ -107,7 +124,7 @@ $(function () {
        	},
 		"columns": [
 			{ "data": "_id",width:"1%",render:function(val,a,row){
-				return "<input type='checkbox' value='"+val+"'/>"
+				return "<input type='checkbox' value='"+val+"' name='"+row.text+"'/>"
 			}},
 			{ "data": "_id",width:"5%",render:function(val,a,row){
 				return row.num
@@ -115,7 +132,7 @@ $(function () {
 			{ "data": {{.name}}},
 			{ "data": "topscopeclass"},
 			{ "data": "_id",render:function(val,a,row){
-				return '<a class="btn btn-sm btn-success" href="#" onclick="allAudit(\''+{{.name}}+'\',\''+{{.coll}}+'\',\''+val+'\')">审核</a>'+
+				return '<a class="btn btn-sm btn-success" href="#" onclick="audit(\''+row.text+'\',\''+val+'\')">审核</a>'+
 					'&nbsp;&nbsp;<a class="btn btn-sm btn-danger" onclick="allDel(\''+{{.coll}}+'\',\''+val+'\',\'one\')">删除</a>'
 			}}
        	],
@@ -173,11 +190,19 @@ function allDel(coll,_id,type){
 		})
 	});
 }
+
+function audit(text,_id){//单条信息审核
+  showConfirm("确定审核通过？", function() {
+    id = _id;
+  	AddQYKHTML(text)
+  })
+	
+}
 //审核确认
 function auditsave(parentclass,childclass){
 	var val = $("#auditname").val();
 	$("#modal-info-auditdata").modal("hide");
-	showConfirm("确定通过？", function() {
+	showConfirm("确定通过?", function() {
 		$.ajax({
 			url:"/admin/audit/auditsave",
 			type:"post",
@@ -202,5 +227,165 @@ function selectrow(me){
 		}
 	}
 
+var vastrjson = [{
+    "infoid": "招标信息id",
+    "contact_person": "联系人",
+    "contact_type": "联系人类型",
+    "phone": "联系人电话",
+    "topscopeclass": "项目类型"
+}];
+/*新增企业库html*/
+function AddQYKHTML(text) {
+  $("#infos").html("");
+  $("#info_title").html("新增企业库信息");
+  var base1Html = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\" style=\"color: red;\">名称：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"name\" must=\"true\" value='" + text + "'></div></div>"
+  
+  var winner1Html = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">别名：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"alias\" ></div></div>"
+      
+  var base2Html = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">历史名称：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"history_name\" placeholder=\"多个;隔开\" ></div></div>" +
+    "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划代码：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"area_code\" ></div></div>" +
+    "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">省份：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"province\"></div></div>" +
+    "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">城市：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"city\" ></div></div>" +
+    "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">区县：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"district\"></div></div>" 
+
+	var winner2Html = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">注册资本：</label>" +
+		"<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"capital\"  placeholder=\"示例：45678.98元；456.78万元；1234.25；\"></div></div>" +
+		"<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">经营范围：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"business_scope\"></div></div>" 
+   
+	var buyerHtml = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">采购单位类型：</label>" +
+        "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"buyerclass\"></div></div>" 
+
+ 	var agencyHtml = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政级别：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"ranks\"></div></div>"+
+		"<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">单位类型：</label>" +
+    "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"type\"></div></div>" 
+               
+  var base3Html = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">地址：</label>" +
+  "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"address\"></div></div>" +
+  "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">微信公众号：</label>" +
+  "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +
+  "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">网址：</label>" +
+  "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"website\"></div></div>" +
+  "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">联系方式：</label>" +
+  "<div class=\"col-sm-9\" id='contact' style=\"height:250px\"></div>" +
+  "<div class=\"row form-group\">" +
+  "<button type='button' class='btn btn-sm btn-default col-md-offset-5 col-md-2'  data-dismiss='modal' aria-label='Close'>取消</button>" +
+  "<button type='button' class='btn btn-sm btn-danger col-md-2' onclick='Add()'>新增企业库</button></div>";
+  
+  var com = "";
+	{{if eq .name "winner"}}
+		com = base1Html+winner1Html+base2Html+winner2Html+base3Html;
+	{{else if eq .name "agency"}} 
+		com = base1Html+base2Html+agencyHtml+base3Html;
+	{{else if eq .name "buyer"}}
+		com = base1Html+base2Html+agencyHtml+buyerHtml+base3Html;
+	{{end}}
+	$("#infos").html(com);
+    $("#contact").html('');
+    var container = document.getElementById('contact');
+   	showJson("add", vastrjson, container);
+    $("#info_data").modal("show");
+}
+
+function showJson(ptype, content, container) {
+    var options = {
+        mode: 'code',
+        modes: ['code', 'tree'], // allowed modes
+        onError: function (err) {
+            alert(err.toString());
+        }
+    };
+    if (ptype == "add") {
+        editor_add = new JSONEditor(container, options, content);
+    } else if (ptype == "update") {
+        editor_update = new JSONEditor(container, options, content);
+    }
+}
+
+/*保存企业库*/
+function Add() {
+    var contact = editor_add.getText();//联系人
+	  if (typeof contact == 'string') {
+        try {
+            var obj=JSON.parse(contact);
+            if(typeof obj == 'object' && obj ){
+                // alert("格式正确");
+            }else{
+                alert("联系人的表单json格式不正确");
+                return
+            }
+        } catch(e) {
+            alert("联系人的表单json格式不正确");
+            return
+        }
+    }
+    if (contact === JSON.stringify(vastrjson, null, 2)) {
+        alert("联系人的表单未填写！");
+        return
+    }
+    //新增企业库api
+	var obj={}
+	var bcon=true
+	$("#infos").find("input[id!=s_show],textarea").each(function(i,el){
+		var val=$(el).val();
+		if(el.id!="_id"&&$(el).attr("must")&&!val){
+			bcon=false
+			return false
+		}
+		if(el.id!= ""){
+			obj[el.id]=$(el).val()
+		}
+	})
+	obj["contact"]= contact;
+	obj["coll"] = {{.coll}};
+	obj["_id"] = id;
+  obj["field"] = {{.name}};
+	console.log(obj)
+	$.post("/admin/audit/datasave",obj,function(data){
+		if(data&&data.rep){
+			alert("成功")
+			//window.location.href="/admin/task"								
+		}else{
+			showTip(data.msg,1000)
+		}
+	},'json')
+    
+}
+
+//批量审核
+function allAudit(){
+  var ids=[];
+  var names=[];
+	$("#dataauditTable td input[type=checkbox]").each(function(){
+		if($(this).prop("checked")){
+			ids.push($(this).val());
+      names.push($(this).attr("name"));
+		}
+	});
+
+	showConfirm("确定审核通过?", function() {
+		$.ajax({
+			url:"/admin/audit/allaudit",
+			type:"post",
+			data:{"ids":ids.join(","),"names":names.join(","),"coll":{{.coll}},"field":{{.name}}},
+			success:function(r){
+				if(r.rep){	
+					ttable.ajax.reload();			
+					//window.location.href="/admin/rulemanager/getrulelist?id="+fid+"&fname="+fname;
+				}else{
+					showTip(r.msg, 1000, function() {});
+				}
+			}
+		})
+	});
+}
 
-</script>
+</script>

src/web/templates/admin/audit_recogfield.html

@@ -24,7 +24,6 @@
 		              <tr>
 	                		<th>名称</th>
 							<th>审核字段</th>
-							<th>审核类型</th>
 							<th>时间</th>
 							<th>创建人</th>
 							<th>操作</th>
@@ -63,13 +62,6 @@ $(function () {
 		"columns": [
             { "data": "s_name"},
 			{ "data": "s_recogfield"},
-			{ "data": "s_auditattr",render:function(val,a,row){
-				if(val=="err"){
-					return "错误";
-				}else{
-					return "正确";
-				}
-			}},
 			{ "data": "l_createtime"},
 			{ "data": "s_user"},
 			{ "data": "_id","width":"30%",render:function(val,a,row){
@@ -95,7 +87,7 @@ $(function () {
 					//{label:"信息库",s_label:"s_lib",must:true},
 					{label:"信息表",s_label:"s_coll",must:true},
 					//{label:"异常标记",s_label:"s_tagattr",must:true},
-					{label:"审核标记",s_label:"s_auditattr",type:"tpl_list_local",must:true,list:[{"s_name":"正确","_id":"ok"},{"s_name":"异常","_id":"err"}],default:"ok"},
+					//{label:"审核标记",s_label:"s_auditattr",type:"tpl_list_local",must:true,list:[{"s_name":"正确","_id":"ok"},{"s_name":"异常","_id":"err"}],default:"ok"},
 					{s_label:"_id",type:"tpl_hidden"},
 				]
 				if(n == "new"){

src/web/templates/admin/audit_rulelist.html

@@ -27,7 +27,6 @@
 						<th>时间</th>
 						<th>创建人</th>
 						<th>描述</th>
-						<th>类型</th>
 						<th>是否启用</th>
 						<th>操作</th>
 		              </tr>
@@ -56,7 +55,7 @@ $(function () {
 		"ordering"    : false,
 		"info"        : true,
 		"autoWidth"   : true,
-		"serverSide": true,
+		"serverSide": false,
 		"ajax": {
 			"url": "/admin/rulemanager/getrule",
 			"type": "post",
@@ -70,13 +69,6 @@ $(function () {
 			{ "data": "l_createtime"},
 			{ "data": "s_username"},
 			{ "data": "s_descript"},
-			{ "data": "s_type",render:function(val){
-				if(val=="ok"){
-					return "正确";
-				}else if(val == "err"){
-					return "异常";
-				}
-			}},
 			{ "data": "isuse",render:function(val,a,row){
 				tmp=""
 				if(val){
@@ -104,15 +96,7 @@ $(function () {
 					'&nbsp;&nbsp;<a class="btn btn-sm btn-danger" onclick="del(\''+val+'\')">删除</a>'
 					
 			}}
-       	],
-		"fnServerParams": function (e) {  
-			var rule_type=$("#rule_type").val();
-			if(rule_type){
-				e.rule_type=rule_type;
-			}else{
-				e.rule_type="-1";
-			}
-      	}
+       	]
 	});
 	ttablerulemanager.on('init.dt', function () {
 		$("#showbtn").on('click','a.opr',function(){
@@ -156,7 +140,6 @@ $(function () {
 					{label:"名称",s_label:"s_name",must:true},
 					{label:"描述",s_label:"s_descript"},
 					{label:"启用",s_label:"isuse",type:"tpl_list_local",list:[{"s_name":"是","_id":true},{"s_name":"否","_id":false}],default:true},
-					{label:"类型",s_label:"s_type",type:"tpl_list_local",must:true,list:[{"s_name":"正确","_id":"ok"},{"s_name":"异常","_id":"err"}],default:"ok"},
 					{label:"正则",s_label:"s_rule",type:"tpl_text",rows:2,must:true},
 					{s_label:"_id",type:"tpl_hidden"},
 					{s_label:"s_fid",type:"tpl_hidden",val:fid},
@@ -200,42 +183,9 @@ $(function () {
 			
 			OpenDialog(htmlObj,obj)
 			break;
-			//上移下移
-			/*case "moveup":
-			case "movedown":
-				if($(this).attr("disabled")=="disabled"){
-					return
-				}
-				var poststr=""
-				if(n == "moveup"){//上移
-					var uobj = {{.data.rule}}[rownum-1];//上一行数据
-					poststr=tobj["_id"]+","+tobj["i_order"]+","+uobj["_id"]+","+uobj["i_order"]
-				}else{//下移
-					var uobj={{.data.rule}}[rownum+1];//下一行数据
-					poststr=uobj["_id"]+","+uobj["i_order"]+","+tobj["_id"]+","+tobj["i_order"]
-				}
-				$.post("/admin/rulemanager/shift",{str:poststr},function(data){
-					if(data&&data.rep){
-						window.location.href="/admin/rulemanager/getrulelist?id="+fid+"&fname="+fname;						
-					}else{
-						showTip("移动失败", 1000, function() {});
-					}
-				})
-				break;*/
 			}
 		});
-	
-		var opt="<option value='-1'>全部</option>"+
-				"<option value='0'>正确</option>"+
-				"<option value='1'>异常</option>";
-		var select="<div class='form-group'><label for='name'>正则类型：</label>"+
-			"<select id='rule_type' onchange='checkclick(this.value)' class='form-control input-sm'>"+
-			opt+
-			"</select></div>"
-		$("#rulemanagerTable_filter").prepend("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-		$("#rulemanagerTable_filter").prepend(select);
 	})
-	
 })
 
 function checkclick(){

src/web/templates/admin/buyerinfo.html

@@ -3,9 +3,6 @@
 {{template "header"}}
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
-<link href="/res/other/css/other.css" rel="stylesheet" type="text/css">
-<link href="/res/jsoneditor/css/jsoneditor.css" rel="stylesheet" type="text/css">
-<script src="/res/jsoneditor/js/jsoneditor.js"></script>
 <style>
     #dataTable_filter div {
         padding: 0px 10px;

src/web/templates/admin/com_inc.html

@@ -14,6 +14,8 @@
   	<link rel="stylesheet" href="/res/bower_components/select2/dist/css/select2.min.css">
 	<link rel="stylesheet" href="/res/dist/css/AdminLTE.min.css">
 	<link rel="stylesheet" href="/res/dist/css/skins/skin-blue.min.css">
+	<link rel="stylesheet" href="/res/other/css/other.css" type="text/css">
+	<link rel="stylesheet" href="/res/jsoneditor/css/jsoneditor.css" type="text/css">
 
 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -33,6 +35,7 @@
 	<script src="/res/dist/js/adminlte.min.js"></script>
 	<script src="/res/js/model.js"></script>
 	<script src="/res/js/com.js"></script>
+	<script src="/res/jsoneditor/js/jsoneditor.js"></script>
 </head>
 <body class="hold-transition skin-blue sidebar-mini">
 <div class="wrapper">

src/web/templates/admin/qiyekuinfo.html

@@ -3,9 +3,6 @@
 {{template "header"}}
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
-<link href="/res/other/css/other.css" rel="stylesheet" type="text/css">
-<link href="/res/jsoneditor/css/jsoneditor.css" rel="stylesheet" type="text/css">
-<script src="/res/jsoneditor/js/jsoneditor.js"></script>
 <style>
     #dataTable_filter div {
         padding: 0px 10px;