审核编辑

src/jy/admin/buyermanager/buyermanage.go

@@ -12,7 +12,7 @@ import (
 
 func init() {
 	//列表、编辑
-	Admin.GET("/buyermanager/list", func(c *gin.Context) {
+	Admin.GET("/audit/buyermanager", func(c *gin.Context) {
 		c.HTML(200, "buyermanager_list.html", nil)
 	})
 	Admin.POST("/buyer/data", BuyerData)        //加载数据
@@ -20,11 +20,6 @@ func init() {
 	Admin.POST("/buyer/delbuyer", DelBuyer)     //删除
 	Admin.POST("/buyer/auditbuyer", AuditBuyer) //审核
 	Admin.POST("/buyer/buyerclass", BuyerClass) //查询分类数据
-
-	//审核
-	//	Admin.GET("/buyermanager/audit", func(c *gin.Context) {
-	//		c.HTML(200, "buyermanager_audit.html", nil)
-	//	})
 }
 
 func BuyerData(c *gin.Context) {

src/jy/admin/winnermanager/winnermanager.go

@@ -12,17 +12,13 @@ import (
 
 func init() {
 	//列表、编辑
-	Admin.GET("/winnermanager/list", func(c *gin.Context) {
+	Admin.GET("/audit/winnermanager", func(c *gin.Context) {
 		c.HTML(200, "winnermanager_list.html", nil)
 	})
 	Admin.POST("/winner/data", WinnerData)         //加载数据
 	Admin.POST("/winner/addwinner", AddWinner)     //新增
 	Admin.POST("/winner/delwinner", DelWinner)     //删除
 	Admin.POST("/winner/auditwinner", AuditWinner) //审核
-	//审核
-	//	Admin.GET("/winnermanager/audit", func(c *gin.Context) {
-	//		c.HTML(200, "winnermanager_audit.html", nil)
-	//	})
 }
 
 func WinnerData(c *gin.Context) {

src/main_test.go

@@ -13,7 +13,7 @@ import (
 func Test_task(t *testing.T) {
 	Mgo = MgoFactory(1, 3, 120, "192.168.3.207:27082", "extract_v3")
 	//extract.StartExtractTaskId("5b8f804025e29a290415aee1")
-	extract.StartExtractTestTask("5be107e600746bf92debf080", "5a999f3140d2d9bbe820dbb1", "1", "zjk_v3", "zjk_v3")
+	extract.StartExtractTestTask("5be107e600746bf92debf080", "5a999f3140d2d9bbe820dbb1", "5", "mxs_v3", "mxs_v3")
 	time.Sleep(5 * time.Second)
 }
 

src/web/templates/admin/buyermanager_list.html

@@ -47,7 +47,7 @@
 		    <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">新增采购单位</h4>
+		        <h4 class="modal-title" id="buyertitleinfo"></h4>
 		    </div>
 		    <div class="modal-body">
 				<div class="form-group">
@@ -59,8 +59,8 @@
 				<div class="form-group">
 				    <label for="code" id="labelname" class="col-sm-2 control-label">类别:</label>
 				    <div class="col-sm-10" style="display:flex;">
-					   	<select class="form-control parentclass" id="parentclass" style="margin-right:15px;"></select>
-						<select class="form-control childclass" id="childclass"></select>
+					   	<select class="form-control" id="parentclass" style="margin-right:15px;"></select>
+						<select class="form-control" id="childclass"></select>
 					</div>
 				</div>
 		    </div>
@@ -75,44 +75,13 @@
   <!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-
-<!--类别标签--> 
-<div class="modal fade" id="modal-info-class">
-  	<div class="modal-dialog">
-	    <form id="category-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="titleinfo">添加类别</h4>
-		    </div>
-		    <div class="modal-body">
-				<div class="form-group">
-				    <label for="code" id="labelname" class="col-sm-2 control-label">类别:</label>
-				    <div class="col-sm-10" style="display:flex;">
-					   	<select class="form-control parentclass" style="margin-right:15px;"></select>
-						<select class="form-control childclass"></select>
-					</div>
-				</div>
-		    </div>
-		    <div class="modal-footer">
-		        <button type="button" class="btn btn-default" data-dismiss="modal" onclick="reset()">取消</button>
-		        <button type="button" class="btn btn-primary" onclick="savecategory()">确认</button>
-	    	</div>
-		</div>
-	    <!-- /.modal-content -->
-	    </form>
-  	</div>
-  <!-- /.modal-dialog -->
-</div>
-<!-- /.modal -->
-
 {{template "dialog"}}
 {{template "footer"}}
 <script>
-var s_name = "";
 var id = "";
 var classifymap = {};
+var bid = 1;
+menuActive("buyermanager")
 $(function () {
 	ttable=$('#datawinnerTable').DataTable({
 		"paging"      : true,
@@ -153,15 +122,18 @@ $(function () {
 
 function addbuyer(){
 	//查询分类数据
+	bid = 1;
+	$("#buyertitleinfo").html("新增采购单位");
 	getbuyerclass("modal-info-addbuyer");
 	$("#modal-info-addbuyer").modal("show");
+	$("#buyername").val("");
 }
-
-function getbuyerclass(id){
-	$("#"+id+" .parentclass").empty();
-	$("#"+id+" .childclass").empty();
-	$("#"+id+" .parentclass").append("<option value=''>--请选择--</option>");
-	$("#"+id+" .childclass").append("<option value=''>--请选择--</option>");
+//获取buyer分类
+function getbuyerclass(){
+	$("#parentclass").empty();
+	$("#childclass").empty();
+	$("#parentclass").append("<option value=''>--请选择--</option>");
+	$("#childclass").append("<option value=''>--请选择--</option>");
 	$.ajax({
 		url:"/admin/buyer/buyerclass",
 		type:"post",
@@ -170,20 +142,29 @@ function getbuyerclass(id){
 			for(var i in classify){
 				var name = classify[i]["s_name"];
 				classifymap[name] = classify[i]["child"];
-				$("#"+id+" .parentclass").append("<option value='"+name+"'>"+name+"</option>");
+				$("#parentclass").append("<option value='"+name+"'>"+name+"</option>");
 			}
 		}
 	})
 }
-//新增
+
 function saveaddbuyer(){
 	var buyername = $("#buyername").val();
-	var parentclass = $("#modal-info-addbuyer .parentclass").val();
-	var childclass = $("#modal-info-addbuyer .childclass").val();
+	var parentclass = $("#parentclass").val();
+	var childclass = $("#childclass").val();
 	if(parentclass == "" || childclass == "" || buyername == ""){
 		alert("表单填写不完整！");
 		return ;
 	}
+	if(bid == 1){//新增保存
+		add(buyername,parentclass,childclass);
+	}else{//审核保存确认
+		audit(parentclass,childclass);
+	}
+}
+
+//新增保存
+function add(buyername,parentclass,childclass){
 	$.ajax({
 		url:"/admin/buyer/addbuyer",
 		type:"post",
@@ -198,7 +179,6 @@ function saveaddbuyer(){
 		}
 	})
 }
-
 //删除
 function delbuyer(_id){
 	showConfirm("确定删除？", function() {
@@ -219,25 +199,22 @@ function delbuyer(_id){
 
 //审核
 function auditbuyer(name,_id){
-	getbuyerclass("modal-info-class");
-	s_name = name;
+	bid = 2;
+	getbuyerclass();
 	id = _id;
-	$("#modal-info-class").modal("show");
+	$("#buyername").val(name);
+	$("#buyertitleinfo").html("审核采购单位");
+	$("#modal-info-addbuyer").modal("show");
 }
-
-function savecategory(){
-	var parentclass = $("#modal-info-class .parentclass").val();
-	var childclass = $("#modal-info-class .childclass").val();
-	if(parentclass == "" || childclass == ""){
-		alert("表单填写不完整！");
-		return ;
-	}
-	$("#modal-info-class").modal("hide");
+//审核确认
+function audit(parentclass,childclass){
+	var name = $("#buyername").val();
+	$("#modal-info-addbuyer").modal("hide");
 	showConfirm("确定通过？", function() {
 		$.ajax({
 			url:"/admin/buyer/auditbuyer",
 			type:"post",
-			data:{"name":s_name,"parentclass":parentclass,"childclass":childclass,"id":id},
+			data:{"name":name,"parentclass":parentclass,"childclass":childclass,"id":id},
 			success:function(r){
 				if(r.rep){				
 					ttable.ajax.reload();
@@ -250,15 +227,15 @@ function savecategory(){
 }
 
 $(document).ready(function(){
-	$(".parentclass").change(function(){
+	$("#parentclass").change(function(){
 	    var parentname = $(this).val();
 		var child = classifymap[parentname];
-		$(".childclass").empty();
+		$("#childclass").empty();
 		if(child == undefined || child.length == 0 ){
-			$(".childclass").append("<option value=''>--请选择--</option>");
+			$("#childclass").append("<option value=''>--请选择--</option>");
 		}else{
 			for(var i in child){
-				$(".childclass").append("<option value='"+child[i]+"'>"+child[i]+"</option>");
+				$("#childclass").append("<option value='"+child[i]+"'>"+child[i]+"</option>");
 			}
 		}
 	});

src/web/templates/admin/com_memu.html

@@ -16,26 +16,8 @@
 			</ul>
         </li>
 		<li><a href="/admin/version"><i class="fa fa-navicon"></i><span>版本管理</span></a></li>
-		<li class="treeview">
-          	<a href="/admin/winner"><i class="fa fa-laptop"></i> <span>中标单位库</span>
-            <span class="pull-right-container">
-                <i class="fa fa-angle-left pull-right"></i>
-            </span>
-          	</a>
-          	<ul class="treeview-menu">
-	            <li><a href="/admin/winnermanager/list"><i class="fa fa-circle-o"></i>中标单位审核</a></li>
-			</ul>
-        </li>
-		<li class="treeview">
-          	<a href="/admin/buyer"><i class="fa fa-laptop"></i> <span>采购单位库</span>
-            <span class="pull-right-container">
-                <i class="fa fa-angle-left pull-right"></i>
-            </span>
-          	</a>
-          	<ul class="treeview-menu">
-	            <li><a href="/admin/buyermanager/list"><i class="fa fa-circle-o"></i>采购单位审核</a></li>
-			</ul>
-        </li>
+		<li><a href="/admin/audit/winnermanager"><i class="fa fa-laptop"></i><span>中标单位审核</span></a></li>
+		<li><a href="/admin/audit/buyermanager"><i class="fa fa-laptop"></i><span>采购单位审核</span></a></li>
 		<li class="treeview">
           	<a href="#"><i class="fa fa-laptop"></i> <span>统计</span>
             <span class="pull-right-container">

src/web/templates/admin/result_list.html

@@ -73,6 +73,7 @@
 <script>
 var rowdata ={};
 var trackId = "";
+menuActive("resulttrack")
 $(function () {
 	ttable=$('#dataTable').DataTable({
 		"paging"      : true,
@@ -168,7 +169,6 @@ $(function () {
       	}
 	});
 	ttable.on('init.dt', function () {
-		console.log("每次页面刷新")
 		/*查询所有结果表和对应的日志表*/
 		gettasktestlog();
 		/*抽取测试*/
@@ -242,7 +242,6 @@ $(function () {
 				break;
 			}
 		});
-		console.log("测试完成后标签展示")
 		var trackcoll = sessionStorage.getItem("trackcoll");
 		var resultinfo = sessionStorage.getItem("resultinfo");
 		if(trackcoll != null && resultinfo != null && trackcoll != "undefined"){
@@ -326,7 +325,6 @@ function tablereload(){
 
 //获取所有对应的结果表和日志表
 function gettasktestlog(){
-	console.log("铺标签")
 	$("#dataTable_filter div").remove();
 	clearcoll();//清理标签
 	var opt2="<option value='-1'>全部</option>";

src/web/templates/admin/winnermanager_list.html

@@ -46,7 +46,7 @@
 		    <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">新增中标单位</h4>
+		        <h4 class="modal-title" id="winnertitleinfo"></h4>
 		    </div>
 		    <div class="modal-body">
 				<div class="form-group">
@@ -58,7 +58,7 @@
 		    </div>
 		    <div class="modal-footer">
 		        <button type="button" class="btn btn-default" data-dismiss="modal" onclick="reset()">取消</button>
-		        <button type="button" class="btn btn-primary" onclick="saveaddwinner()">保存</button>
+		        <button type="button" class="btn btn-primary" onclick="savewinner()">保存</button>
 	    	</div>
 		</div>
 	    <!-- /.modal-content -->
@@ -70,6 +70,9 @@
 {{template "dialog"}}
 {{template "footer"}}
 <script>
+var bid = 1;
+var id = "";
+menuActive("winnermanager")
 $(function () {
 	ttable=$('#datawinnerTable').DataTable({
 		"paging"      : false,
@@ -108,30 +111,23 @@ $(function () {
 	});
 })
 function addwinner(){
+	bid = 1;
+	$("#winnername").val("");
+	$("#winnertitleinfo").html("新增中标单位");
 	$("#modal-info-addwinner").modal("show");
 }
 //保存
-function saveaddwinner(){
+function savewinner(){
 	var winnername = $("#winnername").val();
-	if(winnername != ""){
-		$.ajax({
-			url:"/admin/winner/addwinner",
-			type:"post",
-			data:{"winnername":winnername},
-			success:function(r){
-				if(r.rep){
-					$("#modal-info-addwinner").modal("hide");
-					showTip("保存成功", 1000, function() {});
-				}else{
-					showTip("保存失败", 1000, function() {});
-				}
-			}
-		})
-	}else{
+	if(winnername == ""){
 		alert("表单填写不完整！");
 		return ;
 	}
-	
+	if(bid == 1){
+		add(winnername);
+	}else{
+		auditsave(winnername);
+	}
 }
 
 //删除
@@ -154,11 +150,34 @@ function delwinner(_id){
 
 //审核
 function auditwinner(name,_id){
+	bid = 2;
+	id = _id;
+	$("#winnername").val(name);
+	$("#winnertitleinfo").html("审核中标单位");
+	$("#modal-info-addwinner").modal("show");
+}
+function add(winnername){
+	$.ajax({
+		url:"/admin/winner/addwinner",
+		type:"post",
+		data:{"winnername":winnername},
+		success:function(r){
+			if(r.rep){
+				$("#modal-info-addwinner").modal("hide");
+				showTip("保存成功", 1000, function() {});
+			}else{
+				showTip("保存失败", 1000, function() {});
+			}
+		}
+	})
+}
+function auditsave(name){
+	$("#modal-info-addwinner").modal("hide");
 	showConfirm("确定通过？", function() {
 		$.ajax({
 			url:"/admin/winner/auditwinner",
 			type:"post",
-			data:{"name":name,"id":_id},
+			data:{"name":name,"id":id},
 			success:function(r){
 				if(r.rep){				
 					ttable.ajax.reload();
@@ -169,4 +188,5 @@ function auditwinner(name,_id){
 		})
 	});
 }
+
 </script>